subject:"RE\: \[PATCH\] ath10k\: Convert wow pattern from 802.3 to 802.11"

Re: [PATCH] ath10k: Convert wow pattern from 802.3 to 802.11

2018-04-11 Thread Wen Gong


Hi,

I will move the convert graph from comments to code and send Patch V2.
And new graph like this:
/**
+ * Convert a 802.3 format to a 802.11 format.
+ * ++---+++
+ * 802.3:  |dest mac(6B)|src mac(6B)|type(2B)| body...    |
+ * ++---+++
+ *    |__ |___    |  |
+ *   |    |    |  |
+ * 
+--+++---+---+---+
+ * 802.11: |4B|dest mac(6B)| 6B |src mac(6B)|  8B  |type(2B)|  body... 
 |
+ * 
+--+++---+---+---+

+ */
+static void ath10k_wow_convert_8023_to_80211
+    (struct cfg80211_pkt_pattern *new,
+    const struct cfg80211_pkt_pattern *old)


And the 444 bytes on stack will remain since the comments is: "we can go 
with this until somebody runs into a real problem"


On 2018-04-12 07:13, Brian Norris wrote:

Hi,

On Fri, Mar 30, 2018 at 11:18:19AM +0800, Wen Gong wrote:

When trying to set wow wakeup patterns it fails with this command:

iw phyxx wowlan enable patterns offset xx+ IP address xx.xx.xx.xx

The reason is that the wow pattern from upper layer is in 802.3 format
for this case, it need to convert it to 802.11 format. The input
offset parameter is used for 802.3, but the actual offset firmware
need depends on rx_decap_mode, so that it needs to be recalculated.
Pattern of 802.3 packet is not same with 802.11 packet. If the
rx_decap_mode is ATH10K_HW_TXRX_NATIVE_WIFI, then firmware will
receive data packet with 802.11 format from hardware.

Convert graph:
---
802.3  |dest mac(6B)|src mac(6B)|type(2B)| body...|
 |__ |___|_  |___
|| | |
802.11 |4B|dest mac(6B)| 6B |src mac(6B)|  8B  |type(2B)|  body...  |
---


It feels like this could go into the code comments? Or at least some
short version of it. (But hey, text is cheap, and who doesn't love 
ASCII

art?)



Tested with QCA6174 hw3.0 with firmware
WLAN.RM.4.4.1-00099-QCARMSWPZ-1, but this will also affect QCA9377.
This has always failed, so it's not a regression with new firmware
releases.

Signed-off-by: Wen Gong 
---
 drivers/net/wireless/ath/ath10k/wmi.h |   4 ++
 drivers/net/wireless/ath/ath10k/wow.c | 128 
--

 2 files changed, 126 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/wmi.h 
b/drivers/net/wireless/ath/ath10k/wmi.h

index c7b30ed..389f9c7 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -6724,6 +6724,10 @@ struct wmi_wow_ev_arg {
 #define WOW_MIN_PATTERN_SIZE   1
 #define WOW_MAX_PATTERN_SIZE   148
 #define WOW_MAX_PKT_OFFSET 128
+#define WOW_HDR_LEN(sizeof(struct ieee80211_hdr_3addr) + \
+   sizeof(struct rfc1042_hdr))
+#define WOW_MAX_REDUCE (WOW_HDR_LEN - sizeof(struct ethhdr) - \
+   offsetof(struct ieee80211_hdr_3addr, addr1))

 enum wmi_tdls_state {
WMI_TDLS_DISABLE,
diff --git a/drivers/net/wireless/ath/ath10k/wow.c 
b/drivers/net/wireless/ath/ath10k/wow.c

index c4cbccb..9b56a41 100644
--- a/drivers/net/wireless/ath/ath10k/wow.c
+++ b/drivers/net/wireless/ath/ath10k/wow.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2015-2017 Qualcomm Atheros, Inc.
+ * Copyright (c) 2018, The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software 
for any
  * purpose with or without fee is hereby granted, provided that the 
above

@@ -76,6 +77,98 @@ static int ath10k_wow_cleanup(struct ath10k *ar)
return 0;
 }

