wifi: iwlwifi: remove NVM C step override

This was used for debug/bringup of 8000 devices, to be able to
unify between all 8000 devices with NVM override. However, this
is really no longer used, those are ancient devices by now, so
we can remove the logic.

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

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/8000.c b/drivers/net/wireless/intel/iwlwifi/cfg/8000.c
index 9a1623091af70a7b8c3471253cd2288803b433f9..6f0e62a4c8fc5d2abb40d0134cf9212e31bd181f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/8000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/8000.c
@@ -35,8 +35,6 @@
 #define IWL8265_MODULE_FIRMWARE(api) \
        IWL8265_FW_PRE "-" __stringify(api) ".ucode"
 
-#define DEFAULT_NVM_FILE_FAMILY_8000C          "nvmData-8000C"
-
 static const struct iwl_base_params iwl8000_base_params = {
        .eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
        .num_of_queues = 31,
@@ -92,7 +90,6 @@ const struct iwl_cfg_trans_params iwl8000_trans_cfg = {
        .dccm2_len = IWL8260_DCCM2_LEN,                                 \
        .smem_offset = IWL8260_SMEM_OFFSET,                             \
        .smem_len = IWL8260_SMEM_LEN,                                   \
-       .default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C,       \
        .thermal_params = &iwl8000_tt_params,                           \
        .apmg_not_supported = true,                                     \
        .nvm_type = IWL_NVM_EXT,                                        \

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index fe701410a44f237981766c2926314c653bd7cd3f..e2ce1c7d8c90c562b48dfaad1d57ec63a48cd705 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -362,7 +362,6 @@ struct iwl_cfg {
        const struct iwl_ht_params *ht_params;
        const struct iwl_eeprom_params *eeprom_params;
        const struct iwl_pwr_tx_backoff *pwr_tx_backoffs;
-       const char *default_nvm_file_C_step;
        const struct iwl_tt_params *thermal_params;
        enum iwl_led_mode led_mode;
        enum iwl_nvm_type nvm_type;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
index db49f0caff129bf48e4d77d8a34a5ce0614ef3a9..734f9e814a5485ecc5bd3ff9650b5537aaea59f6 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
@@ -308,7 +308,6 @@ int iwl_nvm_init(struct iwl_mvm *mvm)
        int ret, section;
        u32 size_read = 0;
        u8 *nvm_buffer, *temp;
-       const char *nvm_file_C = mvm->cfg->default_nvm_file_C_step;
 
        if (WARN_ON_ONCE(mvm->cfg->nvm_hw_section_num >= NVM_MAX_NUM_SECTIONS))
                return -EINVAL;
@@ -384,21 +383,8 @@ int iwl_nvm_init(struct iwl_mvm *mvm)
                /* read External NVM file from the mod param */
                ret = iwl_read_external_nvm(mvm->trans, mvm->nvm_file_name,
                                            mvm->nvm_sections);
-               if (ret) {
-                       mvm->nvm_file_name = nvm_file_C;
-
-                       if ((ret == -EFAULT || ret == -ENOENT) &&
-                           mvm->nvm_file_name) {
-                               /* in case nvm file was failed try again */
-                               ret = iwl_read_external_nvm(mvm->trans,
-                                                           mvm->nvm_file_name,
-                                                           mvm->nvm_sections);
-                               if (ret)
-                                       return ret;
-                       } else {
-                               return ret;
-                       }
-               }
+               if (ret)
+                       return ret;
        }
 
        /* parse the relevant nvm sections */