iwlwifi: mvm: Check ret code for iwl_mvm_load_nvm_to_nic

Return value of the iwl_mvm_load_nvm_to_nic func is not analyzed. If load
NVM to nic func fails and NVM is not loaded to fw properly, then fw may
behave badly and lead to some strange issue. This commit will analyze
return value and if load NVM to nic has failed, then the error code is
sent to the previous func, which will trigger WRT log collection.
iwl_fw_dbg_error_collect() func collects dump only if tri type is
FW_DBG_TRIGGER_ALIVE_TIMEOUT. But when Load NVM to nic function fails
trig_type is FW_DBG_TRIGGER_DRIVER. This commit also has code changes to
collect dump when trig_type is FW_DBG_TRIGGER_DRIVER.

Signed-off-by: Abhishek Naik <abhishek.naik@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210210171218.32998850192a.Ic58d08cb6944ca55e343ff0032c82cfa7821e588@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index 811480eac5fa1f41f9efa7a4b7506e5985f7e6ec..504729663c350a578aff2c2d9f706e73a42e9cb5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -2447,7 +2447,8 @@ int iwl_fw_dbg_error_collect(struct iwl_fw_runtime *fwrt,
                return -EIO;
 
        if (iwl_trans_dbg_ini_valid(fwrt->trans)) {
-               if (trig_type != FW_DBG_TRIGGER_ALIVE_TIMEOUT)
+               if (trig_type != FW_DBG_TRIGGER_ALIVE_TIMEOUT &&
+                   trig_type != FW_DBG_TRIGGER_DRIVER)
                        return -EIO;
 
                iwl_dbg_tlv_time_point(fwrt,

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 4d5def7e2d8cbe97be7e9ec25b7152598fbc2bd3..15e2773ce7e700e85a58957dd88c0acf40f730ae 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -476,9 +476,13 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm)
 
        /* Load NVM to NIC if needed */
        if (mvm->nvm_file_name) {
-               iwl_read_external_nvm(mvm->trans, mvm->nvm_file_name,
-                                     mvm->nvm_sections);
-               iwl_mvm_load_nvm_to_nic(mvm);
+               ret = iwl_read_external_nvm(mvm->trans, mvm->nvm_file_name,
+                                           mvm->nvm_sections);
+               if (ret)
+                       goto error;
+               ret = iwl_mvm_load_nvm_to_nic(mvm);
+               if (ret)
+                       goto error;
        }
 
        if (IWL_MVM_PARSE_NVM && !mvm->nvm_data) {
@@ -659,8 +663,11 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm)
        }
 
        /* In case we read the NVM from external file, load it to the NIC */
-       if (mvm->nvm_file_name)
-               iwl_mvm_load_nvm_to_nic(mvm);
+       if (mvm->nvm_file_name) {
+               ret = iwl_mvm_load_nvm_to_nic(mvm);
+               if (ret)
+                       goto remove_notif;
+       }
 
        WARN_ONCE(mvm->nvm_data->nvm_version < mvm->trans->cfg->nvm_ver,
                  "Too old NVM version (0x%0x, required = 0x%0x)",