iwlwifi: fixes intended for 5.4 2019-10-19
cover iwlwifi: fixes intended for 5.4 2019-10-19
From: Luca Coelho <[email protected]>
This is my third patchset with fixes for v5.4. This time I have five important fixes.
The changes are:
* Fix a bogus queue number when allocation fails;
* A few PCI ID mapping fixes;
* A workaround to force power gating in integrated 22000 devices.
As usual, I'm pushing this to a pending branch, for kbuild bot. As we agreed, please apply them directly to wireless-drivers (after reviewing, obviously). ;)
Cheers,
Luca.
Johannes Berg (1):
iwlwifi: mvm: handle iwl_mvm_tvqm_enable_txq() error return
Luca Coelho (4):
iwlwifi: pcie: fix PCI ID 0x2720 configs that should be soc
iwlwifi: pcie: fix all 9460 entries for qnj
iwlwifi: pcie: add workaround for power gating in integrated 22000
iwlwifi: pcie: 0x2720 is qu and 0x30DC is not
drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 1 + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 5 + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 140 +++++++++++------- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 125 ++++++++-------- .../wireless/intel/iwlwifi/pcie/trans-gen2.c | 25 ++++ 5 files changed, 177 insertions(+), 119 deletions(-)
Signature · 1 line
2.23.0
PATCH 1/5 iwlwifi: pcie: fix PCI ID 0x2720 configs that should be soc
From: Luca Coelho <[email protected]>
Some entries for PCI ID 0x2720 were using iwl9260_2ac_cfg, but the correct is to use iwl9260_2ac_cfg_soc. Fix that.
--- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +4 -4
@@ -618,9 +618,9 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x271B, 0x0210, iwl9160_2ac_cfg)}, {IWL_PCI_DEVICE(0x271B, 0x0214, iwl9260_2ac_cfg)}, {IWL_PCI_DEVICE(0x271C, 0x0214, iwl9260_2ac_cfg)}, - {IWL_PCI_DEVICE(0x2720, 0x0034, iwl9560_2ac_160_cfg)}, - {IWL_PCI_DEVICE(0x2720, 0x0038, iwl9560_2ac_160_cfg)}, - {IWL_PCI_DEVICE(0x2720, 0x003C, iwl9560_2ac_160_cfg)}, + {IWL_PCI_DEVICE(0x2720, 0x0034, iwl9560_2ac_160_cfg_soc)}, + {IWL_PCI_DEVICE(0x2720, 0x0038, iwl9560_2ac_160_cfg_soc)}, + {IWL_PCI_DEVICE(0x2720, 0x003C, iwl9560_2ac_160_cfg_soc)}, {IWL_PCI_DEVICE(0x2720, 0x0060, iwl9461_2ac_cfg_soc)}, {IWL_PCI_DEVICE(0x2720, 0x0064, iwl9461_2ac_cfg_soc)}, {IWL_PCI_DEVICE(0x2720, 0x00A0, iwl9462_2ac_cfg_soc)},
@@ -640,7 +640,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x2720, 0x1552, iwl9560_killer_2ac_cfg_soc)}, {IWL_PCI_DEVICE(0x2720, 0x2030, iwl9560_2ac_160_cfg_soc)}, {IWL_PCI_DEVICE(0x2720, 0x2034, iwl9560_2ac_160_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x4030, iwl9560_2ac_160_cfg)}, + {IWL_PCI_DEVICE(0x2720, 0x4030, iwl9560_2ac_160_cfg_soc)}, {IWL_PCI_DEVICE(0x2720, 0x4034, iwl9560_2ac_160_cfg_soc)}, {IWL_PCI_DEVICE(0x2720, 0x40A4, iwl9462_2ac_cfg_soc)}, {IWL_PCI_DEVICE(0x2720, 0x4234, iwl9560_2ac_cfg_soc)},
Signature · 1 line
2.23.0
Re: [PATCH 1/5] iwlwifi: pcie: fix PCI ID 0x2720 configs that should be soc
Quoted 6 lines · Luca Coelho
From: Luca Coelho <[email protected]>
Some entries for PCI ID
0x2720were usingiwl9260_2ac_cfg, but the correct is to useiwl9260_2ac_cfg_soc. Fix that.Signed-off-by Luca Coelho <[email protected]>
5 patches applied to wireless-drivers.git, thanks.
6dea7da7019a iwlwifi: pcie: fix PCI ID 0x2720 configs that should be soc e55890150a96 iwlwifi: pcie: fix all 9460 entries for qnj 91cf5dede57f iwlwifi: mvm: handle iwl_mvm_tvqm_enable_txq() error return 9a47cb988338 iwlwifi: pcie: add workaround for power gating in integrated 22000 17c216ed6b9e iwlwifi: pcie: 0x2720 is qu and 0x30DC is not
Signature · 3 lines
https://patchwork.kernel.org/patch/11200077/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH 2/5 iwlwifi: pcie: fix all 9460 entries for qnj
In reply to Luca CoelhoFrom: Luca Coelho <[email protected]>
A bunch of the entries for qnj were wrong. The 9460 device doesn't exist, so update them to 9461 and 9462. There are still a bunch of other occurrences of 9460, but that will be fixed separately.
--- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +8 -8
@@ -573,20 +573,20 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x2526, 0x0034, iwl9560_2ac_cfg)}, {IWL_PCI_DEVICE(0x2526, 0x0038, iwl9560_2ac_160_cfg)}, {IWL_PCI_DEVICE(0x2526, 0x003C, iwl9560_2ac_160_cfg)}, - {IWL_PCI_DEVICE(0x2526, 0x0060, iwl9460_2ac_cfg)}, - {IWL_PCI_DEVICE(0x2526, 0x0064, iwl9460_2ac_cfg)}, - {IWL_PCI_DEVICE(0x2526, 0x00A0, iwl9460_2ac_cfg)}, - {IWL_PCI_DEVICE(0x2526, 0x00A4, iwl9460_2ac_cfg)}, + {IWL_PCI_DEVICE(0x2526, 0x0060, iwl9461_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x2526, 0x0064, iwl9461_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x2526, 0x00A0, iwl9462_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x2526, 0x00A4, iwl9462_2ac_cfg_soc)}, {IWL_PCI_DEVICE(0x2526, 0x0210, iwl9260_2ac_cfg)}, {IWL_PCI_DEVICE(0x2526, 0x0214, iwl9260_2ac_cfg)}, {IWL_PCI_DEVICE(0x2526, 0x0230, iwl9560_2ac_cfg)}, {IWL_PCI_DEVICE(0x2526, 0x0234, iwl9560_2ac_cfg)}, {IWL_PCI_DEVICE(0x2526, 0x0238, iwl9560_2ac_cfg)}, {IWL_PCI_DEVICE(0x2526, 0x023C, iwl9560_2ac_cfg)}, - {IWL_PCI_DEVICE(0x2526, 0x0260, iwl9460_2ac_cfg)}, + {IWL_PCI_DEVICE(0x2526, 0x0260, iwl9461_2ac_cfg_soc)}, {IWL_PCI_DEVICE(0x2526, 0x0264, iwl9461_2ac_cfg_soc)}, - {IWL_PCI_DEVICE(0x2526, 0x02A0, iwl9460_2ac_cfg)}, - {IWL_PCI_DEVICE(0x2526, 0x02A4, iwl9460_2ac_cfg)}, + {IWL_PCI_DEVICE(0x2526, 0x02A0, iwl9462_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x2526, 0x02A4, iwl9462_2ac_cfg_soc)}, {IWL_PCI_DEVICE(0x2526, 0x1010, iwl9260_2ac_cfg)}, {IWL_PCI_DEVICE(0x2526, 0x1030, iwl9560_2ac_cfg)}, {IWL_PCI_DEVICE(0x2526, 0x1210, iwl9260_2ac_cfg)},
@@ -603,7 +603,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x2526, 0x401C, iwl9260_2ac_160_cfg)}, {IWL_PCI_DEVICE(0x2526, 0x4030, iwl9560_2ac_160_cfg)}, {IWL_PCI_DEVICE(0x2526, 0x4034, iwl9560_2ac_160_cfg_soc)}, - {IWL_PCI_DEVICE(0x2526, 0x40A4, iwl9460_2ac_cfg)}, + {IWL_PCI_DEVICE(0x2526, 0x40A4, iwl9462_2ac_cfg_soc)}, {IWL_PCI_DEVICE(0x2526, 0x4234, iwl9560_2ac_cfg_soc)}, {IWL_PCI_DEVICE(0x2526, 0x42A4, iwl9462_2ac_cfg_soc)}, {IWL_PCI_DEVICE(0x2526, 0x6010, iwl9260_2ac_160_cfg)},
Signature · 1 line
2.23.0
PATCH 3/5 iwlwifi: mvm: handle iwl_mvm_tvqm_enable_txq() error return
In reply to Luca CoelhoFrom: Johannes Berg <[email protected]>
iwl_mvm_tvqm_enable_txq() can return an error, notably if unable to allocate memory for the queue. Handle this error throughout, avoiding storing the invalid value into a u16 which later leads to a disable of an invalid queue ("queue 65524 not used", where 65524 is just -ENOMEM in a u16).
--- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 140 +++++++++++-------- 1 file changed, 83 insertions(+), 57 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/sta.c +83 -57
@@ -1482,6 +1482,13 @@ static void iwl_mvm_realloc_queues_after_restart(struct iwl_mvm *mvm, mvm_sta->sta_id, i); txq_id =iwl_mvm_tvqm_enable_txq (mvm, mvm_sta->sta_id, i, wdg); +/* +* on failures, just set it to IWL_MVM_INVALID_QUEUE +* to try again later, we have no other good way of +* failing here +*/ +if (txq_id <0 ) + txq_id =IWL_MVM_INVALID_QUEUE ; tid_data->txq_id = txq_id;/*
@@ -1950,30 +1957,73 @@ void iwl_mvm_dealloc_int_sta(struct iwl_mvm *mvm, struct iwl_mvm_int_sta *sta) sta->sta_id =IWL_MVM_INVALID_STA ; } -static void iwl_mvm_enable_aux_snif_queue (struct iwl_mvm *mvm,u16 *queue, +static void iwl_mvm_enable_aux_snif_queue (struct iwl_mvm *mvm,u16 queue,u8 sta_id,u8 fifo) {unsigned int wdg_timeout = iwlmvm_mod_params.tfd_q_hang_detect ? mvm->trans->trans_cfg->base_params->wd_timeout :IWL_WATCHDOG_DISABLED ; +struct iwl_trans_txq_scd_cfg cfg = { + .fifo = fifo, + .sta_id = sta_id, + .tid =IWL_MAX_TID_COUNT , + .aggregate = false, + .frame_limit =IWL_FRAME_LIMIT , + }; + +WARN_ON (iwl_mvm_has_new_tx_api (mvm)); + +iwl_mvm_enable_txq (mvm,NULL , queue,0 , &cfg, wdg_timeout); +} + +static int iwl_mvm_enable_aux_snif_queue_tvqm (struct iwl_mvm *mvm,u8 sta_id) +{ +unsigned int wdg_timeout = iwlmvm_mod_params.tfd_q_hang_detect ? + mvm->trans->trans_cfg->base_params->wd_timeout : +IWL_WATCHDOG_DISABLED ; + +WARN_ON (!iwl_mvm_has_new_tx_api (mvm)); + +return iwl_mvm_tvqm_enable_txq (mvm, sta_id,IWL_MAX_TID_COUNT , + wdg_timeout); +} +static int iwl_mvm_add_int_sta_with_queue (struct iwl_mvm *mvm,int macidx, +int maccolor, +struct iwl_mvm_int_sta *sta, +u16 *queue,int fifo) +{ +int ret; + +/* Map queue to fifo - needs to happen before adding station */ +if (!iwl_mvm_has_new_tx_api (mvm)) +iwl_mvm_enable_aux_snif_queue (mvm, *queue, sta->sta_id, fifo); + + ret =iwl_mvm_add_int_sta_common (mvm, sta,NULL , macidx, maccolor); +if (ret) { +if (!iwl_mvm_has_new_tx_api (mvm)) +iwl_mvm_disable_txq (mvm,NULL , *queue, +IWL_MAX_TID_COUNT ,0 ); +return ret; + } + +/* +* For 22000 firmware and on we cannot add queue to a station unknown +* to firmware so enable queue here - after the station was added +*/ if (iwl_mvm_has_new_tx_api (mvm)) { -int tvqm_queue = -iwl_mvm_tvqm_enable_txq (mvm, sta_id, -IWL_MAX_TID_COUNT , - wdg_timeout); - *queue = tvqm_queue; - }else { -struct iwl_trans_txq_scd_cfg cfg = { - .fifo = fifo, - .sta_id = sta_id, - .tid =IWL_MAX_TID_COUNT , - .aggregate = false, - .frame_limit =IWL_FRAME_LIMIT , - }; +int txq; -iwl_mvm_enable_txq (mvm,NULL , *queue,0 , &cfg, wdg_timeout); + txq =iwl_mvm_enable_aux_snif_queue_tvqm (mvm, sta->sta_id); +if (txq <0 ) { +iwl_mvm_rm_sta_common (mvm, sta->sta_id); +return txq; + } + + *queue = txq; } + +return 0 ; }int iwl_mvm_add_aux_sta (struct iwl_mvm *mvm)
@@ -1989,59 +2039,26 @@ int iwl_mvm_add_aux_sta(struct iwl_mvm *mvm)if (ret)return ret; -/* Map Aux queue to fifo - needs to happen before adding Aux station */ -if (!iwl_mvm_has_new_tx_api (mvm)) -iwl_mvm_enable_aux_snif_queue (mvm, &mvm->aux_queue, - mvm->aux_sta.sta_id, -IWL_MVM_TX_FIFO_MCAST ); - - ret =iwl_mvm_add_int_sta_common (mvm, &mvm->aux_sta,NULL , -MAC_INDEX_AUX ,0 ); + ret =iwl_mvm_add_int_sta_with_queue (mvm,MAC_INDEX_AUX ,0 , + &mvm->aux_sta, &mvm->aux_queue, +IWL_MVM_TX_FIFO_MCAST );if (ret) {iwl_mvm_dealloc_int_sta (mvm, &mvm->aux_sta);return ret; } -/* -* For 22000 firmware and on we cannot add queue to a station unknown -* to firmware so enable queue here - after the station was added -*/ -if (iwl_mvm_has_new_tx_api (mvm)) -iwl_mvm_enable_aux_snif_queue (mvm, &mvm->aux_queue, - mvm->aux_sta.sta_id, -IWL_MVM_TX_FIFO_MCAST ); -return 0 ; }int iwl_mvm_add_snif_sta (struct iwl_mvm *mvm,struct ieee80211_vif *vif) {struct iwl_mvm_vif *mvmvif =iwl_mvm_vif_from_mac80211 (vif); -int ret;lockdep_assert_held (&mvm->mutex); -/* Map snif queue to fifo - must happen before adding snif station */ -if (!iwl_mvm_has_new_tx_api (mvm)) -iwl_mvm_enable_aux_snif_queue (mvm, &mvm->snif_queue, - mvm->snif_sta.sta_id, +return iwl_mvm_add_int_sta_with_queue (mvm, mvmvif->id, mvmvif->color, + &mvm->snif_sta, &mvm->snif_queue,IWL_MVM_TX_FIFO_BE ); - - ret =iwl_mvm_add_int_sta_common (mvm, &mvm->snif_sta, vif->addr, - mvmvif->id,0 ); -if (ret) -return ret; - -/* -* For 22000 firmware and on we cannot add queue to a station unknown -* to firmware so enable queue here - after the station was added -*/ -if (iwl_mvm_has_new_tx_api (mvm)) -iwl_mvm_enable_aux_snif_queue (mvm, &mvm->snif_queue, - mvm->snif_sta.sta_id, -IWL_MVM_TX_FIFO_BE ); - -return 0 ; }int iwl_mvm_rm_snif_sta (struct iwl_mvm *mvm,struct ieee80211_vif *vif)
@@ -2133,6 +2150,10 @@ int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) queue =iwl_mvm_tvqm_enable_txq (mvm, bsta->sta_id,IWL_MAX_TID_COUNT , wdg_timeout); +if (queue <0 ) { +iwl_mvm_rm_sta_common (mvm, bsta->sta_id); +return queue; + }if (vif->type ==NL80211_IFTYPE_AP || vif->type ==NL80211_IFTYPE_ADHOC )
@@ -2307,10 +2328,8 @@ int iwl_mvm_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) } ret =iwl_mvm_add_int_sta_common (mvm, msta, maddr, mvmvif->id, mvmvif->color); -if (ret) { -iwl_mvm_dealloc_int_sta (mvm, msta); -return ret; - } +if (ret) + goto err;/* * Enable cab queue after the ADD_STA command is sent.
@@ -2323,6 +2342,10 @@ int iwl_mvm_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)int queue =iwl_mvm_tvqm_enable_txq (mvm, msta->sta_id,0 , timeout); +if (queue <0 ) { + ret = queue; + goto err; + } mvmvif->cab_queue = queue; }else if (!fw_has_api (&mvm->fw->ucode_capa,IWL_UCODE_TLV_API_STA_TYPE ))
@@ -2330,6 +2353,9 @@ int iwl_mvm_add_mcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) timeout);return 0 ; +err: +iwl_mvm_dealloc_int_sta (mvm, msta); +return ret; } static int __iwl_mvm_remove_sta_key(struct iwl_mvm *mvm, u8 sta_id,
Signature · 1 line
2.23.0
PATCH 4/5 iwlwifi: pcie: add workaround for power gating in integrated 22000
In reply to Luca CoelhoFrom: Luca Coelho <[email protected]>
Add a workaround that forces power gating to be enabled on integrated 22000 devices. This improves power saving in certain situations.
--- drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 1 + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 5 ++++ .../wireless/intel/iwlwifi/pcie/trans-gen2.c | 25 +++++++++++++++++++ 3 files changed, 31 insertions(+)
drivers/net/wireless/intel/iwlwifi/iwl-csr.h +1 -0
@@ -279,6 +279,7 @@* Indicates MAC is entering a power-saving sleep power-down. * Not a good time to access device-internal resources. */ +#define CSR_GP_CNTRL_REG_FLAG_INIT_DONE (0x00000004)#define CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP (0x00000010)#define CSR_GP_CNTRL_REG_FLAG_XTAL_ON (0x00000400)
drivers/net/wireless/intel/iwlwifi/iwl-prph.h +5 -0
@@ -449,6 +449,11 @@ enum {#define PERSISTENCE_BIT BIT(12)#define PREG_WFPM_ACCESS BIT(12) +#define HPM_HIPM_GEN_CFG 0xA03458 +#define HPM_HIPM_GEN_CFG_CR_PG_EN BIT(0) +#define HPM_HIPM_GEN_CFG_CR_SLP_EN BIT(1) +#define HPM_HIPM_GEN_CFG_CR_FORCE_ACTIVE BIT(10) +#define UREG_DOORBELL_TO_ISR6 0xA05C04#define UREG_DOORBELL_TO_ISR6_NMI_BIT BIT(0)#define UREG_DOORBELL_TO_ISR6_SUSPEND BIT(18)
drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c +25 -0
@@ -57,6 +57,24 @@#include "internal.h" #include "fw/dbg.h" +static int iwl_pcie_gen2_force_power_gating (struct iwl_trans *trans) +{ +iwl_set_bits_prph (trans,HPM_HIPM_GEN_CFG , +HPM_HIPM_GEN_CFG_CR_FORCE_ACTIVE ); +udelay (20 ); +iwl_set_bits_prph (trans,HPM_HIPM_GEN_CFG , +HPM_HIPM_GEN_CFG_CR_PG_EN | +HPM_HIPM_GEN_CFG_CR_SLP_EN ); +udelay (20 ); +iwl_clear_bits_prph (trans,HPM_HIPM_GEN_CFG , +HPM_HIPM_GEN_CFG_CR_FORCE_ACTIVE ); + +iwl_trans_sw_reset (trans); +iwl_clear_bit (trans,CSR_GP_CNTRL ,CSR_GP_CNTRL_REG_FLAG_INIT_DONE ); + +return 0 ; +} +/* * Start up NIC's basic functionality after it has been reset * (e.g. after platform boot, or shutdown via iwl_pcie_apm_stop())
@@ -92,6 +110,13 @@ int iwl_pcie_gen2_apm_init(struct iwl_trans *trans)iwl_pcie_apm_config (trans); +if (trans->trans_cfg->device_family ==IWL_DEVICE_FAMILY_22000 && + trans->cfg->integrated) { + ret =iwl_pcie_gen2_force_power_gating (trans); +if (ret) +return ret; + } + ret =iwl_finish_nic_init (trans, trans->trans_cfg);if (ret)return ret;
Signature · 1 line
2.23.0
PATCH 5/5 iwlwifi: pcie: 0x2720 is qu and 0x30DC is not
In reply to Luca CoelhoFrom: Luca Coelho <[email protected]>
When converting the wrong qu configurations in an earlier commit, I accidentally swapped 0x2720 and 0x30DC. Instead of converting 0x2720, I converted 0x30DC. Undo 0x30DC and convert 0x2720.
--- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 109 +++++++++--------- 1 file changed, 55 insertions(+), 54 deletions(-)
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +55 -54
@@ -618,60 +618,61 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x271B, 0x0210, iwl9160_2ac_cfg)}, {IWL_PCI_DEVICE(0x271B, 0x0214, iwl9260_2ac_cfg)}, {IWL_PCI_DEVICE(0x271C, 0x0214, iwl9260_2ac_cfg)}, - {IWL_PCI_DEVICE(0x2720, 0x0034, iwl9560_2ac_160_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x0038, iwl9560_2ac_160_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x003C, iwl9560_2ac_160_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x0060, iwl9461_2ac_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x0064, iwl9461_2ac_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x00A0, iwl9462_2ac_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x00A4, iwl9462_2ac_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x0230, iwl9560_2ac_cfg)}, - {IWL_PCI_DEVICE(0x2720, 0x0234, iwl9560_2ac_cfg)}, - {IWL_PCI_DEVICE(0x2720, 0x0238, iwl9560_2ac_cfg)}, - {IWL_PCI_DEVICE(0x2720, 0x023C, iwl9560_2ac_cfg)}, - {IWL_PCI_DEVICE(0x2720, 0x0260, iwl9461_2ac_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x0264, iwl9461_2ac_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x02A0, iwl9462_2ac_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x02A4, iwl9462_2ac_cfg_soc)}, - {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_160_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x2034, iwl9560_2ac_160_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x4030, iwl9560_2ac_160_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x4034, iwl9560_2ac_160_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x40A4, iwl9462_2ac_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x4234, iwl9560_2ac_cfg_soc)}, - {IWL_PCI_DEVICE(0x2720, 0x42A4, iwl9462_2ac_cfg_soc)}, - - {IWL_PCI_DEVICE(0x30DC, 0x0030, iwl9560_2ac_160_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x0034, iwl9560_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x0038, iwl9560_2ac_160_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x003C, iwl9560_2ac_160_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x0060, iwl9461_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x0064, iwl9461_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x00A0, iwl9462_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x00A4, iwl9462_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x0230, iwl9560_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x0234, iwl9560_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x0238, iwl9560_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x023C, iwl9560_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x0260, iwl9461_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x0264, iwl9461_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x02A0, iwl9462_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x02A4, iwl9462_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x1030, iwl9560_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x1551, killer1550s_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x1552, killer1550i_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x2030, iwl9560_2ac_160_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x2034, iwl9560_2ac_160_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x4030, iwl9560_2ac_160_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x4034, iwl9560_2ac_160_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x40A4, iwl9462_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x4234, iwl9560_2ac_cfg_qu_b0_jf_b0)}, - {IWL_PCI_DEVICE(0x30DC, 0x42A4, iwl9462_2ac_cfg_qu_b0_jf_b0)}, + + {IWL_PCI_DEVICE(0x2720, 0x0034, iwl9560_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x0038, iwl9560_2ac_160_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x003C, iwl9560_2ac_160_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x0060, iwl9461_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x0064, iwl9461_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x00A0, iwl9462_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x00A4, iwl9462_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x0230, iwl9560_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x0234, iwl9560_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x0238, iwl9560_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x023C, iwl9560_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x0260, iwl9461_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x0264, iwl9461_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x02A0, iwl9462_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x02A4, iwl9462_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x1030, iwl9560_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x1551, killer1550s_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x1552, killer1550i_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x2030, iwl9560_2ac_160_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x2034, iwl9560_2ac_160_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x4030, iwl9560_2ac_160_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x4034, iwl9560_2ac_160_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x40A4, iwl9462_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x4234, iwl9560_2ac_cfg_qu_b0_jf_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x42A4, iwl9462_2ac_cfg_qu_b0_jf_b0)}, + + {IWL_PCI_DEVICE(0x30DC, 0x0030, iwl9560_2ac_160_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x0034, iwl9560_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x0038, iwl9560_2ac_160_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x003C, iwl9560_2ac_160_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x0060, iwl9460_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x0064, iwl9461_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x00A0, iwl9462_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x00A4, iwl9462_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x0230, iwl9560_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x0234, iwl9560_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x0238, iwl9560_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x023C, iwl9560_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x0260, iwl9461_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x0264, iwl9461_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x02A0, iwl9462_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x02A4, iwl9462_2ac_cfg_soc)}, + {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_160_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x2034, iwl9560_2ac_160_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x4030, iwl9560_2ac_160_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x4034, iwl9560_2ac_160_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x40A4, iwl9462_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x4234, iwl9560_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x30DC, 0x42A4, iwl9462_2ac_cfg_soc)}, {IWL_PCI_DEVICE(0x31DC, 0x0030, iwl9560_2ac_160_cfg_shared_clk)}, {IWL_PCI_DEVICE(0x31DC, 0x0034, iwl9560_2ac_cfg_shared_clk)},
Signature · 1 line
2.23.0