wifi: iwlwifi: mvm: limit EHT 320 MHz MCS for STEP URM

If the STEP (the interface between MAC and PHY) is in URM
(a lower speed mode) then we cannot use 320 MHz MCS > 9.
Therefore, limit the MCS in our capabilities in this case.
Note that this also limits the TX/rate scaling since that
takes both TX and RX capabilities into account.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Gregory Greenman <gregory.greenman@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240123200528.02bae683b7fc.Id5efbb71d45da02c8c4e211d20396637ddd44da8@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index 67c7cda073e8d0972cb545ea9a6860b94a92dea4..8e6ce484db87a45bdc438e23ca8a1301ed36a584 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -1061,6 +1061,11 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans,
                        ~IEEE80211_HE_PHY_CAP7_STBC_RX_ABOVE_80MHZ;
        }
 
+       if (trans->step_urm) {
+               iftype_data->eht_cap.eht_mcs_nss_supp.bw._320.rx_tx_mcs11_max_nss = 0;
+               iftype_data->eht_cap.eht_mcs_nss_supp.bw._320.rx_tx_mcs13_max_nss = 0;
+       }
+
        if (trans->no_160)
                iftype_data->he_cap.he_cap_elem.phy_cap_info[0] &=
                        ~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
index dd32c287b98361d108a771bde82889a4e7d10cb9..c1c7d44f421bae2659dea26963efdd88c51154ea 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
@@ -374,6 +374,9 @@ enum {
 #define CNVR_SCU_SD_REGS_SD_REG_ACTIVE_VDIG_MIRROR     0xA29938
 #define CNVI_SCU_SEQ_DATA_DW9                          0xA27488
 
+#define CNVI_PMU_STEP_FLOW                             0xA2D588
+#define CNVI_PMU_STEP_FLOW_FORCE_URM                   BIT(2)
+
 #define PREG_AUX_BUS_WPROT_0           0xA04CC0
 
 /* device family 9000 WPROT register */

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
index e3b76c682d76926276c436fc3a336b9a36d26a20..3047ffc244158425d28e55f678fe21dd329a3652 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
@@ -1070,6 +1070,7 @@ struct iwl_trans_txqs {
  * @invalid_tx_cmd: invalid TX command buffer
  * @reduced_cap_sku: reduced capability supported SKU
  * @no_160: device not supporting 160 MHz
+ * @step_urm: STEP is in URM, no support for MCS>9 in 320 MHz
  */
 struct iwl_trans {
        bool csme_own;
@@ -1093,7 +1094,8 @@ struct iwl_trans {
        char hw_id_str[52];
        u32 sku_id[3];
        bool reduced_cap_sku;
-       u8 no_160;
+       u8 no_160:1, step_urm:1;
+
        u8 rx_mpdu_cmd, rx_mpdu_cmd_hdr_size;
 
        bool pm_support;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 1252084662c6fefce67fefaa9b16e6a5c558bb64..b6acf4ade552f7d199fd4f5c0e2c23a2f23dc4b7 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -677,6 +677,11 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)
        iwl_dbg_tlv_time_point(&mvm->fwrt, IWL_FW_INI_TIME_POINT_AFTER_ALIVE,
                               NULL);
 
+       if (mvm->trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_BZ)
+               mvm->trans->step_urm = !!(iwl_read_umac_prph(mvm->trans,
+                                                            CNVI_PMU_STEP_FLOW) &
+                                               CNVI_PMU_STEP_FLOW_FORCE_URM);
+
        /* Send init config command to mark that we are sending NVM access
         * commands
         */