Skip to content

Commit 9249069

Browse files
davem330davem330
committed
Merge tag 'wireless-drivers-for-davem-2018-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
Kalle Valo says: ==================== wireless-drivers fixes for 4.18 Last set of fixes before 4.18 is released iwlwifi * add new IDs for cards already available on the market brcmfmac * fix a regression introduced in v4.17 ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents c1d61e7 + 299b636 commit 9249069

File tree

4 files changed

+98
-1
lines changed

4 files changed

+98
-1
lines changed

‎drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1785,7 +1785,8 @@ brcmf_pcie_prepare_fw_request(struct brcmf_pciedev_info *devinfo)
17851785
fwreq->items[BRCMF_PCIE_FW_CODE].type = BRCMF_FW_TYPE_BINARY;
17861786
fwreq->items[BRCMF_PCIE_FW_NVRAM].type = BRCMF_FW_TYPE_NVRAM;
17871787
fwreq->items[BRCMF_PCIE_FW_NVRAM].flags = BRCMF_FW_REQF_OPTIONAL;
1788-
fwreq->domain_nr = pci_domain_nr(devinfo->pdev->bus);
1788+
/* NVRAM reserves PCI domain 0 for Broadcom's SDK faked bus */
1789+
fwreq->domain_nr = pci_domain_nr(devinfo->pdev->bus) + 1;
17891790
fwreq->bus_nr = devinfo->pdev->bus->number;
17901791

17911792
return fwreq;

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

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,17 @@ const struct iwl_cfg iwl9260_2ac_cfg = {
178178
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
179179
};
180180

