Commit b745c307 authored by Johannes Berg's avatar Johannes Berg Committed by Miri Korenblit
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250510214621.ca03a90c294e.I04d64964c664d49ab16760d754968f09c607f36a@changeid
parent 910edaea

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

+5 −0
Original line number Diff line number Diff line
@@ -105,6 +105,11 @@ const char iwl8265_2ac_name[] = "Intel(R) Dual Band Wireless-AC 8265"; 
const char iwl8275_2ac_name[] = "Intel(R) Dual Band Wireless-AC 8275";

const char iwl4165_2ac_name[] = "Intel(R) Dual Band Wireless-AC 4165";



const char iwl_killer_1435i_name[] =

	"Killer(R) Wireless-AC 1435i Wireless Network Adapter (8265D2W)";

const char iwl_killer_1434_kix_name[] =

	"Killer(R) Wireless-AC 1435-KIX Wireless Network Adapter (8265NGW)";



const struct iwl_rf_cfg iwl8260_cfg = {

	.fw_name_pre = IWL8000_FW_PRE,

	IWL_DEVICE_8260,

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

+2 −0
Original line number Diff line number Diff line
@@ -598,6 +598,8 @@ extern const char iwl8260_2ac_name[]; 
extern const char iwl8265_2ac_name[];

extern const char iwl8275_2ac_name[];

extern const char iwl4165_2ac_name[];

extern const char iwl_killer_1435i_name[];

extern const char iwl_killer_1434_kix_name[];

extern const char iwl9162_name[];

extern const char iwl9260_name[];

extern const char iwl9260_1_name[];

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

+36 −0
Original line number Diff line number Diff line
@@ -434,6 +434,8 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x24F3, 0x0930, iwl8000_mac_cfg)},

	{IWL_PCI_DEVICE(0x24F3, 0x0000, iwl8000_mac_cfg)},

	{IWL_PCI_DEVICE(0x24F3, 0x4010, iwl8000_mac_cfg)},

	{IWL_PCI_DEVICE(0x24F3, 0xC030, iwl8000_mac_cfg)},

	{IWL_PCI_DEVICE(0x24F3, 0xD030, iwl8000_mac_cfg)},

	{IWL_PCI_DEVICE(0x24FD, 0x0010, iwl8000_mac_cfg)},

	{IWL_PCI_DEVICE(0x24FD, 0x0110, iwl8000_mac_cfg)},

	{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[] = { 
	{IWL_PCI_DEVICE(0x24FD, 0x0012, iwl8000_mac_cfg)},

	{IWL_PCI_DEVICE(0x24FD, 0x0014, iwl8000_mac_cfg)},

	{IWL_PCI_DEVICE(0x24FD, 0x9074, iwl8000_mac_cfg)},

	{IWL_PCI_DEVICE(0x24FD, 0x1431, iwl8000_mac_cfg)},

	{IWL_PCI_DEVICE(0x24FD, 0x1432, iwl8000_mac_cfg)},



/* 9000 Series */

	{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[] = { 
		     DEVICE(0x095A), SUBDEV(0x5020)),

	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,

		     DEVICE(0x095A), SUBDEV(0x502A)),

	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,

		     DEVICE(0x095A), SUBDEV(0x5090)),

	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,

		     DEVICE(0x095A), SUBDEV(0x5190)),

	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,

		     DEVICE(0x095A), SUBDEV(0x5100)),

	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,

		     DEVICE(0x095A), SUBDEV(0x5400)),

	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,

		     DEVICE(0x095A), SUBDEV(0x5420)),

	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,

		     DEVICE(0x095A), SUBDEV(0x5490)),

	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,

		     DEVICE(0x095A), SUBDEV(0x5C10)),

	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,

		     DEVICE(0x095A), SUBDEV(0x5590)),

	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,

		     DEVICE(0x095A), SUBDEV(0x9000)),

	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,

		     DEVICE(0x095A), SUBDEV(0x900A)),

	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,

		     DEVICE(0x095A), SUBDEV(0x9400)),



	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2ac_name,

		     DEVICE(0x095B)),

	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,

		     DEVICE(0x095B), SUBDEV(0x520A)),

	IWL_DEV_INFO(iwl7265_cfg, iwl7265_n_name,

		     DEVICE(0x095B), SUBDEV(0x5302)),

	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,

		     DEVICE(0x095B), SUBDEV(0x5200)),

	IWL_DEV_INFO(iwl7265_cfg, iwl7265_n_name,

		     DEVICE(0x095B), SUBDEV(0x5202)),

	IWL_DEV_INFO(iwl7265_cfg, iwl7265_2n_name,

		     DEVICE(0x095B), SUBDEV(0x9200)),



/* 8000 Series */

	IWL_DEV_INFO(iwl8260_cfg, iwl8260_2ac_name,

		     DEVICE(0x24F3)),

	IWL_DEV_INFO(iwl8260_cfg, iwl8260_2n_name,

		     DEVICE(0x24F3), SUBDEV(0x0004)),

	IWL_DEV_INFO(iwl8260_cfg, iwl8260_2n_name,

		     DEVICE(0x24F3), SUBDEV(0x0044)),

	IWL_DEV_INFO(iwl8265_cfg, iwl8265_2ac_name,

		     DEVICE(0x24FD)),

	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[] = { 
		     DEVICE(0x24FD), SUBDEV(0x1012)),

	IWL_DEV_INFO(iwl8265_cfg, iwl8275_2ac_name,

		     DEVICE(0x24FD), SUBDEV(0x0012)),

	IWL_DEV_INFO(iwl8265_cfg, iwl_killer_1435i_name,

		     DEVICE(0x24FD), SUBDEV(0x1431)),

	IWL_DEV_INFO(iwl8265_cfg, iwl_killer_1434_kix_name,

		     DEVICE(0x24FD), SUBDEV(0x1432)),



/* JF1 RF */

	IWL_DEV_INFO(iwl_rf_jf, iwl9461_160_name,