Skip to content

Commit d5727b6

Browse files
lucacoelholucacoelho
committed
iwlwifi: pcie: convert QnJ with Hr to the device table
Convert all the occurrences of QnJ with Hr into a single entry in the PCI device table. Signed-off-by: Luca Coelho <[email protected]> Link: https://lore.kernel.org/r/iwlwifi.20200424194456.21283ca79d82.I57a493c679a56fff11417afdaec76617711ff6a9@changeid
1 parent ebe7b06 commit d5727b6

File tree

3 files changed

+14
-28
lines changed

3 files changed

+14
-28
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
#define IWL_22000_HR_FW_PRE "iwlwifi-Qu-a0-hr-a0-"
7878
#define IWL_22000_HR_CDB_FW_PRE "iwlwifi-QuIcp-z0-hrcdb-a0-"
7979
#define IWL_22000_QU_B_HR_B_FW_PRE "iwlwifi-Qu-b0-hr-b0-"
80-
#define IWL_22000_HR_B_FW_PRE "iwlwifi-QuQnj-b0-hr-b0-"
80+
#define IWL_QNJ_B_HR_B_FW_PRE "iwlwifi-QuQnj-b0-hr-b0-"
8181
#define IWL_QU_C_HR_B_FW_PRE "iwlwifi-Qu-c0-hr-b0-"
8282
#define IWL_QU_B_JF_B_FW_PRE "iwlwifi-Qu-b0-jf-b0-"
8383
#define IWL_QU_C_JF_B_FW_PRE "iwlwifi-Qu-c0-jf-b0-"
@@ -99,8 +99,8 @@
9999
IWL_22000_JF_FW_PRE __stringify(api) ".ucode"
100100
#define IWL_22000_QU_B_HR_B_MODULE_FIRMWARE(api) \
101101
IWL_22000_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"
102-
#define IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(api) \
103-
IWL_22000_HR_B_FW_PRE __stringify(api) ".ucode"
102+
#define IWL_QNJ_B_HR_B_MODULE_FIRMWARE(api) \
103+
IWL_QNJ_B_HR_B_FW_PRE __stringify(api) ".ucode"
104104
#define IWL_QUZ_A_HR_B_MODULE_FIRMWARE(api) \
105105
IWL_QUZ_A_HR_B_FW_PRE __stringify(api) ".ucode"
106106
#define IWL_QUZ_A_JF_B_MODULE_FIRMWARE(api) \
@@ -343,6 +343,7 @@ const struct iwl_cfg_trans_params iwl_ax200_trans_cfg = {
343343
};
344344

345345
const char iwl_ax200_name[] = "Intel(R) Wi-Fi 6 AX200 160MHz";
346+
const char iwl_ax201_name[] = "Intel(R) Wi-Fi 6 AX201 160MHz";
346347

347348
const char iwl_ax200_killer_1650w_name[] =
348349
"Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W)";
@@ -520,9 +521,8 @@ const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0 = {
520521
.num_rbds = IWL_NUM_RBDS_22000_HE,
521522
};
522523

