From: Miri Korenblit Date: Tue, 12 May 2026 05:23:03 +0000 (+0300) Subject: wifi: iwlwifi: stop supporting cores 97 to 100 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=982b8a36c04a04829c0997641e3d501c7df12902;p=thirdparty%2Fkernel%2Flinux.git wifi: iwlwifi: stop supporting cores 97 to 100 Remove support from cores 97 to 100, including. Reviewed-by: Johannes Berg Link: https://patch.msgid.link/20260512082114.3dc9251c69ef.Icc027dc533f06ac007abfa0356774948ffdfaf3d@changeid Signed-off-by: Miri Korenblit --- diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c index 8b3f158993967..c060b12cc952d 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c @@ -12,8 +12,8 @@ /* Highest firmware core release supported */ #define IWL_BZ_UCODE_CORE_MAX 103 -/* Lowest firmware API version supported */ -#define IWL_BZ_UCODE_API_MIN 100 +/* Lowest firmware core release supported */ +#define IWL_BZ_UCODE_CORE_MIN 101 /* Memory offsets and lengths */ #define IWL_BZ_SMEM_OFFSET 0x400000 @@ -69,7 +69,7 @@ static const struct iwl_family_base_params iwl_bz_base = { }, .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, .ucode_api_max = ENCODE_CORE_AS_API(IWL_BZ_UCODE_CORE_MAX), - .ucode_api_min = IWL_BZ_UCODE_API_MIN, + .ucode_api_min = ENCODE_CORE_AS_API(IWL_BZ_UCODE_CORE_MIN), }; const struct iwl_mac_cfg iwl_bz_mac_cfg = { diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c index a8f2ac688d312..3ccbb21276c1c 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c @@ -11,8 +11,8 @@ /* Highest firmware core release supported */ #define IWL_DR_UCODE_CORE_MAX 103 -/* Lowest firmware API version supported */ -#define IWL_DR_UCODE_API_MIN 100 +/* Lowest firmware core release supported */ +#define IWL_DR_UCODE_CORE_MIN 101 /* Memory offsets and lengths */ #define IWL_DR_SMEM_OFFSET 0x400000 @@ -70,7 +70,7 @@ static const struct iwl_family_base_params iwl_dr_base = { }, .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, .ucode_api_max = ENCODE_CORE_AS_API(IWL_DR_UCODE_CORE_MAX), - .ucode_api_min = IWL_DR_UCODE_API_MIN, + .ucode_api_min = ENCODE_CORE_AS_API(IWL_DR_UCODE_CORE_MIN), }; const struct iwl_mac_cfg iwl_dr_mac_cfg = { diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c index 4532d31d5f8be..04c726e8c2835 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c @@ -12,8 +12,8 @@ /* Highest firmware core release supported */ #define IWL_SC_UCODE_CORE_MAX 103 -/* Lowest firmware API version supported */ -#define IWL_SC_UCODE_API_MIN 100 +/* Lowest firmware core release supported */ +#define IWL_SC_UCODE_CORE_MIN 101 /* Memory offsets and lengths */ #define IWL_SC_SMEM_OFFSET 0x400000 @@ -75,7 +75,7 @@ static const struct iwl_family_base_params iwl_sc_base = { }, .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, .ucode_api_max = ENCODE_CORE_AS_API(IWL_SC_UCODE_CORE_MAX), - .ucode_api_min = IWL_SC_UCODE_API_MIN, + .ucode_api_min = ENCODE_CORE_AS_API(IWL_SC_UCODE_CORE_MIN), }; const struct iwl_mac_cfg iwl_sc_mac_cfg = {