powerpc/8xxx: Clean up setting of CPU_FTR_NEED_COHERENT
RFC 1/1 powerpc/8xxx: Clean up setting of CPU_FTR_NEED_COHERENT
From: Grant Likely <[email protected]>
Method used to set CPU_FTR_NEED_COHERENT was unfriendly for multiplatform kernels. This patch cleans it up.
Signed-off-by Grant Likely <[email protected]>
---
I haven't even compile tested this. But I want to see if there are any objections before I do the legwork.
g.
arch/powerpc/include/asm/cputable.h | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/cputable.h +4 -5
@@ -242,8 +242,7 @@ extern const char *powerpc_base_platform;* 74[45]x and an MPC107 host bridge. Also 83xx and PowerQUICC II * require it for PCI "streaming/prefetch" to work properly. */ -#if defined(CONFIG_SMP ) || defined(CONFIG_MPC10X_BRIDGE ) \ - || defined(CONFIG_PPC_83xx) || defined(CONFIG_8260 ) +#if defined(CONFIG_SMP ) || defined(CONFIG_MPC10X_BRIDGE )#define CPU_FTR_COMMON CPU_FTR_NEED_COHERENT#else #define CPU_FTR_COMMON 0
@@ -347,7 +346,7 @@ extern const char *powerpc_base_platform; CPU_FTR_SPEC7450 | CPU_FTR_NAP_DISABLE_L2_PR | \ CPU_FTR_PPC_LE | CPU_FTR_NEED_PAIRED_STWCX)#define CPU_FTRS_82XX (CPU_FTR_COMMON | \ - CPU_FTR_MAYBE_CAN_DOZE | CPU_FTR_USE_TB) + CPU_FTR_MAYBE_CAN_DOZE | CPU_FTR_USE_TB | CPU_FTR_NEED_COHERENT)#if defined(CONFIG_PPC_MPC52xx)#define CPU_FTRS_G2_LE (CPU_FTR_COMMON | CPU_FTR_MAYBE_CAN_DOZE | \
@@ -359,10 +358,10 @@ extern const char *powerpc_base_platform;#define CPU_FTRS_E300 (CPU_FTR_MAYBE_CAN_DOZE | \ CPU_FTR_USE_TB | CPU_FTR_MAYBE_CAN_NAP | \ - CPU_FTR_COMMON) + CPU_FTR_COMMON | CPU_FTR_NEED_COHERENT)#define CPU_FTRS_E300C2 (CPU_FTR_MAYBE_CAN_DOZE | \ CPU_FTR_USE_TB | CPU_FTR_MAYBE_CAN_NAP | \ - CPU_FTR_COMMON | CPU_FTR_FPU_UNAVAILABLE) + CPU_FTR_COMMON | CPU_FTR_FPU_UNAVAILABLE | CPU_FTR_NEED_COHERENT)#define CPU_FTRS_CLASSIC32 (CPU_FTR_COMMON | CPU_FTR_USE_TB)#define CPU_FTRS_8XX (CPU_FTR_USE_TB)#define CPU_FTRS_40X (CPU_FTR_USE_TB | CPU_FTR_NODSISRALIGN | CPU_FTR_NOEXECUTE)
Quoted 6 lines
arch/powerpc/include/asm/cputable.h +0
-0
arch/powerpc/include/asm/cputable.h extern const char *powerpc_base_platform; · line 248
Quoted 9 lines
arch/powerpc/include/asm/cputable.h +1
-2@@ -242,8 +242,7 @@ extern const char *powerpc_base_platform;* 74[45]x and an MPC107 host bridge. Also 83xx and PowerQUICC II * require it for PCI "streaming/prefetch" to work properly. */ -#if defined(CONFIG_SMP ) || defined(CONFIG_MPC10X_BRIDGE ) \ - || defined(CONFIG_PPC_83xx) || defined(CONFIG_8260 ) +#if defined(CONFIG_SMP ) || defined(CONFIG_MPC10X_BRIDGE )#define CPU_FTR_COMMON CPU_FTR_NEED_COHERENT#else #define CPU_FTR_COMMON 0
Even the above sucks but at this stage, it's hard to do better. We really need to fix ppc32 so that the feature fixup is done -after- the platform probe, so that the platform gets a chance to stick in the bit when needed.
Ben.