wifi: iwlwifi: set step_urm in transport and not in the opmodes

This has nothing to do with the opmode. Set it in the transport layer
instead.

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Tested-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Link: https://patch.msgid.link/20250423091408.4e288f7897be.I0c8f792ea2ed6967f8c6d8181f9c5f74bbec7d18@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/fw.c b/drivers/net/wireless/intel/iwlwifi/mld/fw.c
index 14aacfbab5c8bca012532e571fcd9f17e79afedb..6e9af37fb86dba666b8d234d293f17adf9b15a62 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/fw.c
@@ -266,10 +266,6 @@ static int iwl_mld_run_fw_init_sequence(struct iwl_mld *mld)
        if (ret)
                return ret;
 
-       mld->trans->step_urm =
-               !!(iwl_read_umac_prph(mld->trans, CNVI_PMU_STEP_FLOW) &
-                  CNVI_PMU_STEP_FLOW_FORCE_URM);
-
        ret = iwl_pnvm_load(mld->trans, &mld->notif_wait,
                            &mld->fw->ucode_capa);
        if (ret) {

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 2b5a62604fc40b5cc7b19f1619c470104c01ae43..f67348acd5f0bd4287f29ae65e836881b1b8a9f5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -651,11 +651,6 @@ 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
         */

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
index 472f26f83ba833d3c5696b26bcc7c42afdfd31a5..cfd94205be4946667eeac878ab497230fbe0ebc2 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
@@ -379,6 +379,11 @@ void iwl_trans_pcie_gen2_fw_alive(struct iwl_trans *trans)
 
        iwl_pcie_get_rf_name(trans);
        mutex_unlock(&trans_pcie->mutex);
+
+       if (trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_BZ)
+               trans->step_urm = !!(iwl_read_umac_prph(trans,
+                                                       CNVI_PMU_STEP_FLOW) &
+                                       CNVI_PMU_STEP_FLOW_FORCE_URM);
 }
 
 static bool iwl_pcie_set_ltr(struct iwl_trans *trans)