Re: [PATCH v2 2/3] ath10k: Configure rxnss_override for 10.4 firmware.

2017-06-19 Thread Sven Eckelmann 
On Freitag, 16. Juni 2017 08:50:13 CEST Kalle Valo wrote:
> We have hw_params for stuff like this so I changed this and the
> following patch to use that. Please review:

Looks good. Thanks for adjusting the patches.

Kind regards,
Sven

signature.asc
Description: This is a digitally signed message part.

Re: [PATCH v2 2/3] ath10k: Configure rxnss_override for 10.4 firmware.

2017-06-16 Thread Kalle Valo 
Sven Eckelmann  writes:

> From: Ben Greear 
>
> QCA9984 hardware can do 4x4 at 80Mhz, but only 2x2 at 160Mhz.
>
> First, report this to user-space by setting the max-tx-speed
> and max-rx-speed vht capabilities.
>
> Second, if the peer rx-speed is configured, and if we
> are in 160 or 80+80 mode, and the peer rx-speed matches
> the max speed for 2x2 or 1x1 at 160Mhz (long guard interval),
> then use that info to set the peer_bw_rxnss_override appropriately.
>
> Without this, a 9984 firmware will not use 2x2 ratesets when
> transmitting to peer (it will be stuck at 1x1), because
> the firmware would not have configured the rxnss_override.
>
> This could use some testing

Sven, I assume you have tested this so I removed the last sentence.

> @@ -4408,6 +4422,23 @@ static struct ieee80211_sta_vht_cap 
> ath10k_create_vht_cap(struct ath10k *ar)
>   vht_cap.vht_mcs.rx_mcs_map = cpu_to_le16(mcs_map);
>   vht_cap.vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map);
>  
> + /* If we are supporting 160Mhz or 80+80, then the NIC may be able to do
> +  * a restricted NSS for 160 or 80+80 vs what it can do for 80Mhz.  Give
> +  * user-space a clue if that is the case.
> +  */
> + if (vht_cap.cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) {
> + switch (ar->dev_id) {
> + case QCA9984_1_0_DEVICE_ID:
> + /* Can do only 2x2 VHT160 or 80+80.
> +  * 1560Mbps is 4x4 80Mhz or 2x2 160Mhz,
> +  * long-guard-interval
> +  */
> + vht_cap.vht_mcs.rx_highest = 1560;
> + vht_cap.vht_mcs.tx_highest = 1560;
> + break;
> + }
> + }

We have hw_params for stuff like this so I changed this and the
following patch to use that. Please review:

https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending=81f55f2a3e1837287a52de6577ca89a2c7393456

https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending=09ce674529472c8deca41fbb28bad59e03330321

-- 
Kalle Valo

Re: [v2,2/3] ath10k: Configure rxnss_override for 10.4 firmware.

2017-06-12 Thread Kalle Valo 
Sven Eckelmann  wrote:

> QCA9984 hardware can do 4x4 at 80Mhz, but only 2x2 at 160Mhz.
> 
> First, report this to user-space by setting the max-tx-speed
> and max-rx-speed vht capabilities.
> 
> Second, if the peer rx-speed is configured, and if we
> are in 160 or 80+80 mode, and the peer rx-speed matches
> the max speed for 2x2 or 1x1 at 160Mhz (long guard interval),
> then use that info to set the peer_bw_rxnss_override appropriately.
> 
> Without this, a 9984 firmware will not use 2x2 ratesets when
> transmitting to peer (it will be stuck at 1x1), because
> the firmware would not have configured the rxnss_override.
> 
> This could use some testing
> 
> Signed-off-by: Ben Greear 
> [sven.eckelm...@openmesh.com: rebase, cleanup, drop 160Mhz workaround cleanup]
> Signed-off-by: Sven Eckelmann 
> Signed-off-by: Kalle Valo 

This one had warnings, fixed in pending branch:

drivers/net/wireless/ath/ath10k/mac.c:4436:52: warning: incorrect type in 
assignment (different base types)
drivers/net/wireless/ath/ath10k/mac.c:4436:52:expected restricted __le16 
[assigned] [usertype] rx_highest
drivers/net/wireless/ath/ath10k/mac.c:4436:52:got int
drivers/net/wireless/ath/ath10k/mac.c:4437:52: warning: incorrect type in 
assignment (different base types)
drivers/net/wireless/ath/ath10k/mac.c:4437:52:expected restricted __le16 
[assigned] [usertype] tx_highest
drivers/net/wireless/ath/ath10k/mac.c:4437:52:got int