+static void ath10k_wow_convert_8023_to_80211
+   (struct cfg80211_pkt_pattern *new,
+   const struct cfg80211_pkt_pattern *old)
+{
+   u8 hdr_8023_pattern[ETH_HLEN] = {};
+   u8 hdr_8023_bit_mask[ETH_HLEN] = {};
+   u8 hdr_80211_pattern[WOW_HDR_LEN] = {};
+   u8 hdr_80211_bit_mask[WOW_HDR_LEN] = {};
+
+   int total_len = old->pkt_offset + old->pattern_len;
+   int hdr_80211_end_offset;
+
+   struct ieee80211_hdr_3addr *new_hdr_pattern =
+   (struct ieee80211_hdr_3addr *)hdr_80211_pattern;
+   struct ieee80211_hdr_3addr *new_hdr_mask =
+   (struct ieee80211_hdr_3addr *)hdr_80211_bit_mask;
+   struct ethhdr *old_hdr_pattern = (struct ethhdr *)hdr_8023_pattern;
+   struct ethhdr *old_hdr_mask = (struct ethhdr *)hdr_8023_bit_mask;
+   int hdr_len = sizeof(*new_hdr_pattern);
+
+   struct rfc1042_hdr *new_rfc_pattern =
+   (struct rfc1042_hdr *)(hdr_80211_pattern + hdr_len);
+   struct rfc1042_hdr

RE: [PATCH] ath10k: Convert wow pattern from 802.3 to 802.11

2018-04-11 Thread Wen Gong

Hi,

I will move the convert graph from comments to code.
And new graph like this:
/**
+ * Convert a 802.3 format to a 802.11 format.
+ * ++---+++
+ * 802.3:  |dest mac(6B)|src mac(6B)|type(2B)| body...|
+ * ++---+++
+ *|__ |___|  |
+ *   |||  |
+ * +--+++---+---+---+
+ * 802.11: |4B|dest mac(6B)| 6B |src mac(6B)|  8B  |type(2B)|  body...  |
+ * +--+++---+---+---+
+ */
+static void ath10k_wow_convert_8023_to_80211
+   (struct cfg80211_pkt_pattern *new,
+   const struct cfg80211_pkt_pattern *old)


And the 444 bytes on stack will remain since the comments is: "we can go with 
this until somebody runs into a real problem"

Thanks
Gong Wen

> -Original Message-
> From: ath10k [mailto:ath10k-boun...@lists.infradead.org] On Behalf Of
> Brian Norris
> Sent: Thursday, April 12, 2018 7:13 AM
> To: Wen Gong <wg...@codeaurora.org>
> Cc: linux-wireless@vger.kernel.org; ath...@lists.infradead.org
> Subject: Re: [PATCH] ath10k: Convert wow pattern from 802.3 to 802.11
> 
> Hi,
> 
> On Fri, Mar 30, 2018 at 11:18:19AM +0800, Wen Gong wrote:
> > When trying to set wow wakeup patterns it fails with this command:
> >
> > iw phyxx wowlan enable patterns offset xx+ IP address xx.xx.xx.xx
> >
> > The reason is that the wow pattern from upper layer is in 802.3 format
> > for this case, it need to convert it to 802.11 format. The input
> > offset parameter is used for 802.3, but the actual offset firmware
> > need depends on rx_decap_mode, so that it needs to be recalculated.
> > Pattern of 802.3 packet is not same with 802.11 packet. If the
> > rx_decap_mode is ATH10K_HW_TXRX_NATIVE_WIFI, then firmware will
> > receive data packet with 802.11 format from hardware.
> >
> > Convert graph:
> > ---
> > 802.3  |dest mac(6B)|src mac(6B)|type(2B)| body...|
> >  |__ |___|_  |___
> > || | |
> > 802.11 |4B|dest mac(6B)| 6B |src mac(6B)|  8B  |type(2B)|  body...  |
> > --
> > -
> 
> It feels like this could go into the code comments? Or at least some short
> version of it. (But hey, text is cheap, and who doesn't love ASCII
> art?)
> 
> >
> > Tested with QCA6174 hw3.0 with firmware
> > WLAN.RM.4.4.1-00099-QCARMSWPZ-1, but this will also affect QCA9377.
> > This has always failed, so it's not a regression with new firmware
> > releases.
> >
> > Signed-off-by: Wen Gong <wg...@codeaurora.org>
> > ---
> >  drivers/net/wireless/ath/ath10k/wmi.h |   4 ++
> >  drivers/net/wireless/ath/ath10k/wow.c | 128
> > --
> >  2 files changed, 126 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/net/wireless/ath/ath10k/wmi.h
> > b/drivers/net/wireless/ath/ath10k/wmi.h
> > index c7b30ed..389f9c7 100644
> > --- a/drivers/net/wireless/ath/ath10k/wmi.h
> > +++ b/drivers/net/wireless/ath/ath10k/wmi.h
> > @@ -6724,6 +6724,10 @@ struct wmi_wow_ev_arg {
> >  #define WOW_MIN_PATTERN_SIZE   1
> >  #define WOW_MAX_PATTERN_SIZE   148
> >  #define WOW_MAX_PKT_OFFSET 128
> > +#define WOW_HDR_LEN(sizeof(struct ieee80211_hdr_3addr) + \
> > +   sizeof(struct rfc1042_hdr))
> > +#define WOW_MAX_REDUCE (WOW_HDR_LEN - sizeof(struct
> ethhdr) - \
> > +   offsetof(struct ieee80211_hdr_3addr, addr1))
> >
> >  enum wmi_tdls_state {
> > WMI_TDLS_DISABLE,
> > diff --git a/drivers/net/wireless/ath/ath10k/wow.c
> > b/drivers/net/wireless/ath/ath10k/wow.c
> > index c4cbccb..9b56a41 100644
> > --- a/drivers/net/wireless/ath/ath10k/wow.c
> > +++ b/drivers/net/wireless/ath/ath10k/wow.c
> > @@ -1,5 +1,6 @@
> >  /*
> >   * Copyright (c) 2015-2017 Qualcomm Atheros, Inc.
> > + * Copyright (c) 2018, The Linux Foundation. All rights reserved.
> >   *
> >   * Permission to use, copy, modify, and/or distribute this software for any
> >   * purpose with or without fee is hereby granted, provided that the
> > above @@ -76,6 +77,98 @@ static int ath10k_wow_cleanup(struct ath10k
> *ar)
> > return 0;
> >  }
> >
> &

Re: [PATCH] ath10k: Convert wow pattern from 802.3 to 802.11

2018-04-11 Thread Brian Norris

Hi,

On Fri, Mar 30, 2018 at 11:18:19AM +0800, Wen Gong wrote:
> When trying to set wow wakeup patterns it fails with this command:
> 
> iw phyxx wowlan enable patterns offset xx+ IP address xx.xx.xx.xx
> 
> The reason is that the wow pattern from upper layer is in 802.3 format
> for this case, it need to convert it to 802.11 format. The input
> offset parameter is used for 802.3, but the actual offset firmware
> need depends on rx_decap_mode, so that it needs to be recalculated.
> Pattern of 802.3 packet is not same with 802.11 packet. If the
> rx_decap_mode is ATH10K_HW_TXRX_NATIVE_WIFI, then firmware will
> receive data packet with 802.11 format from hardware.
> 
> Convert graph:
> ---
> 802.3  |dest mac(6B)|src mac(6B)|type(2B)| body...|
>  |__ |___|_  |___
> || | |
> 802.11 |4B|dest mac(6B)| 6B |src mac(6B)|  8B  |type(2B)|  body...  |
> ---

It feels like this could go into the code comments? Or at least some
short version of it. (But hey, text is cheap, and who doesn't love ASCII
art?)

> 
> Tested with QCA6174 hw3.0 with firmware
> WLAN.RM.4.4.1-00099-QCARMSWPZ-1, but this will also affect QCA9377.
> This has always failed, so it's not a regression with new firmware
> releases.
> 
> Signed-off-by: Wen Gong 
> ---
>  drivers/net/wireless/ath/ath10k/wmi.h |   4 ++
>  drivers/net/wireless/ath/ath10k/wow.c | 128 
> --
>  2 files changed, 126 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/ath10k/wmi.h 
> b/drivers/net/wireless/ath/ath10k/wmi.h
> index c7b30ed..389f9c7 100644
> --- a/drivers/net/wireless/ath/ath10k/wmi.h
> +++ b/drivers/net/wireless/ath/ath10k/wmi.h
> @@ -6724,6 +6724,10 @@ struct wmi_wow_ev_arg {
>  #define WOW_MIN_PATTERN_SIZE 1
>  #define WOW_MAX_PATTERN_SIZE 148
>  #define WOW_MAX_PKT_OFFSET   128
> +#define WOW_HDR_LEN  (sizeof(struct ieee80211_hdr_3addr) + \
> + sizeof(struct rfc1042_hdr))
> +#define WOW_MAX_REDUCE   (WOW_HDR_LEN - sizeof(struct ethhdr) - \
> + offsetof(struct ieee80211_hdr_3addr, addr1))
>  
>  enum wmi_tdls_state {
>   WMI_TDLS_DISABLE,
> diff --git a/drivers/net/wireless/ath/ath10k/wow.c 
> b/drivers/net/wireless/ath/ath10k/wow.c
> index c4cbccb..9b56a41 100644
> --- a/drivers/net/wireless/ath/ath10k/wow.c
> +++ b/drivers/net/wireless/ath/ath10k/wow.c
> @@ -1,5 +1,6 @@
>  /*
>   * Copyright (c) 2015-2017 Qualcomm Atheros, Inc.
> + * Copyright (c) 2018, The Linux Foundation. All rights reserved.
>   *
>   * Permission to use, copy, modify, and/or distribute this software for any
>   * purpose with or without fee is hereby granted, provided that the above
> @@ -76,6 +77,98 @@ static int ath10k_wow_cleanup(struct ath10k *ar)
>   return 0;
>  }
>  
> +static void ath10k_wow_convert_8023_to_80211
> + (struct cfg80211_pkt_pattern *new,
> + const struct cfg80211_pkt_pattern *old)
> +{
> + u8 hdr_8023_pattern[ETH_HLEN] = {};
> + u8 hdr_8023_bit_mask[ETH_HLEN] = {};
> + u8 hdr_80211_pattern[WOW_HDR_LEN] = {};
> + u8 hdr_80211_bit_mask[WOW_HDR_LEN] = {};
> +
> + int total_len = old->pkt_offset + old->pattern_len;
> + int hdr_80211_end_offset;
> +
> + struct ieee80211_hdr_3addr *new_hdr_pattern =
> + (struct ieee80211_hdr_3addr *)hdr_80211_pattern;
> + struct ieee80211_hdr_3addr *new_hdr_mask =
> + (struct ieee80211_hdr_3addr *)hdr_80211_bit_mask;
> + struct ethhdr *old_hdr_pattern = (struct ethhdr *)hdr_8023_pattern;
> + struct ethhdr *old_hdr_mask = (struct ethhdr *)hdr_8023_bit_mask;
> + int hdr_len = sizeof(*new_hdr_pattern);
> +
> + struct rfc1042_hdr *new_rfc_pattern =
> + (struct rfc1042_hdr *)(hdr_80211_pattern + hdr_len);
> + struct rfc1042_hdr *new_rfc_mask =
> + (struct rfc1042_hdr *)(hdr_80211_bit_mask + hdr_len);
> + int rfc_len = sizeof(*new_rfc_pattern);
> +
> + memcpy(hdr_8023_pattern + old->pkt_offset,
> +old->pattern, ETH_HLEN - old->pkt_offset);
> + memcpy(hdr_8023_bit_mask + old->pkt_offset,
> +old->mask, ETH_HLEN - old->pkt_offset);
> +
> + /* Copy destination address */
> + memcpy(new_hdr_pattern->addr1, old_hdr_pattern->h_dest, ETH_ALEN);
> + memcpy(new_hdr_mask->addr1, old_hdr_mask->h_dest, ETH_ALEN);
> +
> + /* Copy source address */
> + memcpy(new_hdr_pattern->addr3, old_hdr_pattern->h_source, ETH_ALEN);
> + memcpy(new_hdr_mask->addr3, old_hdr_mask->h_source, ETH_ALEN);
> +
> + /* Copy logic link type */
> + memcpy(_rfc_pattern->snap_type,
> +_hdr_pattern->h_proto,
> +sizeof(old_hdr_pattern->h_proto));
> + memcpy(_rfc_mask->snap_type,
> +

Re: [PATCH] ath10k: Convert wow pattern from 802.3 to 802.11

RE: [PATCH] ath10k: Convert wow pattern from 802.3 to 802.11

Re: [PATCH] ath10k: Convert wow pattern from 802.3 to 802.11

3 matches

Site Navigation

Mail list logo

Footer information