From b0e37da61ea05aee7d427ef586e7f40a09cd25f6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Mar 2021 09:16:08 +0100 Subject: [PATCH] 5.11-stable patches added patches: powerpc-force-inlining-of-cpu_has_feature-to-avoid-build-failure.patch --- ...u_has_feature-to-avoid-build-failure.patch | 53 +++++++++++++++++++ queue-5.11/series | 1 + 2 files changed, 54 insertions(+) create mode 100644 queue-5.11/powerpc-force-inlining-of-cpu_has_feature-to-avoid-build-failure.patch diff --git a/queue-5.11/powerpc-force-inlining-of-cpu_has_feature-to-avoid-build-failure.patch b/queue-5.11/powerpc-force-inlining-of-cpu_has_feature-to-avoid-build-failure.patch new file mode 100644 index 00000000000..533d61dcf41 --- /dev/null +++ b/queue-5.11/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 +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(-) + +--- 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_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.11/series b/queue-5.11/series index cf1b5779484..bc4545bad8e 100644 --- a/queue-5.11/series +++ b/queue-5.11/series @@ -74,3 +74,4 @@ drm-ttm-warn-on-pinning-without-holding-a-reference.patch drm-ttm-make-ttm_bo_unpin-more-defensive.patch gpiolib-assign-fwnode-to-parent-s-if-no-primary-one-.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