-- 
https://patchwork.kernel.org/patch/9778087/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

[PATCH v2 2/3] ath10k: Configure rxnss_override for 10.4 firmware.

2017-06-09 Thread Sven Eckelmann 
From: Ben Greear 

QCA9984 hardware can do 4x4 at 80Mhz, but only 2x2 at 160Mhz.

First, report this to user-space by setting the max-tx-speed
and max-rx-speed vht capabilities.

Second, if the peer rx-speed is configured, and if we
are in 160 or 80+80 mode, and the peer rx-speed matches
the max speed for 2x2 or 1x1 at 160Mhz (long guard interval),
then use that info to set the peer_bw_rxnss_override appropriately.

Without this, a 9984 firmware will not use 2x2 ratesets when
transmitting to peer (it will be stuck at 1x1), because
the firmware would not have configured the rxnss_override.

This could use some testing

Signed-off-by: Ben Greear 
[sven.eckelm...@openmesh.com: rebase, cleanup, drop 160Mhz workaround cleanup]
Signed-off-by: Sven Eckelmann 
---
v2:
 - rebased patch
 - minor cleanups
 - removal of the 160 MHz workaround (see patch 1)

 drivers/net/wireless/ath/ath10k/mac.c | 31 +++
 drivers/net/wireless/ath/ath10k/wmi.c |  7 ++-
 drivers/net/wireless/ath/ath10k/wmi.h |  2 ++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath10k/mac.c 
b/drivers/net/wireless/ath/ath10k/mac.c
index 8087b6be5484..0752cf351b4a 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -2519,6 +2519,20 @@ static void ath10k_peer_assoc_h_vht(struct ath10k *ar,
 
ath10k_dbg(ar, ATH10K_DBG_MAC, "mac vht peer %pM max_mpdu %d flags 
0x%x\n",
   sta->addr, arg->peer_max_mpdu, arg->peer_flags);
+
+   if (arg->peer_vht_rates.rx_max_rate &&
+   (sta->vht_cap.cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK)) {
+   switch (arg->peer_vht_rates.rx_max_rate) {
+   case 1560:
+   /* Must be 2x2 at 160Mhz is all it can do. */
+   arg->peer_bw_rxnss_override = 2;
+   break;
+   case 780:
+   /* Can only do 1x1 at 160Mhz (Long Guard Interval) */
+   arg->peer_bw_rxnss_override = 1;
+   break;
+   }
+   }
 }
 
 static void ath10k_peer_assoc_h_qos(struct ath10k *ar,
@@ -4408,6 +4422,23 @@ static struct ieee80211_sta_vht_cap 
ath10k_create_vht_cap(struct ath10k *ar)
vht_cap.vht_mcs.rx_mcs_map = cpu_to_le16(mcs_map);
vht_cap.vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map);
 
+   /* If we are supporting 160Mhz or 80+80, then the NIC may be able to do
+* a restricted NSS for 160 or 80+80 vs what it can do for 80Mhz.  Give
+* user-space a clue if that is the case.
+*/
+   if (vht_cap.cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) {
+   switch (ar->dev_id) {
+   case QCA9984_1_0_DEVICE_ID:
+   /* Can do only 2x2 VHT160 or 80+80.
+* 1560Mbps is 4x4 80Mhz or 2x2 160Mhz,
+* long-guard-interval
+*/
+   vht_cap.vht_mcs.rx_highest = 1560;
+   vht_cap.vht_mcs.tx_highest = 1560;
+   break;
+   }
+   }
+
return vht_cap;
 }
 
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c 
b/drivers/net/wireless/ath/ath10k/wmi.c
index 6afc8d27f0d5..2c3b0214ba5f 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -6757,7 +6757,12 @@ ath10k_wmi_peer_assoc_fill_10_4(struct ath10k *ar, void 
*buf,
struct wmi_10_4_peer_assoc_complete_cmd *cmd = buf;
 
ath10k_wmi_peer_assoc_fill_10_2(ar, buf, arg);
-   cmd->peer_bw_rxnss_override = 0;
+   if (arg->peer_bw_rxnss_override)
+   cmd->peer_bw_rxnss_override =
+   __cpu_to_le32((arg->peer_bw_rxnss_override - 1) |
+ BIT(PEER_BW_RXNSS_OVERRIDE_OFFSET));
+   else
+   cmd->peer_bw_rxnss_override = 0;
 }
 
 static int
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h 
b/drivers/net/wireless/ath/ath10k/wmi.h
index 1b4865a55595..dd6cac150749 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -6028,6 +6028,7 @@ struct wmi_10_2_peer_assoc_complete_cmd {
__le32 info0; /* WMI_PEER_ASSOC_INFO0_ */
 } __packed;
 
