powerpc/cputable: Add missing PPC_FEATURE_BOOKE on PPC64 Book-E
PATCH 1/1 powerpc/cputable: Add missing PPC_FEATURE_BOOKE on PPC64 Book-E
Commit e320a76db4b0 ("powerpc/cputable: Split cpu_specs[] out of cputable.h") moved the cpu_specs to separate header files. Previously PPC_FEATURE_BOOKE was enabled by CONFIG_PPC_BOOK3E_64. The definition in cpu_specs_e500mc.h for PPC64 no longer enables PPC_FEATURE_BOOKE.
This breaks user space reading the ELF hwcaps and expect PPC_FEATURE_BOOKE. Debugging an application with gdb is no longer working on e5500/e6500 because the 64-bit detection relies on PPC_FEATURE_BOOKE for Book-E.
--- arch/powerpc/kernel/cpu_specs_e500mc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/powerpc/kernel/cpu_specs_e500mc.h +2 -1
@@ -8,7 +8,8 @@#ifdef CONFIG_PPC64 #define COMMON_USER_BOOKE (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \ - PPC_FEATURE_HAS_FPU | PPC_FEATURE_64) + PPC_FEATURE_HAS_FPU | PPC_FEATURE_64 | \ + PPC_FEATURE_BOOKE)#else #define COMMON_USER_BOOKE (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \ PPC_FEATURE_BOOKE)
Signature · 1 line
2.40.1
Le 07/02/2024 à 10:27, David Engraf a écrit :
Quoted 7 lines
[Vous ne recevez pas souvent de courriers de [email protected]. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ]
Commit
e320a76db4b0("powerpc/cputable: Split cpu_specs[] out ofcputable.h") moved thecpu_specsto separate header files. PreviouslyPPC_FEATURE_BOOKEwas enabled byCONFIG_PPC_BOOK3E_64. The definition incpu_specs_e500mc.hfor PPC64 no longer enablesPPC_FEATURE_BOOKE.
Quoted 6 lines
This breaks user space reading the ELF hwcaps and expect
PPC_FEATURE_BOOKE. Debugging an application with gdb is no longer working on e5500/e6500 because the 64-bit detection relies onPPC_FEATURE_BOOKEfor Book-E.Fixes e320a76db4b0 ("powerpc/cputable: Split cpu_specs[] out of cputable.h")Signed-off-by David Engraf <[email protected]>
Quoted 21 lines
--- arch/powerpc/kernel/cpu_specs_e500mc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/powerpc/kernel/cpu_specs_e500mc.h +2
-2@@ -8,7 +8,8 @@#ifdef CONFIG_PPC64 #define COMMON_USER_BOOKE (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \ - PPC_FEATURE_HAS_FPU | PPC_FEATURE_64) + PPC_FEATURE_HAS_FPU | PPC_FEATURE_64 | \ + PPC_FEATURE_BOOKE)#else #define COMMON_USER_BOOKE (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \ PPC_FEATURE_BOOKE) --2.40.1
Michael Ellerman
AppliedQuoted 10 lines · David Engraf
Commit
e320a76db4b0("powerpc/cputable: Split cpu_specs[] out ofcputable.h") moved thecpu_specsto separate header files. PreviouslyPPC_FEATURE_BOOKEwas enabled byCONFIG_PPC_BOOK3E_64. The definition incpu_specs_e500mc.hfor PPC64 no longer enablesPPC_FEATURE_BOOKE.This breaks user space reading the ELF hwcaps and expect
PPC_FEATURE_BOOKE. Debugging an application with gdb is no longer working on e5500/e6500 because the 64-bit detection relies onPPC_FEATURE_BOOKEfor Book-E.[...]
Applied to powerpc/fixes.
[1/1] powerpc/cputable: Add missing PPC_FEATURE_BOOKE on PPC64 Book-E
https://git.kernel.org/powerpc/c/eb6d871f4ba49ac8d0537e051fe983a3a4027f61
cheers