Skip to content

Commit b745c30

Browse files
jmberg-intelMiriam-Rachel
jmberg-intel
authored and
Miriam-Rachel
committed
wifi: iwlwifi: cfg: add a couple of older devices
There are some devices that are misidentified, such as 7265-N and Killer 1435 variants. Add their names, and for some of them also add the PCI IDs to match at all. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Link: https://patch.msgid.link/20250510214621.ca03a90c294e.I04d64964c664d49ab16760d754968f09c607f36a@changeid
1 parent 910edae commit b745c30

File tree

3 files changed

+43
-0
lines changed

3 files changed

+43
-0
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ const char iwl8265_2ac_name[] = "Intel(R) Dual Band Wireless-AC 8265";
105105
const char iwl8275_2ac_name[] = "Intel(R) Dual Band Wireless-AC 8275";
106106
const char iwl4165_2ac_name[] = "Intel(R) Dual Band Wireless-AC 4165";
107107

108+
const char iwl_killer_1435i_name[] =
109+
"Killer(R) Wireless-AC 1435i Wireless Network Adapter (8265D2W)";
110+
const char iwl_killer_1434_kix_name[] =
111+
"Killer(R) Wireless-AC 1435-KIX Wireless Network Adapter (8265NGW)";
112+
108113
const struct iwl_rf_cfg iwl8260_cfg = {
109114
.fw_name_pre = IWL8000_FW_PRE,
110115
IWL_DEVICE_8260,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,8 @@ extern const char iwl8260_2ac_name[];
598598
extern const char iwl8265_2ac_name[];
599599
extern const char iwl8275_2ac_name[];
600600
extern const char iwl4165_2ac_name[];
601+
extern const char iwl_killer_1435i_name[];
602+
extern const char iwl_killer_1434_kix_name[];
601603
extern const char iwl9162_name[];
602604
extern const char iwl9260_name[];
603605
extern const char iwl9260_1_name[];

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,8 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct pci_device_id iwl_hw_card_ids[] = {
434434
{IWL_PCI_DEVICE(0x24F3, 0x0930, iwl8000_mac_cfg)},
435435
{IWL_PCI_DEVICE(0x24F3, 0x0000, iwl8000_mac_cfg)},
436436
{IWL_PCI_DEVICE(0x24F3, 0x4010, iwl8000_mac_cfg)},
437+
{IWL_PCI_DEVICE(0x24F3, 0xC030, iwl8000_mac_cfg)},
438+
{IWL_PCI_DEVICE(0x24F3, 0xD030, iwl8000_mac_cfg)},
437439
{IWL_PCI_DEVICE(0x24FD, 0x0010, iwl8000_mac_cfg)},
438440
{IWL_PCI_DEVICE(0x24FD, 0x0110, iwl8000_mac_cfg)},
439441
{IWL_PCI_DEVICE(0x24FD, 0x1110, iwl8000_mac_cfg)},
@@ -461,6 +463,8 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct pci_device_id iwl_hw_card_ids[] = {
461463
{IWL_PCI_DEVICE(0x24FD, 0x0012, iwl8000_mac_cfg)},
462464
{IWL_PCI_DEVICE(0x24FD, 0x0014, iwl8000_mac_cfg)},
463465
{IWL_PCI_DEVICE(0x24FD, 0x9074, iwl8000_mac_cfg)},
466+
{IWL_PCI_DEVICE(0x24FD, 0x1431, iwl8000_mac_cfg)},
467+
{IWL_PCI_DEVICE(0x24FD, 0x1432, iwl8000_mac_cfg)},
464468

465469
/* 9000 Series */
466470
{IWL_PCI_DEVICE(0x2526, PCI_ANY_ID, iwl9000_mac_cfg)},
@@ -920,21 +924,49 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
920924
DEVICE(0x095A), SUBDEV(0x5020)),
921925
IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,
922926
DEVICE(0x095A), SUBDEV(0x502A)),
927+
IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,
928+
DEVICE(0x095A), SUBDEV(0x5090)),
929+
IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,
930+
DEVICE(0x095A), SUBDEV(0x5190)),
931+
IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,
932+
DEVICE(0x095A), SUBDEV(0x5100)),
933+
IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,
934+
DEVICE(0x095A), SUBDEV(0x5400)),
923935
IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,
924936
DEVICE(0x095A), SUBDEV(0x5420)),
937+
IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,
938+
DEVICE(0x095A), SUBDEV(0x5490)),
939+
IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,
940+
DEVICE(0x095A), SUBDEV(0x5C10)),
941+
IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,
942+
DEVICE(0x095A), SUBDEV(0x5590)),
943+
IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,
944+
DEVICE(0x095A), SUBDEV(0x9000)),
945+
IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,
946+
DEVICE(0x095A), SUBDEV(0x900A)),
947+
IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,
948+
DEVICE(0x095A), SUBDEV(0x9400)),
925949

926950
IWL_DEV_INFO(iwl7265_cfg, iwl7265_2ac_name,
927951
DEVICE(0x095B)),
952+
IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,
953+
DEVICE(0x095B), SUBDEV(0x520A)),
928954
IWL_DEV_INFO(iwl7265_cfg, iwl7265_n_name,
929955
DEVICE(0x095B), SUBDEV(0x5302)),
930956
IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,
931957
DEVICE(0x095B), SUBDEV(0x5200)),
932958
IWL_DEV_INFO(iwl7265_cfg, iwl7265_n_name,
933959
DEVICE(0x095B), SUBDEV(0x5202)),
960+
IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,
961+
DEVICE(0x095B), SUBDEV(0x9200)),
934962

935963
/* 8000 Series */
936964
IWL_DEV_INFO(iwl8260_cfg, iwl8260_2ac_name,
937965
DEVICE(0x24F3)),
966+
IWL_DEV_INFO(iwl8260_cfg, iwl8260_2n_name,
967+
DEVICE(0x24F3), SUBDEV(0x0004)),
968+
IWL_DEV_INFO(iwl8260_cfg, iwl8260_2n_name,
969+
DEVICE(0x24F3), SUBDEV(0x0044)),
938970
IWL_DEV_INFO(iwl8265_cfg, iwl8265_2ac_name,
939971
DEVICE(0x24FD)),
940972
IWL_DEV_INFO(iwl8265_cfg, iwl8275_2ac_name,
@@ -945,6 +977,10 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
945977
DEVICE(0x24FD), SUBDEV(0x1012)),
946978
IWL_DEV_INFO(iwl8265_cfg, iwl8275_2ac_name,
947979
DEVICE(0x24FD), SUBDEV(0x0012)),
980+
IWL_DEV_INFO(iwl8265_cfg, iwl_killer_1435i_name,
981+
DEVICE(0x24FD), SUBDEV(0x1431)),
982+
IWL_DEV_INFO(iwl8265_cfg, iwl_killer_1434_kix_name,
983+
DEVICE(0x24FD), SUBDEV(0x1432)),
948984

949985
/* JF1 RF */
950986
IWL_DEV_INFO(iwl_rf_jf, iwl9461_160_name,

0 commit comments

Comments
 (0)