diff options
| author | Luca Coelho <luciano.coelho@intel.com> | 2019-08-16 09:29:40 +0300 |
|---|---|---|
| committer | iwlwifi publisher <> | 2019-08-22 06:24:02 +0000 |
| commit | a75c1de6b3fa87885556c67619429cfa87cc048f (patch) | |
| tree | 69ca33ae934db3386664115691d79efee3e38f25 | |
| parent | d485f8eb2d941ac72e3c1d9b7063a292a654f554 (diff) | |
| download | backport-iwlwifi-release/core45.tar.gz | |
[BUGFIX] iwlwifi: pcie: fix recognition of QuZ devicesrelease/core45
If the HW revision of Qu devices we found is QuZ, then we need to
switch the configuration accordingly in order to use the correct FW.
Add a block of ifs in order do that.
type=bugfix
fixes=unknown
ticket=jira:WIFI-30085
Change-Id: I161c87bc1562de7b0cb159094dc4a0a39f1e459d
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/233529
automatic-review: ec ger unix iil jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Tested-by: ec ger unix iil jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/234034
x-iwlwifi-stack-dev: bcd11ac88c776e1194ba7287cf09e866d1ba4790
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 17 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index e8e06d349f..99caadf636 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -892,6 +892,23 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) else if (iwl_trans->cfg == &killer1650i_2ax_cfg_qu_b0_hr_b0) iwl_trans->cfg = &killer1650i_2ax_cfg_qu_c0_hr_b0; } + + /* same thing for QuZ... */ + if (iwl_trans->hw_rev == CSR_HW_REV_TYPE_QUZ) { + if (cfg == &iwl_ax101_cfg_qu_hr) + cfg = &iwl_ax101_cfg_quz_hr; + else if (cfg == &iwl_ax201_cfg_qu_hr) + cfg = &iwl_ax201_cfg_quz_hr; + else if (cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0) + cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc; + else if (cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0) + cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc; + else if (cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0) + cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc; + else if (cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0) + cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc; + } + #endif pci_set_drvdata(pdev, iwl_trans); @@ -2,5 +2,5 @@ BACKPORTS_VERSION="(see git)" BACKPORTED_KERNEL_VERSION="(see git)" BACKPORTED_KERNEL_NAME="iwlwifi" BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__ -BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core45:7840:ad5d12dc" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core45:7841:bcd11ac8" BACKPORTS_BRANCH_TSTAMP="Apr 04 2019 07:53:04" |