--- /dev/null
+From: Sebastian Gottschall <s.gottschall@dd-wrt.com>
+
+current handling of peer_bw_rxnss_override parameter is based on guessing the VHT160/8080 capability by rx rate. this is wrong and may lead
+to a non initialized peer_bw_rxnss_override parameter which is required since VHT160 operation mode only supports 2x2 chainmasks in addition the original code
+initialized the parameter with wrong masked values.
+This patch uses the peer phymode and peer nss information for correct initialisation of the peer_bw_rxnss_override parameter.
+if this peer information is not available, we initialize the parameter by minimum nss which is suggested by QCA as temporary workaround according
+to the QCA sourcecodes.
+
+Signed-off-by: Sebastian Gottschall <s.gottschall@dd-wrt.com>
+
+v2: remove debug messages
+v3: apply some cosmetics, update documentation
+v4: fix compile warning and truncate nss to maximum of 2x2 since current chipsets only support 2x2 at vht160
+v5: handle maximum nss for chipsets supportig vht160 with 1x1 only
+v7: use more simple code variant and take care about hw/sw chainmask configuration
+v8: fix some code style issues
+v9: use SM/MS macros from code.h to simplify shift/mask handling
+---
+ drivers/net/wireless/ath/ath10k/mac.c | 54 +++++++++++++++++++--------
+ drivers/net/wireless/ath/ath10k/wmi.c | 7 +---
+ drivers/net/wireless/ath/ath10k/wmi.h | 14 ++++++-
+ 3 files changed, 52 insertions(+), 23 deletions(-)
+--- a/drivers/net/wireless/ath/ath10k/mac.c
++++ b/drivers/net/wireless/ath/ath10k/mac.c
+@@ -2466,7 +2466,7 @@ static void ath10k_peer_assoc_h_vht(stru
+ const u16 *vht_mcs_mask;
+ u8 ampdu_factor;
+ u8 max_nss, vht_mcs;
+- int i;
++ int i, nss160;
+
+ if (WARN_ON(ath10k_mac_vif_chan(vif, &def)))
+ return;
+@@ -2526,23 +2526,45 @@ static void ath10k_peer_assoc_h_vht(stru
+ __le16_to_cpu(vht_cap->vht_mcs.tx_highest);
+ arg->peer_vht_rates.tx_mcs_set = ath10k_peer_assoc_h_vht_limit(
+ __le16_to_cpu(vht_cap->vht_mcs.tx_mcs_map), vht_mcs_mask);
++ arg->peer_bw_rxnss_override = 0;
++ nss160 = 1; /* 1x1 default config for VHT160 */
+
+- 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);
++ /* only local 4x4 configuration do support 2x2 for VHT160,
++ * everything else must use 1x1
++ */
+
+- 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;
+- }
++ if (ar->cfg_rx_chainmask == 15)
++ nss160 = arg->peer_num_spatial_streams <= 2 ? 1 : 2;
++
++ /* if peer provides 1x1 nss160 information using max rate
++ * vht information, we reduce local nss160 to 1x1.
++ * consider that it has been observed that some client
++ * devices provide zero here, no matter which transmission
++ * rate is possible. in that case the local nss configuration
++ * will be used at maxmimum configuration possible. (see above)
++ */
++
++ if (arg->peer_vht_rates.rx_max_rate == 780)
++ nss160 = 1;
++
++ /* in case if peer is connected with vht160 or vht80+80,
++ * we need to properly adjust rxnss parameters otherwise
++ * firmware will raise a assert
++ */
++ switch (arg->peer_phymode) {
++ case MODE_11AC_VHT80_80:
++ arg->peer_bw_rxnss_override = BW_NSS_FWCONF_80_80(nss160);
++ /* fall through */
++ case MODE_11AC_VHT160:
++ arg->peer_bw_rxnss_override |= BW_NSS_FWCONF_160(nss160);
++ break;
++ default:
++ break;
+ }
++
++ ath10k_dbg(ar, ATH10K_DBG_MAC, "mac vht peer %pM max_mpdu %d flags 0x%x peer_bw_rxnss_override 0x%x\n",
++ sta->addr, arg->peer_max_mpdu, arg->peer_flags,
++ arg->peer_bw_rxnss_override);
+ }
+
+ static void ath10k_peer_assoc_h_qos(struct ath10k *ar,
+@@ -2694,9 +2716,9 @@ static int ath10k_peer_assoc_prepare(str
+ ath10k_peer_assoc_h_crypto(ar, vif, sta, arg);
+ ath10k_peer_assoc_h_rates(ar, vif, sta, arg);
+ ath10k_peer_assoc_h_ht(ar, vif, sta, arg);
++ ath10k_peer_assoc_h_phymode(ar, vif, sta, arg);
+ ath10k_peer_assoc_h_vht(ar, vif, sta, arg);
+ ath10k_peer_assoc_h_qos(ar, vif, sta, arg);
+- ath10k_peer_assoc_h_phymode(ar, vif, sta, arg);
+
+ return 0;
+ }
+--- a/drivers/net/wireless/ath/ath10k/wmi.c
++++ b/drivers/net/wireless/ath/ath10k/wmi.c
+@@ -7231,12 +7231,7 @@ ath10k_wmi_peer_assoc_fill_10_4(struct a
+ struct wmi_10_4_peer_assoc_complete_cmd *cmd = buf;
+
+ ath10k_wmi_peer_assoc_fill_10_2(ar, buf, arg);
+- 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;
++ cmd->peer_bw_rxnss_override = __cpu_to_le32(arg->peer_bw_rxnss_override);
+ }
+
+ static int
+--- a/drivers/net/wireless/ath/ath10k/wmi.h
++++ b/drivers/net/wireless/ath/ath10k/wmi.h
+@@ -6306,7 +6306,19 @@ struct wmi_10_2_peer_assoc_complete_cmd
+ __le32 info0; /* WMI_PEER_ASSOC_INFO0_ */
+ } __packed;
+
+-#define PEER_BW_RXNSS_OVERRIDE_OFFSET 31
++#define BW_NSS_FWCONF_MAP_ENABLE BIT(31)
++#define BW_NSS_FWCONF_MAP_160MHZ_LSB (0)
++#define BW_NSS_FWCONF_MAP_160MHZ_MASK (0x00000007)
++#define BW_NSS_FWCONF_MAP_80_80MHZ_LSB (3)
++#define BW_NSS_FWCONF_MAP_80_80MHZ_MASK (0x00000038)
++#define BW_NSS_FWCONF_MAP_MASK (0x0000003F)
++
++#define GET_BW_NSS_FWCONF_160(x) (MS(x, BW_NSS_FWCONF_MAP_160MHZ) + 1)
++#define GET_BW_NSS_FWCONF_80_80(x) (MS(x, BW_NSS_FWCONF_MAP_80_80MHZ) + 1)
++
++/* Values defined to set 160 MHz Bandwidth NSS Mapping into FW*/
++#define BW_NSS_FWCONF_160(x) (BW_NSS_FWCONF_MAP_ENABLE | SM(x - 1, BW_NSS_FWCONF_MAP_160MHZ))
++#define BW_NSS_FWCONF_80_80(x) (BW_NSS_FWCONF_MAP_ENABLE | SM(x - 1, BW_NSS_FWCONF_MAP_80_80MHZ))
+
+ struct wmi_10_4_peer_assoc_complete_cmd {
+ struct wmi_10_2_peer_assoc_complete_cmd cmd;
projects / openwrt / staging / blogic.git / blobdiff