| Message ID | 20200428041712.1269269-2-vicamo.yang@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | UBUNTU: SAUCE: Fix Intel Killer Wi-Fi 6 AX1650i/s firmware crash at probing | expand |
On 28.04.20 06:17, You-Sheng Yang wrote: > From: Luca Coelho <luciano.coelho@intel.com> > > BugLink: https://bugs.launchpad.net/bugs/1874685 > > The killer devices were left out of the checks that convert Qu-B0 to > QuZ configurations. Add them. > > Cc: stable@vger.kernel.org # v5.3+ > Fixes: 5a8c31aa6357 ("iwlwifi: pcie: fix recognition of QuZ devices") > Signed-off-by: Luca Coelho <luciano.coelho@intel.com> - (backported from - https://lore.kernel.org/linux-wireless/iwlwifi.20200424121518.b715acfbe211.I273a098064a22577e4fca767910fd9cf0013f5cb@changeid/raw) + Link: https://lore.kernel.org/r/iwlwifi.20200424121518.b715acfbe211.I273a098064a22577e4fca767910fd9cf0013f5cb@changeid (backported from f92f26f2ed2c9f92c9270c705bca96310c3cdf5a linux-next) > Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- This seems to be in linux-next now. And we generally should not do SRU's for things not at least in linux-next if the issue is not high/critical from a SRU perspective. > drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c > index 0cd639d792e6..84b6fabd46d9 100644 > --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c > +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c > @@ -1136,6 +1136,10 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > iwl_trans->cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc; > else if (cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0) > iwl_trans->cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc; > + else if (cfg == &killer1650s_2ax_cfg_qu_b0_hr_b0) > + iwl_trans->cfg = &iwl_ax1650s_cfg_quz_hr; > + else if (cfg == &killer1650i_2ax_cfg_qu_b0_hr_b0) > + iwl_trans->cfg = &iwl_ax1650i_cfg_quz_hr; > } > > #endif >
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index 0cd639d792e6..84b6fabd46d9 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -1136,6 +1136,10 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) iwl_trans->cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc; else if (cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0) iwl_trans->cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc; + else if (cfg == &killer1650s_2ax_cfg_qu_b0_hr_b0) + iwl_trans->cfg = &iwl_ax1650s_cfg_quz_hr; + else if (cfg == &killer1650i_2ax_cfg_qu_b0_hr_b0) + iwl_trans->cfg = &iwl_ax1650i_cfg_quz_hr; } #endif