wifi: iwlwifi: bump core version for BZ/SC/DR

Start supporting Core 100 FW on those devices.
In addition, the move to the new Core scheme (instead of API scheme)
will start Core 100 and not 99, as planned. Adjust for that as well.

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

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
index 7babb60463bef110dbcdef0098f0fceb261a6f68..28005f25c38b53a50f75aa32b08f57fe456429ce 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
@@ -10,7 +10,7 @@
 #include "fw/api/txq.h"
 
 /* Highest firmware core release supported */
-#define IWL_BZ_UCODE_CORE_MAX  99
+#define IWL_BZ_UCODE_CORE_MAX  100
 
 /* Lowest firmware API version supported */
 #define IWL_BZ_UCODE_API_MIN   100

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c
index ad65951d5643ce5f5bd2d652db1c9cdd7209a830..c1c6174534d7fd897f50e71fea625d5c33b36965 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c
@@ -9,7 +9,7 @@
 #include "fw/api/txq.h"
 
 /* Highest firmware core release supported */
-#define IWL_DR_UCODE_CORE_MAX  99
+#define IWL_DR_UCODE_CORE_MAX  100
 
 /* Lowest firmware API version supported */
 #define IWL_DR_UCODE_API_MIN   100

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c
index abb6283dfb8f434f979841ca2008420b7d560bd1..d9943d252ae05a808589f6a197a3a4c6965866c6 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c
@@ -10,7 +10,7 @@
 #include "fw/api/txq.h"
 
 /* Highest firmware core release supported */
-#define IWL_SC_UCODE_CORE_MAX  99
+#define IWL_SC_UCODE_CORE_MAX  100
 
 /* Lowest firmware API version supported */
 #define IWL_SC_UCODE_API_MIN   100

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index 94ef422dc56a98bf15b7413a0a56f21fdbb73590..3391f07b01de3c19e767acf8ef2343067fd1e37f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -348,8 +348,8 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first)
 
        if (first)
                drv->fw_index = ucode_api_max;
-       else if (drv->fw_index == ENCODE_CORE_AS_API(99))
-               drv->fw_index = 101; /* last API-scheme number below core 99 */
+       else if (drv->fw_index == ENCODE_CORE_AS_API(100))
+               drv->fw_index = 102; /* last API-scheme number below core 100 */
        else
                drv->fw_index--;