Skip to content

Commit e34aa5a

Browse files
lucacoelholucacoelho
committed
iwlwifi: pcie: remove occurrences of 22000 in the FW name defines
We don't use the number 22000 for our devices anymore, so remove all occurrences of it in the FW name macros. While at it, add IWL_QU_B_HR_B to the list of firmwares used by the driver, which was missing. Signed-off-by: Luca Coelho <[email protected]> Link: https://lore.kernel.org/r/iwlwifi.20200424194456.93cc41bdbb4d.Ib7599901888a2d050f851bd878a875f593f2e8e5@changeid
1 parent d5727b6 commit e34aa5a

File tree

1 file changed

+32
-40
lines changed
  • drivers/net/wireless/intel/iwlwifi/cfg

1 file changed

+32
-40
lines changed

‎drivers/net/wireless/intel/iwlwifi/cfg/22000.c

Lines changed: 32 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,7 @@
7373
#define IWL_22000_SMEM_OFFSET 0x400000
7474
#define IWL_22000_SMEM_LEN 0xD0000
7575

76-
#define IWL_22000_JF_FW_PRE "iwlwifi-Qu-a0-jf-b0-"
77-
#define IWL_22000_HR_FW_PRE "iwlwifi-Qu-a0-hr-a0-"
78-
#define IWL_22000_HR_CDB_FW_PRE "iwlwifi-QuIcp-z0-hrcdb-a0-"
79-
#define IWL_22000_QU_B_HR_B_FW_PRE "iwlwifi-Qu-b0-hr-b0-"
76+
#define IWL_QU_B_HR_B_FW_PRE "iwlwifi-Qu-b0-hr-b0-"
8077
#define IWL_QNJ_B_HR_B_FW_PRE "iwlwifi-QuQnj-b0-hr-b0-"
8178
#define IWL_QU_C_HR_B_FW_PRE "iwlwifi-Qu-c0-hr-b0-"
8279
#define IWL_QU_B_JF_B_FW_PRE "iwlwifi-Qu-b0-jf-b0-"
@@ -85,20 +82,16 @@
8582
#define IWL_QUZ_A_JF_B_FW_PRE "iwlwifi-QuZ-a0-jf-b0-"
8683
#define IWL_QNJ_B_JF_B_FW_PRE "iwlwifi-QuQnj-b0-jf-b0-"
8784
#define IWL_CC_A_FW_PRE "iwlwifi-cc-a0-"
88-
#define IWL_22000_SO_A_JF_B_FW_PRE "iwlwifi-so-a0-jf-b0-"
89-
#define IWL_22000_SO_A_HR_B_FW_PRE "iwlwifi-so-a0-hr-b0-"
90-
#define IWL_22000_SO_A_GF_A_FW_PRE "iwlwifi-so-a0-gf-a0-"
91-
#define IWL_22000_TY_A_GF_A_FW_PRE "iwlwifi-ty-a0-gf-a0-"
92-
#define IWL_22000_SO_A_GF4_A_FW_PRE "iwlwifi-so-a0-gf4-a0-"
85+
#define IWL_SO_A_JF_B_FW_PRE "iwlwifi-so-a0-jf-b0-"
86+
#define IWL_SO_A_HR_B_FW_PRE "iwlwifi-so-a0-hr-b0-"
87+
#define IWL_SO_A_GF_A_FW_PRE "iwlwifi-so-a0-gf-a0-"
88+
#define IWL_TY_A_GF_A_FW_PRE "iwlwifi-ty-a0-gf-a0-"
89+
#define IWL_SO_A_GF4_A_FW_PRE "iwlwifi-so-a0-gf4-a0-"
9390
#define IWL_SNJ_A_GF4_A_FW_PRE "iwlwifi-SoSnj-a0-gf4-a0-"
9491
#define IWL_SNJ_A_GF_A_FW_PRE "iwlwifi-SoSnj-a0-gf-a0-"
9592

