Merge ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:for-hwe/lp-1828147 into ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:ubuntu/master

[You-Sheng Yang]

UBUNTU: SAUCE: iwlwifi: trans: fix killer series loadded incorrect firmware

BugLink: https://bugs.launchpad.net/bugs/1830822

Killer series loadded IWL_22000_HR_B_FW_PRE prefixed firmware instead IWL_CC_A_FW_PRE prefixed firmware. This patch adds killer series to the check logic as iwl_ax200_cfg_cc.

Since upstream has already a similar patch in stage but yet ready to publish all out, this is added to patch queue for now and will be removed when the corresponding upstream fix is rolled out.

[You-Sheng Yang (vicamo)]

Need public bug.

review: Needs Fixing

[You-Sheng Yang (vicamo)]

https://bugs.launchpad.net/bugs/1830822

[You-Sheng Yang (vicamo)]

* Updated public bug url
* Updated title to include "SAUCE: "

[You-Sheng Yang (vicamo)]

verified

review: Approve

[AceLan Kao (acelankao)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index c60d4d6..f38a53b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+iwlwifi-dkms (7744-ubuntu1) UNRELEASED; urgency=low
+
+  * Close lp:1830822.
+
+ -- You-Sheng Yang <[e-mail]>  Tue, 28 May 2019 15:53:12 +0800
+
 iwlwifi-dkms (7744) UNRELEASED; urgency=low
 
   * Initial release
diff --git a/debian/patches/0001-UBUNTU-SAUCE-iwlwifi-trans-fix-killer-series-loadded-incor.patch b/debian/patches/0001-UBUNTU-SAUCE-iwlwifi-trans-fix-killer-series-loadded-incor.patch
new file mode 100644
index 0000000..af8b238
--- /dev/null
+++ b/debian/patches/0001-UBUNTU-SAUCE-iwlwifi-trans-fix-killer-series-loadded-incor.patch
@@ -0,0 +1,29 @@
+From: Cyrus Lien <[e-mail]>
+Date: Mon, 13 May 2019 13:33:35 +0000
+Subject: UBUNTU: SAUCE: iwlwifi: trans: fix killer series loadded incorrect firmware
+
+Killer series loadded IWL_22000_HR_B_FW_PRE prefixed firmware instead
+IWL_CC_A_FW_PRE prefixed firmware.
+
+Add killer series to the check logic as iwl_ax200_cfg_cc.
+
+Signed-off-by: Cyrus Lien <[e-mail]>
+---
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+index b2e4c73..82a7384 100644
+--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
++++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+@@ -3640,7 +3640,9 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
+ 		}
+ 	} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
+ 		   CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&
+-		   (trans->cfg != &iwl_ax200_cfg_cc ||
++		   ((trans->cfg != &iwl_ax200_cfg_cc &&
++		     trans->cfg != &killer1650x_2ax_cfg &&
++		     trans->cfg != &killer1650w_2ax_cfg) ||
+ 		    trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0)) {
+ 		u32 hw_status;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..402fa27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-UBUNTU-SAUCE-iwlwifi-trans-fix-killer-series-loadded-incor.patch