From 66b035a6031959e620da70855474943eb706646d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Mar 2021 09:15:30 +0100 Subject: [PATCH] 4.19-stable patches added patches: powerpc-force-inlining-of-cpu_has_feature-to-avoid-build-failure.patch --- ...u_has_feature-to-avoid-build-failure.patch | 58 +++++++++++++++++++ queue-4.19/series | 1 + 2 files changed, 59 insertions(+) create mode 100644 queue-4.19/powerpc-force-inlining-of-cpu_has_feature-to-avoid-build-failure.patch diff --git a/queue-4.19/powerpc-force-inlining-of-cpu_has_feature-to-avoid-build-failure.patch b/queue-4.19/powerpc-force-inlining-of-cpu_has_feature-to-avoid-build-failure.patch new file mode 100644 index 00000000000..d8ef066c961 --- /dev/null +++ b/queue-4.19/powerpc-force-inlining-of-cpu_has_feature-to-avoid-build-failure.patch @@ -0,0 +1,58 @@ +From eed5fae00593ab9d261a0c1ffc1bdb786a87a55a Mon Sep 17 00:00:00 2001 +From: Christophe Leroy +Date: Wed, 10 Mar 2021 12:10:34 +0000 +Subject: powerpc: Force inlining of cpu_has_feature() to avoid build failure + +From: Christophe Leroy + +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 +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/b231dfa040ce4cc37f702f5c3a595fdeabfe0462.1615378209.git.christophe.leroy@csgroup.eu +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/include/asm/cpu_has_feature.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/powerpc/include/asm/cpu_has_feature.h b/arch/powerpc/include/asm/cpu_has_feature.h +index 7897d16e0990..727d4b321937 100644 +--- a/arch/powerpc/include/asm/cpu_has_feature.h ++++ b/arch/powerpc/include/asm/cpu_has_feature.h +@@ -7,7 +7,7 @@ + #include + #include + +-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_feature(unsigned long feature) + 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); + } +-- +2.31.0 + diff --git a/queue-4.19/series b/queue-4.19/series index 2d867bcaa19..6bb72daefa3 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -18,3 +18,4 @@ sunrpc-fix-refcount-leak-for-rpc-auth-modules.patch net-qrtr-fix-__netdev_alloc_skb-call.patch scsi-lpfc-fix-some-error-codes-in-debugfs.patch nvme-rdma-fix-possible-hang-when-failing-to-set-io-q.patch +powerpc-force-inlining-of-cpu_has_feature-to-avoid-build-failure.patch -- 2.47.3