181+
const struct iwl_cfg iwl9260_killer_2ac_cfg = {
182+
.name = "Killer (R) Wireless-AC 1550 Wireless Network Adapter (9260NGW)",
183+
.fw_name_pre = IWL9260A_FW_PRE,
184+
.fw_name_pre_b_or_c_step = IWL9260B_FW_PRE,
185+
IWL_DEVICE_9000,
186+
.ht_params = &iwl9000_ht_params,
187+
.nvm_ver = IWL9000_NVM_VERSION,
188+
.nvm_calib_ver = IWL9000_TX_POWER_VERSION,
189+
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
190+
};
191+
181192
const struct iwl_cfg iwl9270_2ac_cfg = {
182193
.name = "Intel(R) Dual Band Wireless AC 9270",
183194
.fw_name_pre = IWL9260A_FW_PRE,
@@ -267,6 +278,34 @@ const struct iwl_cfg iwl9560_2ac_cfg_soc = {
267278
.soc_latency = 5000,
268279
};
269280

281+
const struct iwl_cfg iwl9560_killer_2ac_cfg_soc = {
282+
.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",
283+
.fw_name_pre = IWL9000A_FW_PRE,
284+
.fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
285+
.fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
286+
IWL_DEVICE_9000,
287+
.ht_params = &iwl9000_ht_params,
288+
.nvm_ver = IWL9000_NVM_VERSION,
289+
.nvm_calib_ver = IWL9000_TX_POWER_VERSION,
290+
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
291+
.integrated = true,
292+
.soc_latency = 5000,
293+
};
294+
295+
const struct iwl_cfg iwl9560_killer_s_2ac_cfg_soc = {
296+
.name = "Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)",
297+
.fw_name_pre = IWL9000A_FW_PRE,
298+
.fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
299+
.fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
300+
IWL_DEVICE_9000,
301+
.ht_params = &iwl9000_ht_params,
302+
.nvm_ver = IWL9000_NVM_VERSION,
303+
.nvm_calib_ver = IWL9000_TX_POWER_VERSION,
304+
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
305+
.integrated = true,
306+
.soc_latency = 5000,
307+
};
308+
270309
const struct iwl_cfg iwl9460_2ac_cfg_shared_clk = {
271310
.name = "Intel(R) Dual Band Wireless AC 9460",
272311
.fw_name_pre = IWL9000A_FW_PRE,
@@ -327,6 +366,36 @@ const struct iwl_cfg iwl9560_2ac_cfg_shared_clk = {
327366
.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
328367
};
329368

369+
const struct iwl_cfg iwl9560_killer_2ac_cfg_shared_clk = {
370+
.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",
371+
.fw_name_pre = IWL9000A_FW_PRE,
372+
.fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
373+
.fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
374+
IWL_DEVICE_9000,
375+
.ht_params = &iwl9000_ht_params,
376+
.nvm_ver = IWL9000_NVM_VERSION,
377+
.nvm_calib_ver = IWL9000_TX_POWER_VERSION,
378+
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
379+
.integrated = true,
380+
.soc_latency = 5000,
381+
.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
382+
};
383+
384+
const struct iwl_cfg iwl9560_killer_s_2ac_cfg_shared_clk = {
385+
.name = "Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)",
386+
.fw_name_pre = IWL9000A_FW_PRE,
387+
.fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
388+
.fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
389+
IWL_DEVICE_9000,
390+
.ht_params = &iwl9000_ht_params,
391+
.nvm_ver = IWL9000_NVM_VERSION,
392+
.nvm_calib_ver = IWL9000_TX_POWER_VERSION,
393+
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
394+
.integrated = true,
395+
.soc_latency = 5000,
396+
.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
397+
};
398+
330399
MODULE_FIRMWARE(IWL9000A_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));
331400
MODULE_FIRMWARE(IWL9000B_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));
332401
MODULE_FIRMWARE(IWL9000RFB_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,17 +551,22 @@ extern const struct iwl_cfg iwl8275_2ac_cfg;
551551
extern const struct iwl_cfg iwl4165_2ac_cfg;
552552
extern const struct iwl_cfg iwl9160_2ac_cfg;
553553
extern const struct iwl_cfg iwl9260_2ac_cfg;
554+
extern const struct iwl_cfg iwl9260_killer_2ac_cfg;
554555
extern const struct iwl_cfg iwl9270_2ac_cfg;
555556
extern const struct iwl_cfg iwl9460_2ac_cfg;
556557
extern const struct iwl_cfg iwl9560_2ac_cfg;
557558
extern const struct iwl_cfg iwl9460_2ac_cfg_soc;
558559
extern const struct iwl_cfg iwl9461_2ac_cfg_soc;
559560
extern const struct iwl_cfg iwl9462_2ac_cfg_soc;
560561
extern const struct iwl_cfg iwl9560_2ac_cfg_soc;
562+
extern const struct iwl_cfg iwl9560_killer_2ac_cfg_soc;
563+
extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_soc;
561564
extern const struct iwl_cfg iwl9460_2ac_cfg_shared_clk;
562565
extern const struct iwl_cfg iwl9461_2ac_cfg_shared_clk;
563566
extern const struct iwl_cfg iwl9462_2ac_cfg_shared_clk;
564567
extern const struct iwl_cfg iwl9560_2ac_cfg_shared_clk;
568+
extern const struct iwl_cfg iwl9560_killer_2ac_cfg_shared_clk;
569+
extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_shared_clk;
565570
extern const struct iwl_cfg iwl22000_2ac_cfg_hr;
566571
extern const struct iwl_cfg iwl22000_2ac_cfg_hr_cdb;
567572
extern const struct iwl_cfg iwl22000_2ac_cfg_jf;

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,9 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
545545
{IWL_PCI_DEVICE(0x2526, 0x1210, iwl9260_2ac_cfg)},
546546
{IWL_PCI_DEVICE(0x2526, 0x1410, iwl9270_2ac_cfg)},
547547
{IWL_PCI_DEVICE(0x2526, 0x1420, iwl9460_2ac_cfg_soc)},
548+
{IWL_PCI_DEVICE(0x2526, 0x1550, iwl9260_killer_2ac_cfg)},
549+
{IWL_PCI_DEVICE(0x2526, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},
550+
{IWL_PCI_DEVICE(0x2526, 0x1552, iwl9560_killer_2ac_cfg_soc)},
548551
{IWL_PCI_DEVICE(0x2526, 0x1610, iwl9270_2ac_cfg)},
549552
{IWL_PCI_DEVICE(0x2526, 0x2030, iwl9560_2ac_cfg_soc)},
550553
{IWL_PCI_DEVICE(0x2526, 0x2034, iwl9560_2ac_cfg_soc)},
@@ -554,6 +557,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
554557
{IWL_PCI_DEVICE(0x2526, 0x40A4, iwl9460_2ac_cfg)},
555558
{IWL_PCI_DEVICE(0x2526, 0x4234, iwl9560_2ac_cfg_soc)},
556559
{IWL_PCI_DEVICE(0x2526, 0x42A4, iwl9462_2ac_cfg_soc)},
560+
{IWL_PCI_DEVICE(0x2526, 0x8014, iwl9260_2ac_cfg)},
557561
{IWL_PCI_DEVICE(0x2526, 0xA014, iwl9260_2ac_cfg)},
558562
{IWL_PCI_DEVICE(0x271B, 0x0010, iwl9160_2ac_cfg)},
559563
{IWL_PCI_DEVICE(0x271B, 0x0014, iwl9160_2ac_cfg)},
@@ -578,6 +582,8 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
578582
{IWL_PCI_DEVICE(0x2720, 0x1010, iwl9260_2ac_cfg)},
579583
{IWL_PCI_DEVICE(0x2720, 0x1030, iwl9560_2ac_cfg_soc)},
580584
{IWL_PCI_DEVICE(0x2720, 0x1210, iwl9260_2ac_cfg)},
585+
{IWL_PCI_DEVICE(0x2720, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},
586+
{IWL_PCI_DEVICE(0x2720, 0x1552, iwl9560_killer_2ac_cfg_soc)},
581587
{IWL_PCI_DEVICE(0x2720, 0x2030, iwl9560_2ac_cfg_soc)},
582588
{IWL_PCI_DEVICE(0x2720, 0x2034, iwl9560_2ac_cfg_soc)},
583589
{IWL_PCI_DEVICE(0x2720, 0x4030, iwl9560_2ac_cfg)},
@@ -604,6 +610,8 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
604610
{IWL_PCI_DEVICE(0x30DC, 0x1010, iwl9260_2ac_cfg)},
605611
{IWL_PCI_DEVICE(0x30DC, 0x1030, iwl9560_2ac_cfg_soc)},
606612
{IWL_PCI_DEVICE(0x30DC, 0x1210, iwl9260_2ac_cfg)},
613+
{IWL_PCI_DEVICE(0x30DC, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},
614+
{IWL_PCI_DEVICE(0x30DC, 0x1552, iwl9560_killer_2ac_cfg_soc)},
607615
{IWL_PCI_DEVICE(0x30DC, 0x2030, iwl9560_2ac_cfg_soc)},
608616
{IWL_PCI_DEVICE(0x30DC, 0x2034, iwl9560_2ac_cfg_soc)},
609617
{IWL_PCI_DEVICE(0x30DC, 0x4030, iwl9560_2ac_cfg_soc)},
@@ -630,6 +638,8 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
630638
{IWL_PCI_DEVICE(0x31DC, 0x1010, iwl9260_2ac_cfg)},
631639
{IWL_PCI_DEVICE(0x31DC, 0x1030, iwl9560_2ac_cfg_shared_clk)},
632640
{IWL_PCI_DEVICE(0x31DC, 0x1210, iwl9260_2ac_cfg)},
641+
{IWL_PCI_DEVICE(0x31DC, 0x1551, iwl9560_killer_s_2ac_cfg_shared_clk)},
642+
{IWL_PCI_DEVICE(0x31DC, 0x1552, iwl9560_killer_2ac_cfg_shared_clk)},
633643
{IWL_PCI_DEVICE(0x31DC, 0x2030, iwl9560_2ac_cfg_shared_clk)},
634644
{IWL_PCI_DEVICE(0x31DC, 0x2034, iwl9560_2ac_cfg_shared_clk)},
635645
{IWL_PCI_DEVICE(0x31DC, 0x4030, iwl9560_2ac_cfg_shared_clk)},
@@ -656,6 +666,8 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
656666
{IWL_PCI_DEVICE(0x34F0, 0x1010, iwl9260_2ac_cfg)},
657667
{IWL_PCI_DEVICE(0x34F0, 0x1030, iwl9560_2ac_cfg_soc)},
658668
{IWL_PCI_DEVICE(0x34F0, 0x1210, iwl9260_2ac_cfg)},
669+
{IWL_PCI_DEVICE(0x34F0, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},
670+
{IWL_PCI_DEVICE(0x34F0, 0x1552, iwl9560_killer_2ac_cfg_soc)},
659671
{IWL_PCI_DEVICE(0x34F0, 0x2030, iwl9560_2ac_cfg_soc)},
660672
{IWL_PCI_DEVICE(0x34F0, 0x2034, iwl9560_2ac_cfg_soc)},
661673
{IWL_PCI_DEVICE(0x34F0, 0x4030, iwl9560_2ac_cfg_soc)},
@@ -682,6 +694,8 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
682694
{IWL_PCI_DEVICE(0x3DF0, 0x1010, iwl9260_2ac_cfg)},
683695
{IWL_PCI_DEVICE(0x3DF0, 0x1030, iwl9560_2ac_cfg_soc)},
684696
{IWL_PCI_DEVICE(0x3DF0, 0x1210, iwl9260_2ac_cfg)},
697+
{IWL_PCI_DEVICE(0x3DF0, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},
698+
{IWL_PCI_DEVICE(0x3DF0, 0x1552, iwl9560_killer_2ac_cfg_soc)},
685699
{IWL_PCI_DEVICE(0x3DF0, 0x2030, iwl9560_2ac_cfg_soc)},
686700
{IWL_PCI_DEVICE(0x3DF0, 0x2034, iwl9560_2ac_cfg_soc)},
687701
{IWL_PCI_DEVICE(0x3DF0, 0x4030, iwl9560_2ac_cfg_soc)},
@@ -708,6 +722,8 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
708722
{IWL_PCI_DEVICE(0x43F0, 0x1010, iwl9260_2ac_cfg)},
709723
{IWL_PCI_DEVICE(0x43F0, 0x1030, iwl9560_2ac_cfg_soc)},
710724
{IWL_PCI_DEVICE(0x43F0, 0x1210, iwl9260_2ac_cfg)},
725+
{IWL_PCI_DEVICE(0x43F0, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},
726+
{IWL_PCI_DEVICE(0x43F0, 0x1552, iwl9560_killer_2ac_cfg_soc)},
711727
{IWL_PCI_DEVICE(0x43F0, 0x2030, iwl9560_2ac_cfg_soc)},
712728
{IWL_PCI_DEVICE(0x43F0, 0x2034, iwl9560_2ac_cfg_soc)},
713729
{IWL_PCI_DEVICE(0x43F0, 0x4030, iwl9560_2ac_cfg_soc)},
@@ -743,6 +759,8 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
743759
{IWL_PCI_DEVICE(0x9DF0, 0x1010, iwl9260_2ac_cfg)},
744760
{IWL_PCI_DEVICE(0x9DF0, 0x1030, iwl9560_2ac_cfg_soc)},
745761
{IWL_PCI_DEVICE(0x9DF0, 0x1210, iwl9260_2ac_cfg)},
762+
{IWL_PCI_DEVICE(0x9DF0, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},
763+
{IWL_PCI_DEVICE(0x9DF0, 0x1552, iwl9560_killer_2ac_cfg_soc)},
746764
{IWL_PCI_DEVICE(0x9DF0, 0x2010, iwl9460_2ac_cfg_soc)},
747765
{IWL_PCI_DEVICE(0x9DF0, 0x2030, iwl9560_2ac_cfg_soc)},
748766
{IWL_PCI_DEVICE(0x9DF0, 0x2034, iwl9560_2ac_cfg_soc)},
@@ -771,6 +789,8 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
771789
{IWL_PCI_DEVICE(0xA0F0, 0x1010, iwl9260_2ac_cfg)},
772790
{IWL_PCI_DEVICE(0xA0F0, 0x1030, iwl9560_2ac_cfg_soc)},
773791
{IWL_PCI_DEVICE(0xA0F0, 0x1210, iwl9260_2ac_cfg)},
792+
{IWL_PCI_DEVICE(0xA0F0, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},
793+
{IWL_PCI_DEVICE(0xA0F0, 0x1552, iwl9560_killer_2ac_cfg_soc)},
774794
{IWL_PCI_DEVICE(0xA0F0, 0x2030, iwl9560_2ac_cfg_soc)},
775795
{IWL_PCI_DEVICE(0xA0F0, 0x2034, iwl9560_2ac_cfg_soc)},
776796
{IWL_PCI_DEVICE(0xA0F0, 0x4030, iwl9560_2ac_cfg_soc)},
@@ -797,6 +817,8 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
797817
{IWL_PCI_DEVICE(0xA370, 0x1010, iwl9260_2ac_cfg)},
798818
{IWL_PCI_DEVICE(0xA370, 0x1030, iwl9560_2ac_cfg_soc)},
799819
{IWL_PCI_DEVICE(0xA370, 0x1210, iwl9260_2ac_cfg)},
820+
{IWL_PCI_DEVICE(0xA370, 0x1551, iwl9560_killer_s_2ac_cfg_soc)},
821+
{IWL_PCI_DEVICE(0xA370, 0x1552, iwl9560_killer_2ac_cfg_soc)},
800822
{IWL_PCI_DEVICE(0xA370, 0x2030, iwl9560_2ac_cfg_soc)},
801823
{IWL_PCI_DEVICE(0xA370, 0x2034, iwl9560_2ac_cfg_soc)},
802824
{IWL_PCI_DEVICE(0xA370, 0x4030, iwl9560_2ac_cfg_soc)},

0 commit comments

Comments
 (0)