96-
#define IWL_22000_HR_MODULE_FIRMWARE(api) \
97-
IWL_22000_HR_FW_PRE __stringify(api) ".ucode"
98-
#define IWL_22000_JF_MODULE_FIRMWARE(api) \
99-
IWL_22000_JF_FW_PRE __stringify(api) ".ucode"
100-
#define IWL_22000_QU_B_HR_B_MODULE_FIRMWARE(api) \
101-
IWL_22000_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"
93+
#define IWL_QU_B_HR_B_MODULE_FIRMWARE(api) \
94+
IWL_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"
10295
#define IWL_QNJ_B_HR_B_MODULE_FIRMWARE(api) \
10396
IWL_QNJ_B_HR_B_FW_PRE __stringify(api) ".ucode"
10497
#define IWL_QUZ_A_HR_B_MODULE_FIRMWARE(api) \
@@ -113,14 +106,14 @@
113106
IWL_QNJ_B_JF_B_FW_PRE __stringify(api) ".ucode"
114107
#define IWL_CC_A_MODULE_FIRMWARE(api) \
115108
IWL_CC_A_FW_PRE __stringify(api) ".ucode"
116-
#define IWL_22000_SO_A_JF_B_MODULE_FIRMWARE(api) \
117-
IWL_22000_SO_A_JF_B_FW_PRE __stringify(api) ".ucode"
118-
#define IWL_22000_SO_A_HR_B_MODULE_FIRMWARE(api) \
119-
IWL_22000_SO_A_HR_B_FW_PRE __stringify(api) ".ucode"
120-
#define IWL_22000_SO_A_GF_A_MODULE_FIRMWARE(api) \
121-
IWL_22000_SO_A_GF_A_FW_PRE __stringify(api) ".ucode"
122-
#define IWL_22000_TY_A_GF_A_MODULE_FIRMWARE(api) \
123-
IWL_22000_TY_A_GF_A_FW_PRE __stringify(api) ".ucode"
109+
#define IWL_SO_A_JF_B_MODULE_FIRMWARE(api) \
110+
IWL_SO_A_JF_B_FW_PRE __stringify(api) ".ucode"
111+
#define IWL_SO_A_HR_B_MODULE_FIRMWARE(api) \
112+
IWL_SO_A_HR_B_FW_PRE __stringify(api) ".ucode"
113+
#define IWL_SO_A_GF_A_MODULE_FIRMWARE(api) \
114+
IWL_SO_A_GF_A_FW_PRE __stringify(api) ".ucode"
115+
#define IWL_TY_A_GF_A_MODULE_FIRMWARE(api) \
116+
IWL_TY_A_GF_A_FW_PRE __stringify(api) ".ucode"
124117
#define IWL_SNJ_A_GF4_A_MODULE_FIRMWARE(api) \
125118
IWL_SNJ_A_GF4_A_FW_PRE __stringify(api) ".ucode"
126119
#define IWL_SNJ_A_GF_A_MODULE_FIRMWARE(api) \
@@ -352,7 +345,7 @@ const char iwl_ax200_killer_1650x_name[] =
352345

