Make some killer wireless ac 1550 cards work again

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

2 files changed, 53 insertions, 0 deletions

diff --git a/iwlwifi-make-some-killer-wireless-ac-1550-cards-work-again.patch b/iwlwifi-make-some-killer-wireless-ac-1550-cards-work-again.patch
new file mode 100644
index 000000000..8bbbd79e7
--- /dev/null
+++ b/iwlwifi-make-some-killer-wireless-ac-1550-cards-work-again.patch
@@ -0,0 +1,46 @@
+From MAILER-DAEMON Wed Jul 15 12:54:09 2020
+From: Alessio Bonfiglio <alessio.bonfiglio@mail.polimi.it>
+To: linux-wireless@vger.kernel.org
+Cc: Alessio Bonfiglio <alessio.bonfiglio@mail.polimi.it>, Johannes Berg <johannes.berg@intel.com>, Emmanuel Grumbach <emmanuel.grumbach@intel.com>, Luca Coelho <luciano.coelho@intel.com>, Intel Linux Wireless <linuxwifi@intel.com>
+Subject: [PATCH v2] iwlwifi: Make some Killer Wireless-AC 1550 cards work again
+Date: Tue, 14 Jul 2020 11:19:11 +0200
+Message-Id: <20200714091911.4442-1-alessio.bonfiglio@mail.polimi.it>
+In-Reply-To: <87imeqcwbt.fsf@tynnyri.adurom.net>
+References: <87imeqcwbt.fsf@tynnyri.adurom.net>
+Sender: linux-wireless-owner@vger.kernel.org
+List-ID: <linux-wireless.vger.kernel.org>
+X-Mailing-List: linux-wireless@vger.kernel.org
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 7bit
+
+Fix the regression introduced by commit c8685937d07f ("iwlwifi: move
+pu devices to new table") by adding the ids and the configurations of
+two missing Killer 1550 cards in order to configure and let them work
+correctly again (following the new table convention).
+Resolve bug 208141 ("Wireless ac 9560 not working kernel 5.7.2",
+https://bugzilla.kernel.org/show_bug.cgi?id=208141).
+
+Fixes: c8685937d07f ("iwlwifi: move pu devices to new table")
+Signed-off-by: Alessio Bonfiglio <alessio.bonfiglio@mail.polimi.it>
+---
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+index 65d65c6baf4c..e02bafb8921f 100644
+--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
++++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+@@ -582,6 +582,8 @@ static const struct iwl_dev_info iwl_dev_info_table[] = {
+ 	IWL_DEV_INFO(0x30DC, 0x1552, iwl9560_2ac_cfg_soc, iwl9560_killer_1550i_name),
+ 	IWL_DEV_INFO(0x31DC, 0x1551, iwl9560_2ac_cfg_soc, iwl9560_killer_1550s_name),
+ 	IWL_DEV_INFO(0x31DC, 0x1552, iwl9560_2ac_cfg_soc, iwl9560_killer_1550i_name),
++	IWL_DEV_INFO(0xA370, 0x1551, iwl9560_2ac_cfg_soc, iwl9560_killer_1550s_name),
++	IWL_DEV_INFO(0xA370, 0x1552, iwl9560_2ac_cfg_soc, iwl9560_killer_1550i_name),
+ 
+ 	IWL_DEV_INFO(0x271C, 0x0214, iwl9260_2ac_cfg, iwl9260_1_name),
+ 
+-- 
+2.27.0
+
+
diff --git a/kernel.spec b/kernel.spec
index d8c61c045..5f95dedfd 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -874,6 +874,10 @@ Patch122: 0013-arm64-dts-sun50i-a64-pinephone-Add-touchscreen-suppo.patch
 Patch123: 0001-usb-fusb302-Convert-to-use-GPIO-descriptors.patch
 # Tegra194 ACPI PCI quirk - http://patchwork.ozlabs.org/patch/1221384/
 Patch124: 0001-PCI-Add-MCFG-quirks-for-Tegra194-host-controllers.patch
+
+# Killer wireless headed to stable
+Patch125: iwlwifi-make-some-killer-wireless-ac-1550-cards-work-again.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2970,6 +2974,9 @@ fi
 #
 #
 %changelog
+* Wed Jul 15 2020 Justin M. Forbes <jforbes@fedoraproject.org>
+- Make some killer wireless ac 1550 cards work again
+
 * Sun Jul 12 2020 Peter Robinson <pbrobinson@fedoraproject.org>
 - selinux: allow reading labels before policy is loaded (rhbz 1845210)