Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a14c4508 authored by Josh Boyer's avatar Josh Boyer Committed by Paul Mackerras
Browse files

[POWERPC] Fix PowerPC 750CL and 750GX CPU features 



PowerPC 750CL has high BATs.  The patch below adds a CPU_FTRS_750CL that
includes that.  Without it, the original firmware mappings in the high BATs
aren't cleared which continue to override the linux translations.

It also adds CPU_FTR_COMMON to CPU_FTRS_750GX for completeness.

Signed-off-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent c3ea6921

arch/powerpc/kernel/cputable.c

+2 −2
Original line number Diff line number Diff line
@@ -562,12 +562,12 @@ static struct cpu_spec cpu_specs[] = { 
		.pvr_mask		= 0xfffff0f0,

		.pvr_value		= 0x00087010,

		.cpu_name		= "750CL",

		.cpu_features		= CPU_FTRS_750,

		.cpu_features		= CPU_FTRS_750CL,

		.cpu_user_features	= COMMON_USER | PPC_FEATURE_PPC_LE,

		.icache_bsize		= 32,

		.dcache_bsize		= 32,

		.num_pmcs		= 4,

		.cpu_setup		= __setup_cpu_750cx,

		.cpu_setup		= __setup_cpu_750,

		.platform		= "ppc750",

	},

	{	/* 745/755 */

include/asm-powerpc/cputable.h

+7 −3
Original line number Diff line number Diff line
@@ -223,6 +223,10 @@ extern void do_feature_fixups(unsigned long value, void *fixup_start, 
	    CPU_FTR_MAYBE_CAN_DOZE | CPU_FTR_USE_TB | CPU_FTR_L2CR | \

	    CPU_FTR_TAU | CPU_FTR_HPTE_TABLE | CPU_FTR_MAYBE_CAN_NAP | \

	    CPU_FTR_PPC_LE)

#define CPU_FTRS_750CL	(CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | \

	    CPU_FTR_MAYBE_CAN_DOZE | CPU_FTR_USE_TB | CPU_FTR_L2CR | \

	    CPU_FTR_TAU | CPU_FTR_HPTE_TABLE | CPU_FTR_MAYBE_CAN_NAP | \

	    CPU_FTR_HAS_HIGH_BATS | CPU_FTR_PPC_LE)

#define CPU_FTRS_750FX1	(CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | \

	    CPU_FTR_MAYBE_CAN_DOZE | CPU_FTR_USE_TB | CPU_FTR_L2CR | \

	    CPU_FTR_TAU | CPU_FTR_HPTE_TABLE | CPU_FTR_MAYBE_CAN_NAP | \
@@ -235,9 +239,9 @@ extern void do_feature_fixups(unsigned long value, void *fixup_start, 
	    CPU_FTR_MAYBE_CAN_DOZE | CPU_FTR_USE_TB | CPU_FTR_L2CR | \

	    CPU_FTR_TAU | CPU_FTR_HPTE_TABLE | CPU_FTR_MAYBE_CAN_NAP | \

	    CPU_FTR_DUAL_PLL_750FX | CPU_FTR_HAS_HIGH_BATS | CPU_FTR_PPC_LE)

#define CPU_FTRS_750GX	(CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_MAYBE_CAN_DOZE | \

	    CPU_FTR_USE_TB | CPU_FTR_L2CR | CPU_FTR_TAU | \

	    CPU_FTR_HPTE_TABLE | CPU_FTR_MAYBE_CAN_NAP | \

#define CPU_FTRS_750GX	(CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | \

	    CPU_FTR_MAYBE_CAN_DOZE | CPU_FTR_USE_TB | CPU_FTR_L2CR | \

	    CPU_FTR_TAU | CPU_FTR_HPTE_TABLE | CPU_FTR_MAYBE_CAN_NAP | \

	    CPU_FTR_DUAL_PLL_750FX | CPU_FTR_HAS_HIGH_BATS | CPU_FTR_PPC_LE)

#define CPU_FTRS_7400_NOTAU	(CPU_FTR_COMMON | CPU_FTR_SPLIT_ID_CACHE | \

	    CPU_FTR_MAYBE_CAN_DOZE | CPU_FTR_USE_TB | CPU_FTR_L2CR | \