From: Emmanuel Grumbach Date: Tue, 12 May 2026 05:22:59 +0000 (+0300) Subject: wifi: iwlwifi: remove nvm_ver for devices that don't need it X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd2484732db163889d7b7a1732eb83c60afd934b;p=thirdparty%2Flinux.git wifi: iwlwifi: remove nvm_ver for devices that don't need it This was needed only to check the NVM for devices that had a specific firmware image to run the initial calibrations. Remove this field from newer devices that no longer have a specific image for those. Signed-off-by: Emmanuel Grumbach Reviewed-by: Johannes Berg Link: https://patch.msgid.link/20260512082114.261b04a1b8f2.I5834a3efd0ae7e601a02cc0582287ced405a0aef@changeid Signed-off-by: Miri Korenblit --- diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c b/drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c index ad2536f530847..f482536e6b5e3 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* * Copyright (C) 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2025 Intel Corporation + * Copyright (C) 2018-2026 Intel Corporation */ #include "iwl-config.h" @@ -11,9 +11,6 @@ #define IWL_GL_B_FM_B_FW_PRE "iwlwifi-gl-b0-fm-b0" #define IWL_GL_C_FM_C_FW_PRE "iwlwifi-gl-c0-fm-c0" -/* NVM versions */ -#define IWL_FM_NVM_VERSION 0x0a1d - #define IWL_DEVICE_FM \ .ht_params = { \ .stbc = true, \ @@ -27,7 +24,6 @@ .uhb_supported = true, \ .eht_supported = true, \ .num_rbds = IWL_NUM_RBDS_EHT, \ - .nvm_ver = IWL_FM_NVM_VERSION, \ .nvm_type = IWL_NVM_EXT const struct iwl_rf_cfg iwl_rf_fm = { diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c b/drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c index c16cda087a7c3..0c20fe619f935 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c @@ -35,9 +35,6 @@ #define IWL_SC_A_GF4_A_MODULE_FIRMWARE(api) \ IWL_SC_A_GF4_A_FW_PRE "-" __stringify(api) ".ucode" -/* NVM versions */ -#define IWL_GF_NVM_VERSION 0x0a1d - const struct iwl_rf_cfg iwl_rf_gf = { .uhb_supported = true, .led_mode = IWL_LED_RF_STATE, @@ -49,7 +46,6 @@ const struct iwl_rf_cfg iwl_rf_gf = { .ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ), }, - .nvm_ver = IWL_GF_NVM_VERSION, .nvm_type = IWL_NVM_EXT, .num_rbds = IWL_NUM_RBDS_HE, .ucode_api_min = IWL_GF_UCODE_API_MIN, diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c b/drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c index 6cf187d92dbf6..3c3a8d5702d85 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* * Copyright (C) 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2025 Intel Corporation + * Copyright (C) 2018-2026 Intel Corporation */ #include "iwl-config.h" @@ -40,9 +40,6 @@ #define IWL_SC_A_HR_B_FW_MODULE_FIRMWARE(api) \ IWL_SC_A_HR_B_FW_PRE "-" __stringify(api) ".ucode" -/* NVM versions */ -#define IWL_HR_NVM_VERSION 0x0a1d - #define IWL_DEVICE_HR \ .led_mode = IWL_LED_RF_STATE, \ .non_shared_ant = ANT_B, \ @@ -54,7 +51,6 @@ BIT(NL80211_BAND_5GHZ), \ }, \ .num_rbds = IWL_NUM_RBDS_HE, \ - .nvm_ver = IWL_HR_NVM_VERSION, \ .nvm_type = IWL_NVM_EXT, \ .ucode_api_min = IWL_HR_UCODE_API_MIN, \ .ucode_api_max = IWL_HR_UCODE_API_MAX diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/rf-pe.c b/drivers/net/wireless/intel/iwlwifi/cfg/rf-pe.c index c02478b730579..7a04cb120b1b2 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/rf-pe.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/rf-pe.c @@ -1,11 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2025 Intel Corporation + * Copyright (C) 2025-2026 Intel Corporation */ #include "iwl-config.h" -#define IWL_PE_NVM_VERSION 0x0a1d - #define IWL_DEVICE_PE \ .ht_params = { \ .stbc = true, \ @@ -20,7 +18,6 @@ .eht_supported = true, \ .uhr_supported = true, \ .num_rbds = IWL_NUM_RBDS_EHT, \ - .nvm_ver = IWL_PE_NVM_VERSION, \ .nvm_type = IWL_NVM_EXT const struct iwl_rf_cfg iwl_rf_pe = { diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/rf-wh.c b/drivers/net/wireless/intel/iwlwifi/cfg/rf-wh.c index b5803ea1eb782..fa63a9a012645 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/rf-wh.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/rf-wh.c @@ -1,12 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2025 Intel Corporation + * Copyright (C) 2025-2026 Intel Corporation */ #include "iwl-config.h" -/* NVM versions */ -#define IWL_WH_NVM_VERSION 0x0a1d - #define IWL_DEVICE_WH \ .ht_params = { \ .stbc = true, \ @@ -19,7 +16,6 @@ .vht_mu_mimo_supported = true, \ .uhb_supported = true, \ .num_rbds = IWL_NUM_RBDS_EHT, \ - .nvm_ver = IWL_WH_NVM_VERSION, \ .nvm_type = IWL_NVM_EXT /* currently iwl_rf_wh/iwl_rf_wh_160mhz are just defines for the FM ones */ diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c index 8e6efde3c64ba..4532d31d5f8be 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c @@ -15,9 +15,6 @@ /* Lowest firmware API version supported */ #define IWL_SC_UCODE_API_MIN 100 -/* NVM versions */ -#define IWL_SC_NVM_VERSION 0x0a1d - /* Memory offsets and lengths */ #define IWL_SC_SMEM_OFFSET 0x400000 #define IWL_SC_SMEM_LEN 0xD0000