353346
const struct iwl_cfg iwl_ax101_cfg_qu_hr = {
354347
.name = "Intel(R) Wi-Fi 6 AX101",
355-
.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,
348+
.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,
356349
IWL_DEVICE_22500,
357350
/*
358351
* This device doesn't support receiving BlockAck with a large bitmap
@@ -366,7 +359,7 @@ const struct iwl_cfg iwl_ax101_cfg_qu_hr = {
366359

367360
const struct iwl_cfg iwl_ax201_cfg_qu_hr = {
368361
.name = "Intel(R) Wi-Fi 6 AX201 160MHz",
369-
.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,
362+
.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,
370363
IWL_DEVICE_22500,
371364
/*
372365
* This device doesn't support receiving BlockAck with a large bitmap
@@ -471,7 +464,7 @@ const struct iwl_cfg iwl_ax200_cfg_cc = {
471464

472465
const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = {
473466
.name = "Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)",
474-
.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,
467+
.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,
475468
IWL_DEVICE_22500,
476469
/*
477470
* This device doesn't support receiving BlockAck with a large bitmap
@@ -484,7 +477,7 @@ const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0 = {
484477

485478
const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0 = {
486479
.name = "Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W)",
487-
.fw_name_pre = IWL_22000_QU_B_HR_B_FW_PRE,
480+
.fw_name_pre = IWL_QU_B_HR_B_FW_PRE,
488481
IWL_DEVICE_22500,
489482
/*
490483
* This device doesn't support receiving BlockAck with a large bitmap
@@ -535,29 +528,29 @@ const struct iwl_cfg iwl_qnj_b0_hr_b0_cfg = {
535528

536529
const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0 = {
537530
.name = "Intel(R) Wireless-AC 9560 160MHz",
538-
.fw_name_pre = IWL_22000_SO_A_JF_B_FW_PRE,
531+
.fw_name_pre = IWL_SO_A_JF_B_FW_PRE,
539532
IWL_DEVICE_AX210,
540533
.num_rbds = IWL_NUM_RBDS_NON_HE,
541534
};
542535

543536
const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0 = {
544537
.name = "Intel(R) Wi-Fi 6 AX210 160MHz",
545-
.fw_name_pre = IWL_22000_SO_A_HR_B_FW_PRE,
538+
.fw_name_pre = IWL_SO_A_HR_B_FW_PRE,
546539
IWL_DEVICE_AX210,
547540
.num_rbds = IWL_NUM_RBDS_AX210_HE,
548541
};
549542

550543
const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0 = {
551544
.name = "Intel(R) Wi-Fi 6 AX211 160MHz",
552-
.fw_name_pre = IWL_22000_SO_A_GF_A_FW_PRE,
545+
.fw_name_pre = IWL_SO_A_GF_A_FW_PRE,
553546
.uhb_supported = true,
554547
IWL_DEVICE_AX210,
555548
.num_rbds = IWL_NUM_RBDS_AX210_HE,
556549
};
557550

558551
const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0_long = {
559552
.name = "Intel(R) Wi-Fi 6 AX211 160MHz",
560-
.fw_name_pre = IWL_22000_SO_A_GF_A_FW_PRE,
553+
.fw_name_pre = IWL_SO_A_GF_A_FW_PRE,
561554
.uhb_supported = true,
562555
IWL_DEVICE_AX210,
563556
.num_rbds = IWL_NUM_RBDS_AX210_HE,
@@ -567,23 +560,23 @@ const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0_long = {
567560

568561
const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = {
569562
.name = "Intel(R) Wi-Fi 6 AX210 160MHz",
570-
.fw_name_pre = IWL_22000_TY_A_GF_A_FW_PRE,
563+
.fw_name_pre = IWL_TY_A_GF_A_FW_PRE,
571564
.uhb_supported = true,
572565
IWL_DEVICE_AX210,
573566
.num_rbds = IWL_NUM_RBDS_AX210_HE,
574567
};
575568

576569
const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0 = {
577570
.name = "Intel(R) Wi-Fi 6 AX411 160MHz",
578-
.fw_name_pre = IWL_22000_SO_A_GF4_A_FW_PRE,
571+
.fw_name_pre = IWL_SO_A_GF4_A_FW_PRE,
579572
.uhb_supported = true,
580573
IWL_DEVICE_AX210,
581574
.num_rbds = IWL_NUM_RBDS_AX210_HE,
582575
};
583576

584577
const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0_long = {
585578
.name = "Intel(R) Wi-Fi 6 AX411 160MHz",
586-
.fw_name_pre = IWL_22000_SO_A_GF4_A_FW_PRE,
579+
.fw_name_pre = IWL_SO_A_GF4_A_FW_PRE,
587580
.uhb_supported = true,
588581
IWL_DEVICE_AX210,
589582
.num_rbds = IWL_NUM_RBDS_AX210_HE,
@@ -607,18 +600,17 @@ const struct iwl_cfg iwlax211_cfg_snj_gf_a0 = {
607600
.num_rbds = IWL_NUM_RBDS_AX210_HE,
608601
};
609602

610-
MODULE_FIRMWARE(IWL_22000_HR_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
611-
MODULE_FIRMWARE(IWL_22000_JF_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
603+
MODULE_FIRMWARE(IWL_QU_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
612604
MODULE_FIRMWARE(IWL_QNJ_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
613605
MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
614606
MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
615607
MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
616608
MODULE_FIRMWARE(IWL_QUZ_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
617609
MODULE_FIRMWARE(IWL_QNJ_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
618610
MODULE_FIRMWARE(IWL_CC_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
619-
MODULE_FIRMWARE(IWL_22000_SO_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
620-
MODULE_FIRMWARE(IWL_22000_SO_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
621-
MODULE_FIRMWARE(IWL_22000_SO_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
622-
MODULE_FIRMWARE(IWL_22000_TY_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
611+
MODULE_FIRMWARE(IWL_SO_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
612+
MODULE_FIRMWARE(IWL_SO_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
613+
MODULE_FIRMWARE(IWL_SO_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
614+
MODULE_FIRMWARE(IWL_TY_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
623615
MODULE_FIRMWARE(IWL_SNJ_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
624616
MODULE_FIRMWARE(IWL_SNJ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

0 commit comments

Comments
 (0)