+#define PEER_BW_RXNSS_OVERRIDE_OFFSET  31
 struct wmi_10_4_peer_assoc_complete_cmd {
struct wmi_10_2_peer_assoc_complete_cmd cmd;
__le32 peer_bw_rxnss_override;
@@ -6051,6 +6052,7 @@ struct wmi_peer_assoc_complete_arg {
u32 peer_vht_caps;
enum wmi_phy_mode peer_phymode;
struct wmi_vht_rate_set_arg peer_vht_rates;
+   u32 peer_bw_rxnss_override;
 };
 
 struct wmi_peer_add_wds_entry_cmd {
-- 
2.11.0

Re: ath10k: Configure rxnss_override for 10.4 firmware.

2017-06-09 Thread Sven Eckelmann 
On Mittwoch, 15. Februar 2017 01:26:58 CEST Kalle Valo wrote:
> Ben Greear  wrote:
> > From: Ben Greear 
> > 
> > QCA9984 hardware can do 4x4 at 80Mhz, but only 2x2 at 160Mhz.
[]
> Does not apply:
> 
> error: patch failed: drivers/net/wireless/ath/ath10k/mac.c:2760
> error: drivers/net/wireless/ath/ath10k/mac.c: patch does not apply
> error: patch failed: drivers/net/wireless/ath/ath10k/wmi.h:6173
> error: drivers/net/wireless/ath/ath10k/wmi.h: patch does not apply
> stg import: Diff does not apply cleanly
> 
> Patch set to Changes Requested.

I wanted to use this patch to announce the maximum speed for QCA9888.
I hope it is ok for Ben Greear when I rebase and resubmit it.

Kind regards,
Sven

signature.asc
Description: This is a digitally signed message part.

Re: ath10k: Configure rxnss_override for 10.4 firmware.

2017-02-15 Thread Kalle Valo 
Ben Greear  wrote:
> From: Ben Greear 
> 
> QCA9984 hardware can do 4x4 at 80Mhz, but only 2x2 at 160Mhz.
> 
> First, report this to user-space by setting the max-tx-speed
> and max-rx-speed vht capabilities.
> 
> Second, if the peer rx-speed is configured, and if we
> are in 160 or 80+80 mode, and the peer rx-speed matches
> the max speed for 2x2 or 1x1 at 160Mhz (long guard interval),
> then use that info to set the peer_bw_rxnss_override appropriately.
> 
> Without this, a 9984 firmware will not use 2x2 ratesets when
> transmitting to peer (it will be stuck at 1x1), because
> the firmware would not have configured the rxnss_override.
> 
> This could use some testing
> 
> Signed-off-by: Ben Greear 

Does not apply:

error: patch failed: drivers/net/wireless/ath/ath10k/mac.c:2760
error: drivers/net/wireless/ath/ath10k/mac.c: patch does not apply
error: patch failed: drivers/net/wireless/ath/ath10k/wmi.h:6173
error: drivers/net/wireless/ath/ath10k/wmi.h: patch does not apply
stg import: Diff does not apply cleanly

Patch set to Changes Requested.

-- 
https://patchwork.kernel.org/patch/9567655/

Documentation about submitting wireless patches and checking status
from patchwork:

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

[PATCH] ath10k: Configure rxnss_override for 10.4 firmware.

2017-02-10 Thread greearb 
From: Ben Greear 

QCA9984 hardware can do 4x4 at 80Mhz, but only 2x2 at 160Mhz.

First, report this to user-space by setting the max-tx-speed
and max-rx-speed vht capabilities.

Second, if the peer rx-speed is configured, and if we
are in 160 or 80+80 mode, and the peer rx-speed matches
the max speed for 2x2 or 1x1 at 160Mhz (long guard interval),
then use that info to set the peer_bw_rxnss_override appropriately.

Without this, a 9984 firmware will not use 2x2 ratesets when
transmitting to peer (it will be stuck at 1x1), because
the firmware would not have configured the rxnss_override.

This could use some testing

Signed-off-by: Ben Greear 
---
 drivers/net/wireless/ath/ath10k/mac.c | 30 +-
 drivers/net/wireless/ath/ath10k/wmi.c |  7 ++-
 drivers/net/wireless/ath/ath10k/wmi.h |  2 ++
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/mac.c 
b/drivers/net/wireless/ath/ath10k/mac.c
index b9c9105..0bde1db 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -2760,6 +2760,18 @@ static void ath10k_peer_assoc_h_vht(struct ath10k *ar,
   sta->addr, arg->peer_max_mpdu, arg->peer_flags,
   arg->peer_vht_rates.rx_max_rate, 
arg->peer_vht_rates.rx_mcs_set,
   arg->peer_vht_rates.tx_max_rate, 
arg->peer_vht_rates.tx_mcs_set);
+
+   if ((arg->peer_vht_rates.rx_max_rate) &&
+   (sta->vht_cap.cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK)) {
+   if (arg->peer_vht_rates.rx_max_rate == 1560) {
+   /* Must be 2x2 at 160Mhz is all it can do. */
+   arg->peer_bw_rxnss_override = 2;
+   }
+   else if (arg->peer_vht_rates.rx_max_rate == 780) {
+   /* Can only do 1x2 at 160Mhz (Long Guard Interval) */
+   arg->peer_bw_rxnss_override = 1;
+   }
+   }
 }
 
 static void ath10k_peer_assoc_h_qos(struct ath10k *ar,
@@ -4899,7 +4911,8 @@ static struct ieee80211_sta_vht_cap 
ath10k_create_vht_cap(struct ath10k *ar)
vht_cap.cap |= val;
}
 
-   if ((ar->vht_cap_info & IEEE80211_VHT_CAP_SHORT_GI_160) && 
!(ar->vht_cap_info & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ)) {
+   if ((ar->vht_cap_info & IEEE80211_VHT_CAP_SHORT_GI_160) &&
+   ((ar->vht_cap_info & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) == 0)) 
{
vht_cap.cap |= IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ;
}
 
@@ -4917,6 +4930,21 @@ static struct ieee80211_sta_vht_cap 
ath10k_create_vht_cap(struct ath10k *ar)
vht_cap.vht_mcs.rx_mcs_map = cpu_to_le16(mcs_map);
vht_cap.vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map);
 
+   /* If we are supporting 160Mhz or 80+80, then the NIC may be able to do 
a restricted NSS
+* for 160 or 80+80 vs what it can do for 80Mhz.  Give user-space a 
clue if that is the
+* case.
+*/
+   if (vht_cap.cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) {
+   /* Something more than 80Mhz at least */
+   if (ar->dev_id == QCA9984_1_0_DEVICE_ID) {
+   /* Can do only 2x2 VHT160 or 80+80.
+* 1560Mbps is 4x4 80Mhz or 2x2 160Mhz, 
long-guard-interval
+*/
+   vht_cap.vht_mcs.rx_highest = 1560;
+   vht_cap.vht_mcs.tx_highest = 1560;
+   }
+   }
+
return vht_cap;
 }
 
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c 
b/drivers/net/wireless/ath/ath10k/wmi.c
index 38db6be..05ca7f5 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -7036,7 +7036,12 @@ ath10k_wmi_peer_assoc_fill_10_4(struct ath10k *ar, void 
*buf,
struct wmi_10_4_peer_assoc_complete_cmd *cmd = buf;
 
ath10k_wmi_peer_assoc_fill_10_2(ar, buf, arg);
-   cmd->peer_bw_rxnss_override = 0;
+   if (arg->peer_bw_rxnss_override)
+   cmd->peer_bw_rxnss_override =
+   __cpu_to_le32((arg->peer_bw_rxnss_override - 1) |
+ (1<peer_bw_rxnss_override = 0;
 }
 
 static int
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h 
b/drivers/net/wireless/ath/ath10k/wmi.h
index 5a71bb4..ccbb1bc 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -6173,6 +6173,7 @@ struct wmi_10_2_peer_assoc_complete_cmd_ct {
struct wmi_ct_assoc_overrides overrides;
 } __packed;
 
+#define PEER_BW_RXNSS_OVERRIDE_OFFSET  31
 struct wmi_10_4_peer_assoc_complete_cmd {
struct wmi_10_2_peer_assoc_complete_cmd cmd;
__le32 peer_bw_rxnss_override;
@@ -6201,6 +6202,7 @@ struct wmi_peer_assoc_complete_arg {
u32 peer_vht_caps;
enum wmi_phy_mode