| Message ID | 1286975832-31895-1-git-send-email-galak@kernel.crashing.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Kumar Gala |
| Headers | show |
On Wed, 13 Oct 2010 08:17:11 -0500 Kumar Gala <galak@kernel.crashing.org> wrote: > The new e5500 core is similar to the e500mc core but adds 64-bit > support. We support running it in 32-bit mode as it is identical to the > e500mc. > > Signed-off-by: Kumar Gala <galak@kernel.crashing.org> > --- > * clean up kconfig further to reduce use of E500MC Looks better, just a few nits: > -#ifdef CONFIG_E500 > +#if defined(CONFIG_E500) || defined(CONFIG_PPC_BOOK3E_64) > /* All e500 */ > #define MCSR_MCP 0x80000000UL /* Machine Check Input Pin */ > #define MCSR_ICPERR 0x40000000UL /* I-Cache Parity Error */ Is this really supposed to be here for all 64-bit book3e? Likewise in the C code. > +obj-$(CONFIG_PPC_BOOK3E_64) += cpu_setup_fsl_booke.o CONFIG_PPC_FSL_BOOK3E? > @@ -66,6 +66,10 @@ extern void __restore_cpu_ppc970(void); > extern void __setup_cpu_power7(unsigned long offset, struct cpu_spec* spec); > extern void __restore_cpu_power7(void); > #endif /* CONFIG_PPC64 */ > +#if defined(CONFIG_PPC_BOOK3E_64) || defined(CONFIG_E500) > +extern void __setup_cpu_e5500(unsigned long offset, struct cpu_spec* spec); > +extern void __restore_cpu_e5500(void); > +#endif /* CONFIG_PPC_BOOK3E_64 || CONFIG_E500 */ CONFIG_E500 should be sufficient. Not sure why these need to be ifdeffed at all, though it seems to be existing practice here. > /* This table only contains "desktop" CPUs, it need to be filled with embedded > * ones as well... > @@ -1891,7 +1895,28 @@ static struct cpu_spec __initdata cpu_specs[] = { > .platform = "ppc5554", > } > #endif /* CONFIG_E200 */ > -#ifdef CONFIG_E500 > +#endif /* CONFIG_PPC32 */ > +#if defined(CONFIG_PPC_BOOK3E_64) || defined(CONFIG_E500) Just E500 should work. > @@ -538,6 +538,11 @@ int machine_check_e500(struct pt_regs *regs) > > return 0; > } > + > +int machine_check_generic(struct pt_regs *regs) > +{ > + return 0; > +} Hmm, it seems that either the cputable entry that references this should not be built in if we don't support those chips, or the real implementation shouldn't be under an #else if we are going to support multiplatform coexistence with them. -Scott
On Oct 13, 2010, at 10:58 AM, Scott Wood wrote: > On Wed, 13 Oct 2010 08:17:11 -0500 > Kumar Gala <galak@kernel.crashing.org> wrote: > >> The new e5500 core is similar to the e500mc core but adds 64-bit >> support. We support running it in 32-bit mode as it is identical to the >> e500mc. >> >> Signed-off-by: Kumar Gala <galak@kernel.crashing.org> >> --- >> * clean up kconfig further to reduce use of E500MC > > Looks better, just a few nits: > >> -#ifdef CONFIG_E500 >> +#if defined(CONFIG_E500) || defined(CONFIG_PPC_BOOK3E_64) >> /* All e500 */ >> #define MCSR_MCP 0x80000000UL /* Machine Check Input Pin */ >> #define MCSR_ICPERR 0x40000000UL /* I-Cache Parity Error */ > > Is this really supposed to be here for all 64-bit book3e? Likewise in > the C code. This is a question I need to ask BenH about. If we intend or desire to have a single kernel image that works on all 64-bit book3e parts or not. > >> +obj-$(CONFIG_PPC_BOOK3E_64) += cpu_setup_fsl_booke.o > > CONFIG_PPC_FSL_BOOK3E? will fix. >> @@ -66,6 +66,10 @@ extern void __restore_cpu_ppc970(void); >> extern void __setup_cpu_power7(unsigned long offset, struct cpu_spec* spec); >> extern void __restore_cpu_power7(void); >> #endif /* CONFIG_PPC64 */ >> +#if defined(CONFIG_PPC_BOOK3E_64) || defined(CONFIG_E500) >> +extern void __setup_cpu_e5500(unsigned long offset, struct cpu_spec* spec); >> +extern void __restore_cpu_e5500(void); >> +#endif /* CONFIG_PPC_BOOK3E_64 || CONFIG_E500 */ > > CONFIG_E500 should be sufficient. Not sure why these need to be > ifdeffed at all, though it seems to be existing practice here. again, about if we want a generic ppc64e build or not, but I'm now thinking that would end up setting CONFIG_E500 anyways. >> /* This table only contains "desktop" CPUs, it need to be filled with embedded >> * ones as well... >> @@ -1891,7 +1895,28 @@ static struct cpu_spec __initdata cpu_specs[] = { >> .platform = "ppc5554", >> } >> #endif /* CONFIG_E200 */ >> -#ifdef CONFIG_E500 >> +#endif /* CONFIG_PPC32 */ >> +#if defined(CONFIG_PPC_BOOK3E_64) || defined(CONFIG_E500) > > Just E500 should work. > >> @@ -538,6 +538,11 @@ int machine_check_e500(struct pt_regs *regs) >> >> return 0; >> } >> + >> +int machine_check_generic(struct pt_regs *regs) >> +{ >> + return 0; >> +} > > Hmm, it seems that either the cputable entry that references this > should not be built in if we don't support those chips, or the real > implementation shouldn't be under an #else if we are going to support > multiplatform coexistence with them. - k
diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h index 667a498..3a2eaba 100644 --- a/arch/powerpc/include/asm/reg_booke.h +++ b/arch/powerpc/include/asm/reg_booke.h @@ -203,7 +203,7 @@ #define PPC47x_MCSR_FPR 0x00800000 /* FPR parity error */ #define PPC47x_MCSR_IPR 0x00400000 /* Imprecise Machine Check Exception */ -#ifdef CONFIG_E500 +#if defined(CONFIG_E500) || defined(CONFIG_PPC_BOOK3E_64) /* All e500 */ #define MCSR_MCP 0x80000000UL /* Machine Check Input Pin */ #define MCSR_ICPERR 0x40000000UL /* I-Cache Parity Error */ diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 1dda701..5175d1e 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -36,6 +36,7 @@ obj-$(CONFIG_PPC64) += setup_64.o sys_ppc32.o \ paca.o nvram_64.o firmware.o obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o obj-$(CONFIG_PPC_BOOK3S_64) += cpu_setup_ppc970.o cpu_setup_pa6t.o +obj-$(CONFIG_PPC_BOOK3E_64) += cpu_setup_fsl_booke.o obj64-$(CONFIG_RELOCATABLE) += reloc_64.o obj-$(CONFIG_PPC_BOOK3E_64) += exceptions-64e.o idle_book3e.o obj-$(CONFIG_PPC64) += vdso64/ @@ -55,7 +56,9 @@ obj-$(CONFIG_IBMVIO) += vio.o obj-$(CONFIG_IBMEBUS) += ibmebus.o obj-$(CONFIG_GENERIC_TBSYNC) += smp-tbsync.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o +ifeq ($(CONFIG_PPC32),y) obj-$(CONFIG_E500) += idle_e500.o +endif obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o obj-$(CONFIG_TAU) += tau_6xx.o obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S index 0adb50a..894e64f 100644 --- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S +++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S @@ -51,6 +51,7 @@ _GLOBAL(__e500_dcache_setup) isync blr +#ifdef CONFIG_PPC32 _GLOBAL(__setup_cpu_e200) /* enable dedicated debug exception handling resources (Debug APU) */ mfspr r3,SPRN_HID0 @@ -72,3 +73,17 @@ _GLOBAL(__setup_cpu_e500mc) bl __setup_e500mc_ivors mtlr r4 blr +#endif +/* Right now, restore and setup are the same thing */ +_GLOBAL(__restore_cpu_e5500) +_GLOBAL(__setup_cpu_e5500) + mflr r4 + bl __e500_icache_setup + bl __e500_dcache_setup +#ifdef CONFIG_PPC_BOOK3E_64 + bl .__setup_base_ivors +#else + bl __setup_e500mc_ivors +#endif + mtlr r4 + blr diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 1f9123f..236aa73 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c @@ -66,6 +66,10 @@ extern void __restore_cpu_ppc970(void); extern void __setup_cpu_power7(unsigned long offset, struct cpu_spec* spec); extern void __restore_cpu_power7(void); #endif /* CONFIG_PPC64 */ +#if defined(CONFIG_PPC_BOOK3E_64) || defined(CONFIG_E500) +extern void __setup_cpu_e5500(unsigned long offset, struct cpu_spec* spec); +extern void __restore_cpu_e5500(void); +#endif /* CONFIG_PPC_BOOK3E_64 || CONFIG_E500 */ /* This table only contains "desktop" CPUs, it need to be filled with embedded * ones as well... @@ -1891,7 +1895,28 @@ static struct cpu_spec __initdata cpu_specs[] = { .platform = "ppc5554", } #endif /* CONFIG_E200 */ -#ifdef CONFIG_E500 +#endif /* CONFIG_PPC32 */ +#if defined(CONFIG_PPC_BOOK3E_64) || defined(CONFIG_E500) + { /* e5500 */ + .pvr_mask = 0xffff0000, + .pvr_value = 0x80240000, + .cpu_name = "e5500", + .cpu_features = CPU_FTRS_E500MC, + .cpu_user_features = COMMON_USER_BOOKE, + .mmu_features = MMU_FTR_TYPE_FSL_E | MMU_FTR_BIG_PHYS | + MMU_FTR_USE_TLBILX, + .icache_bsize = 64, + .dcache_bsize = 64, + .num_pmcs = 4, + .oprofile_cpu_type = "ppc/e500mc", + .oprofile_type = PPC_OPROFILE_FSL_EMB, + .cpu_setup = __setup_cpu_e5500, + .cpu_restore = __restore_cpu_e5500, + .machine_check = machine_check_e500mc, + .platform = "ppce5500", + }, +#endif +#if defined(CONFIG_PPC32) & defined(CONFIG_E500) { /* e500 */ .pvr_mask = 0xffff0000, .pvr_value = 0x80200000, @@ -1961,7 +1986,6 @@ static struct cpu_spec __initdata cpu_specs[] = { .platform = "powerpc", } #endif /* CONFIG_E500 */ -#endif /* CONFIG_PPC32 */ #ifdef CONFIG_PPC_BOOK3E_64 { /* This is a default entry to get going, to be replaced by diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index a45a63c..5e0985f 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -418,7 +418,7 @@ int machine_check_47x(struct pt_regs *regs) return 0; } -#elif defined(CONFIG_E500) +#elif defined(CONFIG_E500) || defined(CONFIG_PPC_BOOK3E_64) int machine_check_e500mc(struct pt_regs *regs) { unsigned long mcsr = mfspr(SPRN_MCSR); @@ -538,6 +538,11 @@ int machine_check_e500(struct pt_regs *regs) return 0; } + +int machine_check_generic(struct pt_regs *regs) +{ + return 0; +} #elif defined(CONFIG_E200) int machine_check_e200(struct pt_regs *regs) { diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index 5bde1f2..ae25527 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig @@ -11,6 +11,8 @@ menuconfig FSL_SOC_BOOKE if FSL_SOC_BOOKE +if PPC32 + config MPC8540_ADS bool "Freescale MPC8540 ADS" select DEFAULT_UIMAGE @@ -177,6 +179,8 @@ config P4080_DS help This option enables support for the P4080 DS board +endif # PPC32 + endif # FSL_SOC_BOOKE config TQM85xx diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index d361f81..b946223 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -129,8 +129,8 @@ config E500 config PPC_E500MC bool "e500mc Support" - select PPC_FPU depends on E500 + select PPC_FPU config PPC_FPU bool @@ -166,9 +166,14 @@ config BOOKE config FSL_BOOKE bool - depends on E200 || E500 + depends on (E200 || E500) && PPC32 default y +# this is for common code between PPC32 & PPC64 FSL BOOKE +config PPC_FSL_BOOK3E + bool + select FSL_EMB_PERFMON + default y if FSL_BOOKE config PTE_64BIT bool
The new e5500 core is similar to the e500mc core but adds 64-bit support. We support running it in 32-bit mode as it is identical to the e500mc. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- * clean up kconfig further to reduce use of E500MC arch/powerpc/include/asm/reg_booke.h | 2 +- arch/powerpc/kernel/Makefile | 3 +++ arch/powerpc/kernel/cpu_setup_fsl_booke.S | 15 +++++++++++++++ arch/powerpc/kernel/cputable.c | 28 ++++++++++++++++++++++++++-- arch/powerpc/kernel/traps.c | 7 ++++++- arch/powerpc/platforms/85xx/Kconfig | 4 ++++ arch/powerpc/platforms/Kconfig.cputype | 9 +++++++-- 7 files changed, 62 insertions(+), 6 deletions(-)