523-
const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0 = {
524-
.name = "Intel(R) Dual Band Wireless AX 22000",
525-
.fw_name_pre = IWL_22000_HR_B_FW_PRE,
524+
const struct iwl_cfg iwl_qnj_b0_hr_b0_cfg = {
525+
.fw_name_pre = IWL_QNJ_B_HR_B_FW_PRE,
526526
IWL_DEVICE_22500,
527527
/*
528528
* This device doesn't support receiving BlockAck with a large bitmap
@@ -609,7 +609,7 @@ const struct iwl_cfg iwlax211_cfg_snj_gf_a0 = {
609609

610610
MODULE_FIRMWARE(IWL_22000_HR_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
611611
MODULE_FIRMWARE(IWL_22000_JF_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
612-
MODULE_FIRMWARE(IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
612+
MODULE_FIRMWARE(IWL_QNJ_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
613613
MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
614614
MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
615615
MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

‎drivers/net/wireless/intel/iwlwifi/iwl-config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,7 @@ extern const char iwl9260_killer_1550_name[];
535535
extern const char iwl9560_killer_1550i_name[];
536536
extern const char iwl9560_killer_1550s_name[];
537537
extern const char iwl_ax200_name[];
538+
extern const char iwl_ax201_name[];
538539
extern const char iwl_ax200_killer_1650w_name[];
539540
extern const char iwl_ax200_killer_1650x_name[];
540541

@@ -625,8 +626,7 @@ extern const struct iwl_cfg killer1650s_2ax_cfg_qu_c0_hr_b0;
625626
extern const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0;
626627
extern const struct iwl_cfg killer1650x_2ax_cfg;
627628
extern const struct iwl_cfg killer1650w_2ax_cfg;
628-
extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0_f0;
629-
extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0;
629+
extern const struct iwl_cfg iwl_qnj_b0_hr_b0_cfg;
630630
extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0;
631631
extern const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0;
632632
extern const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0;

‎drivers/net/wireless/intel/iwlwifi/pcie/drv.c

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,10 @@ static const struct iwl_dev_info iwl_dev_info_table[] = {
590590
IWL_DEV_INFO(0x2723, 0x1654, iwl_ax200_cfg_cc, iwl_ax200_killer_1650x_name),
591591
IWL_DEV_INFO(0x2723, IWL_CFG_ANY, iwl_ax200_cfg_cc, iwl_ax200_name),
592592

593-
/* Qu with Hr */
593+
/* QnJ with Hr */
594+
IWL_DEV_INFO(0x2720, IWL_CFG_ANY, iwl_qnj_b0_hr_b0_cfg, iwl_ax201_name),
595+
596+
/* Qu with Hr */
594597
IWL_DEV_INFO(0x43F0, 0x0044, iwl_ax101_cfg_qu_hr, NULL),
595598
IWL_DEV_INFO(0x43F0, 0x0070, iwl_ax201_cfg_qu_hr, NULL),
596599
IWL_DEV_INFO(0x43F0, 0x0074, iwl_ax201_cfg_qu_hr, NULL),
@@ -675,23 +678,6 @@ static const struct iwl_dev_info iwl_dev_info_table[] = {
675678
IWL_DEV_INFO(0x4DF0, 0x4070, iwl_ax201_cfg_qu_hr, NULL),
676679
IWL_DEV_INFO(0x4DF0, 0x4244, iwl_ax101_cfg_qu_hr, NULL),
677680

678-
IWL_DEV_INFO(0x2720, 0x0000, iwl22000_2ax_cfg_qnj_hr_b0, NULL),
679-
IWL_DEV_INFO(0x2720, 0x0040, iwl22000_2ax_cfg_qnj_hr_b0, NULL),
680-
IWL_DEV_INFO(0x2720, 0x0044, iwl22000_2ax_cfg_qnj_hr_b0, NULL),
681-
IWL_DEV_INFO(0x2720, 0x0070, iwl22000_2ax_cfg_qnj_hr_b0, NULL),
682-
IWL_DEV_INFO(0x2720, 0x0074, iwl22000_2ax_cfg_qnj_hr_b0, NULL),
683-
IWL_DEV_INFO(0x2720, 0x0078, iwl22000_2ax_cfg_qnj_hr_b0, NULL),
684-
IWL_DEV_INFO(0x2720, 0x007C, iwl22000_2ax_cfg_qnj_hr_b0, NULL),
685-
IWL_DEV_INFO(0x2720, 0x0244, iwl22000_2ax_cfg_qnj_hr_b0, NULL),
686-
IWL_DEV_INFO(0x2720, 0x0310, iwl22000_2ax_cfg_qnj_hr_b0, NULL),
687-
IWL_DEV_INFO(0x2720, 0x0A10, iwl22000_2ax_cfg_qnj_hr_b0, NULL),
688-
IWL_DEV_INFO(0x2720, 0x1080, iwl22000_2ax_cfg_qnj_hr_b0, NULL),
689-
IWL_DEV_INFO(0x2720, 0x1651, iwl22000_2ax_cfg_qnj_hr_b0, NULL),
690-
IWL_DEV_INFO(0x2720, 0x1652, iwl22000_2ax_cfg_qnj_hr_b0, NULL),
691-
IWL_DEV_INFO(0x2720, 0x2074, iwl22000_2ax_cfg_qnj_hr_b0, NULL),
692-
IWL_DEV_INFO(0x2720, 0x4070, iwl22000_2ax_cfg_qnj_hr_b0, NULL),
693-
IWL_DEV_INFO(0x2720, 0x4244, iwl22000_2ax_cfg_qnj_hr_b0, NULL),
694-
695681
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
696682
IWL_CFG_MAC_TYPE_PU, IWL_CFG_ANY,
697683
IWL_CFG_RF_TYPE_JF1, IWL_CFG_RF_ID_JF1,
@@ -789,7 +775,7 @@ static const struct iwl_dev_info iwl_dev_info_table[] = {
789775
IWL_CFG_NO_160, IWL_CFG_CORES_BT,
790776
iwl9260_2ac_cfg, iwl9260_name),
791777

792-
/* Qu with Jf */
778+
/* Qu with Jf */
793779
/* Qu B step */
794780
_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
795781
IWL_CFG_MAC_TYPE_QU, SILICON_B_STEP,

0 commit comments

Comments
 (0)