From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 22 Mar 2021 08:15:50 +0000 (+0100)
Subject: 5.10-stable patches
X-Git-Tag: v4.4.263~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5fcdf6bd5f8a7e71afdc75b7e2cd3521d9404d67;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	powerpc-force-inlining-of-cpu_has_feature-to-avoid-build-failure.patch
---

diff --git a/queue-5.10/powerpc-force-inlining-of-cpu_has_feature-to-avoid-build-failure.patch b/queue-5.10/powerpc-force-inlining-of-cpu_has_feature-to-avoid-build-failure.patch
new file mode 100644
index 00000000000..533d61dcf41
--- /dev/null
+++ b/queue-5.10/powerpc-force-inlining-of-cpu_has_feature-to-avoid-build-failure.patch
@@ -0,0 +1,53 @@
+From eed5fae00593ab9d261a0c1ffc1bdb786a87a55a Mon Sep 17 00:00:00 2001
+From: Christophe Leroy <christophe.leroy@csgroup.eu>
+Date: Wed, 10 Mar 2021 12:10:34 +0000
+Subject: powerpc: Force inlining of cpu_has_feature() to avoid build failure
+
+From: Christophe Leroy <christophe.leroy@csgroup.eu>
+
+commit eed5fae00593ab9d261a0c1ffc1bdb786a87a55a upstream.
+
+The code relies on constant folding of cpu_has_feature() based
+on possible and always true values as defined per
+CPU_FTRS_ALWAYS and CPU_FTRS_POSSIBLE.
+
+Build failure is encountered with for instance
+book3e_all_defconfig on kisskb in the AMDGPU driver which uses
+cpu_has_feature(CPU_FTR_VSX_COMP) to decide whether calling
+kernel_enable_vsx() or not.
+
+The failure is due to cpu_has_feature() not being inlined with
+that configuration with gcc 4.9.
+
+In the same way as commit acdad8fb4a15 ("powerpc: Force inlining of
+mmu_has_feature to fix build failure"), for inlining of
+cpu_has_feature().
+
+Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Link: https://lore.kernel.org/r/b231dfa040ce4cc37f702f5c3a595fdeabfe0462.1615378209.git.christophe.leroy@csgroup.eu
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/powerpc/include/asm/cpu_has_feature.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/powerpc/include/asm/cpu_has_feature.h
++++ b/arch/powerpc/include/asm/cpu_has_feature.h
+@@ -7,7 +7,7 @@
+ #include <linux/bug.h>
+ #include <asm/cputable.h>
+ 
+-static inline bool early_cpu_has_feature(unsigned long feature)
++static __always_inline bool early_cpu_has_feature(unsigned long feature)
+ {
+ 	return !!((CPU_FTRS_ALWAYS & feature) ||
+ 		  (CPU_FTRS_POSSIBLE & cur_cpu_spec->cpu_features & feature));
+@@ -46,7 +46,7 @@ static __always_inline bool cpu_has_feat
+ 	return static_branch_likely(&cpu_feature_keys[i]);
+ }
+ #else
+-static inline bool cpu_has_feature(unsigned long feature)
++static __always_inline bool cpu_has_feature(unsigned long feature)
+ {
+ 	return early_cpu_has_feature(feature);
+ }
diff --git a/queue-5.10/series b/queue-5.10/series
index 6a748f95cbb..c79652a1c90 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -112,3 +112,4 @@ regulator-pca9450-clear-preset_en-bit-to-fix-buck1-2.patch
 gfs2-add-common-helper-for-holding-and-releasing-the.patch
 gfs2-move-freeze-glock-outside-the-make_fs_rw-and-_r.patch
 gfs2-bypass-signal_our_withdraw-if-no-journal.patch
+powerpc-force-inlining-of-cpu_has_feature-to-avoid-build-failure.patch