wifi: iwlwifi: mvm: rename 'pldr_sync'

PLDR (product level device reset) is a Windows term, and
is something the driver triggers there, AFAICT.

Really what 'pldr_sync' here wants to capture is whether
or not the firmware will/may do a product reset during
initialization, which makes the device drop off the bus,
requiring a rescan. If this is the case, obviously the
init will fail/time out, so we don't want to report all
kinds of errors etc., hence this tracking variable.

Rename it to 'fw_product_reset' to capture the meaning
better.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20240618194245.ccf849642af8.I01dded6b2393771b7baf8b4b17336784d987c7c2@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 36ed08f20f80c6256dc582f77ded691761fb82b8..0a8bd957bd6c3bf3b9254aa61ef6b76a4c34f1a9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -408,7 +408,7 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,
                                                UREG_LMAC2_CURRENT_PC));
                }
 
-               if (ret == -ETIMEDOUT && !mvm->pldr_sync)
+               if (ret == -ETIMEDOUT && !mvm->fw_product_reset)
                        iwl_fw_dbg_error_collect(&mvm->fwrt,
                                                 FW_DBG_TRIGGER_ALIVE_TIMEOUT);
 
@@ -627,8 +627,8 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)
        if (mvm->trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_AX210) {
                sb_cfg = iwl_read_umac_prph(mvm->trans, SB_MODIFY_CFG_FLAG);
                /* if needed, we'll reset this on our way out later */
-               mvm->pldr_sync = sb_cfg == SB_CFG_RESIDES_IN_ROM;
-               if (mvm->pldr_sync && iwl_mei_pldr_req())
+               mvm->fw_product_reset = sb_cfg == SB_CFG_RESIDES_IN_ROM;
+               if (mvm->fw_product_reset && iwl_mei_pldr_req())
                        return -EBUSY;
        }
 
@@ -647,7 +647,7 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)
                IWL_ERR(mvm, "Failed to start RT ucode: %d\n", ret);
 
                /* if we needed reset then fail here, but notify and remove */
-               if (mvm->pldr_sync) {
+               if (mvm->fw_product_reset) {
                        iwl_mei_alive_notif(false);
                        iwl_trans_pcie_remove(mvm->trans, true);
                }
@@ -1407,14 +1407,14 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
        ret = iwl_mvm_load_rt_fw(mvm);
        if (ret) {
                IWL_ERR(mvm, "Failed to start RT ucode: %d\n", ret);
-               if (ret != -ERFKILL && !mvm->pldr_sync)
+               if (ret != -ERFKILL && !mvm->fw_product_reset)
                        iwl_fw_dbg_error_collect(&mvm->fwrt,
                                                 FW_DBG_TRIGGER_DRIVER);
                goto error;
        }
 
        /* FW loaded successfully */
-       mvm->pldr_sync = false;
+       mvm->fw_product_reset = false;
 
        iwl_fw_disable_dbg_asserts(&mvm->fwrt);
        iwl_get_shared_mem_conf(&mvm->fwrt);

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 3692f62ee89577b3bc8f861e58fb8e775c8db720..5bd388881092e52c458ada44c74def55192db322 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -1325,7 +1325,12 @@ struct iwl_mvm {
        bool sta_remove_requires_queue_remove;
        bool mld_api_is_used;
 
-       bool pldr_sync;
+       /*
+        * Indicates that firmware will do a product reset (and then
+        * therefore fail to load) when we start it (due to OTP burn),
+        * if so don't dump errors etc. since this is expected.
+        */
+       bool fw_product_reset;
 
        struct iwl_time_sync_data time_sync;
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index f8a4fefede8df32a83d455ed55841df589375ec5..008fe5fece874588ad2688cdf3946c8b78a526f2 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -875,7 +875,7 @@ get_nvm_from_fw:
                IWL_ERR(mvm, "Failed to run INIT ucode: %d\n", ret);
 
        /* no longer need this regardless of failure or not */
-       mvm->pldr_sync = false;
+       mvm->fw_product_reset = false;
 
        return ret;
 }