Merge ~vicamo/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:bug-1886911/fix-build-against-v5.4/bionic into ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:ubuntu/bionic

[You-Sheng Yang]

* Fix build against v5.4 kernel (LP: #1886911)

[You-Sheng Yang (vicamo)]

PPA for test available in https://launchpad.net/~vicamo/+archive/ubuntu/ppa-1886911

[Timo Aaltonen (tjaalton)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 3c55ac2..aad2f3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+backport-iwlwifi-dkms (7906-0ubuntu4~18.04.2) bionic; urgency=medium
+
+  * Fix build against v5.4 kernel (LP: #1886911)
+
+ -- You-Sheng Yang <[e-mail]>  Thu, 09 Jul 2020 14:37:35 +0800
+
 backport-iwlwifi-dkms (7906-0ubuntu4~18.04.1) bionic; urgency=medium
 
   * debian/backport-iwlwifi-dkms.dkms.in
diff --git a/debian/patches/0007-backport-add-pci-aspm.h-to-backport-pci.h.patch b/debian/patches/0007-backport-add-pci-aspm.h-to-backport-pci.h.patch
 new file mode 100644
index 0000000..96f97bf
--- /dev/null
+++ b/debian/patches/0007-backport-add-pci-aspm.h-to-backport-pci.h.patch
@@ -0,0 +1,40 @@
+From b9c7458842dc63ab7096385b824c522dba0f5325 Mon Sep 17 00:00:00 2001
+From: Luca Coelho <[e-mail]>
+Date: Tue, 12 Nov 2019 17:28:49 +0200
+Subject: [PATCH 1/2] backport: add pci-aspm.h to backport pci.h
+
+In kernel v5.4, the definitions in pci-aspm.h were moved to pci.h.
+Include pci-aspm.h in the backport pci.h for older kernels.
+
+type=maint
+ticket=none
+
+Change-Id: I82359fa0401d55e312d8bf44661dab274c584678
+Signed-off-by: Luca Coelho <[e-mail]>
+Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/243629
+Tested-by: ec ger unix iil jenkins <[e-mail]>
+x-iwlwifi-stack-dev: 3117c57f00bebcecd5ebe3421ba8b34d703cda5a
+(backported from commit 7c0210bec6c0380ab7c136a344ed73b8ddbac264)
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ backport-include/linux/pci.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/backport-include/linux/pci.h b/backport-include/linux/pci.h
+index 341660ba6..688680d0e 100644
+--- a/backport-include/linux/pci.h
++++ b/backport-include/linux/pci.h
+@@ -3,6 +3,10 @@
+ #include_next <linux/pci.h>
+ #include <linux/version.h>
+ 
++#if LINUX_VERSION_IS_LESS(5,4,0)
++#include <linux/pci-aspm.h>
++#endif
++
+ #ifndef module_pci_driver
+ /**
+  * module_pci_driver() - Helper macro for registering a PCI driver
+-- 
+2.27.0
+
diff --git a/debian/patches/0008-NOUPSTREAM-iwlwifi-pcie-remove-pci-aspm.h-include.patch b/debian/patches/0008-NOUPSTREAM-iwlwifi-pcie-remove-pci-aspm.h-include.patch
 new file mode 100644
index 0000000..b4559c1
--- /dev/null
+++ b/debian/patches/0008-NOUPSTREAM-iwlwifi-pcie-remove-pci-aspm.h-include.patch
@@ -0,0 +1,38 @@
+From 847c79350326aecc8ae78e9816481b650547112d Mon Sep 17 00:00:00 2001
+From: Luca Coelho <[e-mail]>
+Date: Tue, 12 Nov 2019 17:30:41 +0200
+Subject: [PATCH 2/2] [NOUPSTREAM] iwlwifi: pcie: remove pci-aspm.h include
+
+The definitions in pci-aspm.h were moved to pci.h in v5.4.  The change
+in iwlwifi should come with a backport, but until then, remove the
+pci-aspm.h include directly.
+
+type=maint
+ticket=none
+
+Change-Id: I6dbb81d77fdc32ee7cd07faa22a9c8b763a315fc
+Signed-off-by: Luca Coelho <[e-mail]>
+Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/243630
+Tested-by: ec ger unix iil jenkins <[e-mail]>
+x-iwlwifi-stack-dev: c0f31ab11a74cb303fd4ef1fcd40cc9f13d7337b
+(backported from commit dcb781ec66565326192b43ea34a843bc5606bf59)
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+index 519a42142..eb55181a5 100644
+--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
++++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+@@ -62,7 +62,6 @@
+  *
+  *****************************************************************************/
+ #include <linux/pci.h>
+-#include <linux/pci-aspm.h>
+ #include <linux/interrupt.h>
+ #include <linux/debugfs.h>
+ #include <linux/sched.h>
+-- 
+2.27.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 7d5bfad..1d24d8f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,5 @@
 0005-Makefile.kernel-pass-fno-stack-clash-protection-and-.patch
 0006-NOUPSTREAM-backport-rename-ktime_get_boot_ns-for-v5..patch
 0006-backport-address-interface-change-in-linux-skbuff.h-.patch
+0007-backport-add-pci-aspm.h-to-backport-pci.h.patch
+0008-NOUPSTREAM-iwlwifi-pcie-remove-pci-aspm.h-include.patch