| From 0a5257bc6d89c2ae69b9bf955679cb4f89261874 Mon Sep 17 00:00:00 2001 |
| From: Emmanuel Grumbach <emmanuel.grumbach@intel.com> |
| Date: Tue, 17 Jul 2018 13:43:56 +0300 |
| Subject: iwlwifi: add more card IDs for 9000 series |
| |
| From: Emmanuel Grumbach <emmanuel.grumbach@intel.com> |
| |
| commit 0a5257bc6d89c2ae69b9bf955679cb4f89261874 upstream. |
| |
| Add new device IDs for the 9000 series. |
| |
| Cc: stable@vger.kernel.org # 4.14 |
| Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> |
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 69 ++++++++++++++++++++++++ |
| drivers/net/wireless/intel/iwlwifi/iwl-config.h | 5 + |
| drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 22 +++++++ |
| 3 files changed, 96 insertions(+) |
| |
| --- a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c |
| +++ b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c |
| @@ -177,6 +177,17 @@ const struct iwl_cfg iwl9260_2ac_cfg = { |
| .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K, |
| }; |
| |
| +const struct iwl_cfg iwl9260_killer_2ac_cfg = { |
| + .name = "Killer (R) Wireless-AC 1550 Wireless Network Adapter (9260NGW)", |
| + .fw_name_pre = IWL9260A_FW_PRE, |
| + .fw_name_pre_b_or_c_step = IWL9260B_FW_PRE, |
| + IWL_DEVICE_9000, |
| + .ht_params = &iwl9000_ht_params, |
| + .nvm_ver = IWL9000_NVM_VERSION, |
| + .nvm_calib_ver = IWL9000_TX_POWER_VERSION, |
| + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K, |
| +}; |
| + |
| const struct iwl_cfg iwl9270_2ac_cfg = { |
| .name = "Intel(R) Dual Band Wireless AC 9270", |
| .fw_name_pre = IWL9260A_FW_PRE, |
| @@ -266,6 +277,34 @@ const struct iwl_cfg iwl9560_2ac_cfg_soc |
| .soc_latency = 5000, |
| }; |
| |
| +const struct iwl_cfg iwl9560_killer_2ac_cfg_soc = { |
| + .name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)", |
| + .fw_name_pre = IWL9000A_FW_PRE, |
| + .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE, |
| + .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE, |
| + IWL_DEVICE_9000, |
| + .ht_params = &iwl9000_ht_params, |
| + .nvm_ver = IWL9000_NVM_VERSION, |
| + .nvm_calib_ver = IWL9000_TX_POWER_VERSION, |
| + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K, |
| + .integrated = true, |
| + .soc_latency = 5000, |
| +}; |
| + |
| +const struct iwl_cfg iwl9560_killer_s_2ac_cfg_soc = { |
| + .name = "Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)", |
| + .fw_name_pre = IWL9000A_FW_PRE, |
| + .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE, |
| + .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE, |
| + IWL_DEVICE_9000, |
| + .ht_params = &iwl9000_ht_params, |
| + .nvm_ver = IWL9000_NVM_VERSION, |
| + .nvm_calib_ver = IWL9000_TX_POWER_VERSION, |
| + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K, |
| + .integrated = true, |
| + .soc_latency = 5000, |
| +}; |
| + |
| const struct iwl_cfg iwl9460_2ac_cfg_shared_clk = { |
| .name = "Intel(R) Dual Band Wireless AC 9460", |
| .fw_name_pre = IWL9000A_FW_PRE, |
| @@ -316,6 +355,36 @@ const struct iwl_cfg iwl9560_2ac_cfg_sha |
| .fw_name_pre = IWL9000A_FW_PRE, |
| .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE, |
| .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE, |
| + IWL_DEVICE_9000, |
| + .ht_params = &iwl9000_ht_params, |
| + .nvm_ver = IWL9000_NVM_VERSION, |
| + .nvm_calib_ver = IWL9000_TX_POWER_VERSION, |
| + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K, |
| + .integrated = true, |
| + .soc_latency = 5000, |
| + .extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK |
| +}; |
| + |
| +const struct iwl_cfg iwl9560_killer_2ac_cfg_shared_clk = { |
| + .name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)", |
| + .fw_name_pre = IWL9000A_FW_PRE, |
| + .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE, |
| + .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE, |
| + IWL_DEVICE_9000, |
| + .ht_params = &iwl9000_ht_params, |
| + .nvm_ver = IWL9000_NVM_VERSION, |
| + .nvm_calib_ver = IWL9000_TX_POWER_VERSION, |
| + .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K, |
| + .integrated = true, |
| + .soc_latency = 5000, |
| + .extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK |
| +}; |
| + |
| +const struct iwl_cfg iwl9560_killer_s_2ac_cfg_shared_clk = { |
| + .name = "Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)", |
| + .fw_name_pre = IWL9000A_FW_PRE, |
| + .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE, |
| + .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE, |
| IWL_DEVICE_9000, |
| .ht_params = &iwl9000_ht_params, |
| .nvm_ver = IWL9000_NVM_VERSION, |
| --- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h |
| +++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h |
| @@ -470,6 +470,7 @@ extern const struct iwl_cfg iwl8265_2ac_ |
| extern const struct iwl_cfg iwl4165_2ac_sdio_cfg; |
| extern const struct iwl_cfg iwl9160_2ac_cfg; |
| extern const struct iwl_cfg iwl9260_2ac_cfg; |
| +extern const struct iwl_cfg iwl9260_killer_2ac_cfg; |
| extern const struct iwl_cfg iwl9270_2ac_cfg; |
| extern const struct iwl_cfg iwl9460_2ac_cfg; |
| extern const struct iwl_cfg iwl9560_2ac_cfg; |
| @@ -477,10 +478,14 @@ extern const struct iwl_cfg iwl9460_2ac_ |
| extern const struct iwl_cfg iwl9461_2ac_cfg_soc; |
| extern const struct iwl_cfg iwl9462_2ac_cfg_soc; |
| extern const struct iwl_cfg iwl9560_2ac_cfg_soc; |
| +extern const struct iwl_cfg iwl9560_killer_2ac_cfg_soc; |
| +extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_soc; |
| extern const struct iwl_cfg iwl9460_2ac_cfg_shared_clk; |
| extern const struct iwl_cfg iwl9461_2ac_cfg_shared_clk; |
| extern const struct iwl_cfg iwl9462_2ac_cfg_shared_clk; |
| extern const struct iwl_cfg iwl9560_2ac_cfg_shared_clk; |
| +extern const struct iwl_cfg iwl9560_killer_2ac_cfg_shared_clk; |
| +extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_shared_clk; |
| extern const struct iwl_cfg iwla000_2ac_cfg_hr; |
| extern const struct iwl_cfg iwla000_2ac_cfg_hr_cdb; |
| extern const struct iwl_cfg iwla000_2ac_cfg_jf; |
| --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c |
| +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c |
| @@ -543,6 +543,9 @@ static const struct pci_device_id iwl_hw |
| {IWL_PCI_DEVICE(0x2526, 0x1210, iwl9260_2ac_cfg)}, |
| {IWL_PCI_DEVICE(0x2526, 0x1410, iwl9270_2ac_cfg)}, |
| {IWL_PCI_DEVICE(0x2526, 0x1420, iwl9460_2ac_cfg_soc)}, |
| + {IWL_PCI_DEVICE(0x2526, 0x1550, iwl9260_killer_2ac_cfg)}, |
| + {IWL_PCI_DEVICE(0x2526, 0x1551, iwl9560_killer_s_2ac_cfg_soc)}, |
| + {IWL_PCI_DEVICE(0x2526, 0x1552, iwl9560_killer_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x2526, 0x1610, iwl9270_2ac_cfg)}, |
| {IWL_PCI_DEVICE(0x2526, 0x2030, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x2526, 0x2034, iwl9560_2ac_cfg_soc)}, |
| @@ -552,6 +555,7 @@ static const struct pci_device_id iwl_hw |
| {IWL_PCI_DEVICE(0x2526, 0x40A4, iwl9460_2ac_cfg)}, |
| {IWL_PCI_DEVICE(0x2526, 0x4234, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x2526, 0x42A4, iwl9462_2ac_cfg_soc)}, |
| + {IWL_PCI_DEVICE(0x2526, 0x8014, iwl9260_2ac_cfg)}, |
| {IWL_PCI_DEVICE(0x2526, 0xA014, iwl9260_2ac_cfg)}, |
| {IWL_PCI_DEVICE(0x271B, 0x0010, iwl9160_2ac_cfg)}, |
| {IWL_PCI_DEVICE(0x271B, 0x0014, iwl9160_2ac_cfg)}, |
| @@ -576,6 +580,8 @@ static const struct pci_device_id iwl_hw |
| {IWL_PCI_DEVICE(0x2720, 0x1010, iwl9260_2ac_cfg)}, |
| {IWL_PCI_DEVICE(0x2720, 0x1030, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x2720, 0x1210, iwl9260_2ac_cfg)}, |
| + {IWL_PCI_DEVICE(0x2720, 0x1551, iwl9560_killer_s_2ac_cfg_soc)}, |
| + {IWL_PCI_DEVICE(0x2720, 0x1552, iwl9560_killer_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x2720, 0x2030, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x2720, 0x2034, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x2720, 0x4030, iwl9560_2ac_cfg)}, |
| @@ -602,6 +608,8 @@ static const struct pci_device_id iwl_hw |
| {IWL_PCI_DEVICE(0x30DC, 0x1010, iwl9260_2ac_cfg)}, |
| {IWL_PCI_DEVICE(0x30DC, 0x1030, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x30DC, 0x1210, iwl9260_2ac_cfg)}, |
| + {IWL_PCI_DEVICE(0x30DC, 0x1551, iwl9560_killer_s_2ac_cfg_soc)}, |
| + {IWL_PCI_DEVICE(0x30DC, 0x1552, iwl9560_killer_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x30DC, 0x2030, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x30DC, 0x2034, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x30DC, 0x4030, iwl9560_2ac_cfg_soc)}, |
| @@ -628,6 +636,8 @@ static const struct pci_device_id iwl_hw |
| {IWL_PCI_DEVICE(0x31DC, 0x1010, iwl9260_2ac_cfg)}, |
| {IWL_PCI_DEVICE(0x31DC, 0x1030, iwl9560_2ac_cfg_shared_clk)}, |
| {IWL_PCI_DEVICE(0x31DC, 0x1210, iwl9260_2ac_cfg)}, |
| + {IWL_PCI_DEVICE(0x31DC, 0x1551, iwl9560_killer_s_2ac_cfg_shared_clk)}, |
| + {IWL_PCI_DEVICE(0x31DC, 0x1552, iwl9560_killer_2ac_cfg_shared_clk)}, |
| {IWL_PCI_DEVICE(0x31DC, 0x2030, iwl9560_2ac_cfg_shared_clk)}, |
| {IWL_PCI_DEVICE(0x31DC, 0x2034, iwl9560_2ac_cfg_shared_clk)}, |
| {IWL_PCI_DEVICE(0x31DC, 0x4030, iwl9560_2ac_cfg_shared_clk)}, |
| @@ -654,6 +664,8 @@ static const struct pci_device_id iwl_hw |
| {IWL_PCI_DEVICE(0x34F0, 0x1010, iwl9260_2ac_cfg)}, |
| {IWL_PCI_DEVICE(0x34F0, 0x1030, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x34F0, 0x1210, iwl9260_2ac_cfg)}, |
| + {IWL_PCI_DEVICE(0x34F0, 0x1551, iwl9560_killer_s_2ac_cfg_soc)}, |
| + {IWL_PCI_DEVICE(0x34F0, 0x1552, iwl9560_killer_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x34F0, 0x2030, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x34F0, 0x2034, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x34F0, 0x4030, iwl9560_2ac_cfg_soc)}, |
| @@ -680,6 +692,8 @@ static const struct pci_device_id iwl_hw |
| {IWL_PCI_DEVICE(0x3DF0, 0x1010, iwl9260_2ac_cfg)}, |
| {IWL_PCI_DEVICE(0x3DF0, 0x1030, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x3DF0, 0x1210, iwl9260_2ac_cfg)}, |
| + {IWL_PCI_DEVICE(0x3DF0, 0x1551, iwl9560_killer_s_2ac_cfg_soc)}, |
| + {IWL_PCI_DEVICE(0x3DF0, 0x1552, iwl9560_killer_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x3DF0, 0x2030, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x3DF0, 0x2034, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x3DF0, 0x4030, iwl9560_2ac_cfg_soc)}, |
| @@ -706,6 +720,8 @@ static const struct pci_device_id iwl_hw |
| {IWL_PCI_DEVICE(0x43F0, 0x1010, iwl9260_2ac_cfg)}, |
| {IWL_PCI_DEVICE(0x43F0, 0x1030, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x43F0, 0x1210, iwl9260_2ac_cfg)}, |
| + {IWL_PCI_DEVICE(0x43F0, 0x1551, iwl9560_killer_s_2ac_cfg_soc)}, |
| + {IWL_PCI_DEVICE(0x43F0, 0x1552, iwl9560_killer_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x43F0, 0x2030, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x43F0, 0x2034, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x43F0, 0x4030, iwl9560_2ac_cfg_soc)}, |
| @@ -741,6 +757,8 @@ static const struct pci_device_id iwl_hw |
| {IWL_PCI_DEVICE(0x9DF0, 0x1010, iwl9260_2ac_cfg)}, |
| {IWL_PCI_DEVICE(0x9DF0, 0x1030, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x9DF0, 0x1210, iwl9260_2ac_cfg)}, |
| + {IWL_PCI_DEVICE(0x9DF0, 0x1551, iwl9560_killer_s_2ac_cfg_soc)}, |
| + {IWL_PCI_DEVICE(0x9DF0, 0x1552, iwl9560_killer_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x9DF0, 0x2010, iwl9460_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x9DF0, 0x2030, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0x9DF0, 0x2034, iwl9560_2ac_cfg_soc)}, |
| @@ -769,6 +787,8 @@ static const struct pci_device_id iwl_hw |
| {IWL_PCI_DEVICE(0xA0F0, 0x1010, iwl9260_2ac_cfg)}, |
| {IWL_PCI_DEVICE(0xA0F0, 0x1030, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0xA0F0, 0x1210, iwl9260_2ac_cfg)}, |
| + {IWL_PCI_DEVICE(0xA0F0, 0x1551, iwl9560_killer_s_2ac_cfg_soc)}, |
| + {IWL_PCI_DEVICE(0xA0F0, 0x1552, iwl9560_killer_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0xA0F0, 0x2030, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0xA0F0, 0x2034, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0xA0F0, 0x4030, iwl9560_2ac_cfg_soc)}, |
| @@ -795,6 +815,8 @@ static const struct pci_device_id iwl_hw |
| {IWL_PCI_DEVICE(0xA370, 0x1010, iwl9260_2ac_cfg)}, |
| {IWL_PCI_DEVICE(0xA370, 0x1030, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0xA370, 0x1210, iwl9260_2ac_cfg)}, |
| + {IWL_PCI_DEVICE(0xA370, 0x1551, iwl9560_killer_s_2ac_cfg_soc)}, |
| + {IWL_PCI_DEVICE(0xA370, 0x1552, iwl9560_killer_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0xA370, 0x2030, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0xA370, 0x2034, iwl9560_2ac_cfg_soc)}, |
| {IWL_PCI_DEVICE(0xA370, 0x4030, iwl9560_2ac_cfg_soc)}, |