Merge ~vicamo/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:for-focal/bug-1848922/fix-build into ~vicamo/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:ubuntu/focal

[You-Sheng Yang]

[You-Sheng Yang (vicamo)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 888ec1a..9535342 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+backport-iwlwifi-dkms (7906-0ubuntu2) focal; urgency=low
+
+  * debian/patches/0006-NOUPSTREAM-backport-rename-ktime_get_boot_ns-for-v5..patch
+    - fix build against v5.3. (LP: #1848922)
+  * debian/patches/0005-Makefile.kernel-pass-fno-stack-clash-protection-and-.patch
+    - add -fcf-protection=none when using retpoline flags. (LP: #1830961)
+    - drop -fno-stack-clash-protection for it's no longer necessary.
+
+ -- You-Sheng Yang <[e-mail]>  Mon, 21 Oct 2019 20:22:27 +0800
+
 backport-iwlwifi-dkms (7906-0ubuntu1) eoan; urgency=low
 
   * Initial release (LP: #1835858)
diff --git a/debian/copyright b/debian/copyright
index 25303a0..f71d321 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,7 +26,7 @@ License: GPL-2.0
  `/usr/share/common-licenses/GPL-2'.
 
 Files: debian/*
-Copyright: 2019 You-Sheng Yang <[e-mail]>
+Copyright: 2019 Canonical Ltd
 License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/debian/patches/0005-Makefile.kernel-pass-fno-stack-clash-protection-and-.patch b/debian/patches/0005-Makefile.kernel-pass-fno-stack-clash-protection-and-.patch
index 194c653..83786b4 100644
--- a/debian/patches/0005-Makefile.kernel-pass-fno-stack-clash-protection-and-.patch
+++ b/debian/patches/0005-Makefile.kernel-pass-fno-stack-clash-protection-and-.patch
@@ -1,21 +1,24 @@
 From: You-Sheng Yang <[e-mail]>
 Date: Mon, 15 Jul 2019 20:05:54 +0800
-Subject: Makefile.kernel: pass -fno-stack-clash-protection and
- -fcf-protection=none for gcc-9
+Subject: kbuild: add -fcf-protection=none when using retpoline flags
 
+See
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=29be86d7f9cb18df4123f309ac7857570513e8bc
 ---
- Makefile.kernel | 2 ++
- 1 file changed, 2 insertions(+)
+ Makefile.kernel | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/Makefile.kernel b/Makefile.kernel
-index 3274949..403345d 100644
+index 3274949..4ee9f2f 100644
 --- a/Makefile.kernel
 +++ b/Makefile.kernel
-@@ -10,6 +10,8 @@ KBUILD_CFLAGS := $(KBUILD_CFLAGS) -Wformat-security \
+@@ -10,6 +10,10 @@ KBUILD_CFLAGS := $(KBUILD_CFLAGS) -Wformat-security \
  	$(call backport-cc-disable-error, date-time) \
  	$(call backport-cc-disable-warning, date-time)
  
-+KBUILD_CFLAGS += -fno-stack-clash-protection -fcf-protection=none
++ifdef CONFIG_RETPOLINE
++KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none)
++endif
 +
  NOSTDINC_FLAGS := \
  	-I$(M)/backport-include/ \
diff --git a/debian/patches/0006-NOUPSTREAM-backport-rename-ktime_get_boot_ns-for-v5..patch b/debian/patches/0006-NOUPSTREAM-backport-rename-ktime_get_boot_ns-for-v5..patch
new file mode 100644
index 0000000..219899c
--- /dev/null
+++ b/debian/patches/0006-NOUPSTREAM-backport-rename-ktime_get_boot_ns-for-v5..patch
@@ -0,0 +1,46 @@
+From: Luca Coelho <[e-mail]>
+Date: Thu, 15 Aug 2019 14:49:00 +0300
+Subject: [NOUPSTREAM] backport: rename ktime_get_boot_ns for v5.3+
+
+In v5.3, this function was renamed, so rename it here for v5.3+.  When
+we merge v5.3 back from upstream, the opposite should be done (i.e. we
+will have _boottime_ and need to rename to _boot_ in < v5.3 instead).
+
+This may be applied to older cores if we want them to compile on
+v5.3+.
+
+type=maint
+ticket=none
+
+Change-Id: Ia3f2b514a173edb320b3445a9d6e7e31e9182059
+Signed-off-by: Luca Coelho <[e-mail]>
+Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/233392
+Tested-by: ec ger unix iil jenkins <[e-mail]>
+x-iwlwifi-stack-dev: eb274c49a30f3bf2cf3ca6f537a018707edc0bae
+(cherry picked from commit f47729b94e118ad592870073b251f6927b95d1e0)
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ backport-include/linux/timekeeping.h | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/backport-include/linux/timekeeping.h b/backport-include/linux/timekeeping.h
+index 198b09b..b97b09f 100644
+--- a/backport-include/linux/timekeeping.h
++++ b/backport-include/linux/timekeeping.h
+@@ -26,6 +26,16 @@ static inline u64 ktime_get_boot_ns(void)
+ }
+ #endif /* < 3.17 */
+ 
++#if LINUX_VERSION_IS_GEQ(5,3,0)
++/*
++ * In v5.3, this function was renamed, so rename it here for v5.3+.
++ * When we merge v5.3 back from upstream, the opposite should be done
++ * (i.e. we will have _boottime_ and need to rename to _boot_ in <
++ * v5.3 instead).
++*/
++#define ktime_get_boot_ns ktime_get_boottime_ns
++#endif /* > 5.3.0 */
++
+ #if LINUX_VERSION_IS_LESS(4,18,0)
+ extern time64_t ktime_get_boottime_seconds(void);
+ #endif /* < 4.18 */
diff --git a/debian/patches/series b/debian/patches/series
index e037267..c03ca2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-backport-apply-__copy-to-init_module-cleanup_module.patch
 0004-backport-fix-build-for-v5.2-kernel.patch
 0005-Makefile.kernel-pass-fno-stack-clash-protection-and-.patch
+0006-NOUPSTREAM-backport-rename-ktime_get_boot_ns-for-v5..patch