powerpc: Remaining 64-bit Book3E support
PATCH 20/20 powerpc: Remaining 64-bit Book3E support
This contains all the bits that didn't fit in previous patches :-) This includes the actual exception handlers assembly, the changes to the kernel entry, other misc bits and wiring it all up in Kconfig.
Signed-off-by Benjamin Herrenschmidt <[email protected]>
---
arch/powerpc/Kconfig | 2 arch/powerpc/include/asm/hw_irq.h | 5 arch/powerpc/include/asm/smp.h | 1 arch/powerpc/kernel/Makefile | 10 arch/powerpc/kernel/cputable.c | 27 + arch/powerpc/kernel/entry_64.S | 60 ++ arch/powerpc/kernel/exceptions-64e.S | 784 +++++++++++++++++++++++++++++++++ arch/powerpc/kernel/head_64.S | 68 ++ arch/powerpc/kernel/setup_64.c | 19 arch/powerpc/mm/Makefile | 1 arch/powerpc/platforms/Kconfig.cputype | 38 + arch/powerpc/xmon/xmon.c | 2 12 files changed, 993 insertions(+), 24 deletions(-)
arch/powerpc/kernel/Makefile +5 -5
@@ -33,10 +33,10 @@ obj-y := cputable.o ptrace.o syscalls obj-y += vdso32/ obj-$(CONFIG_PPC64) += setup_64.o sys_ppc32.o \ signal_64.o ptrace32.o \ - paca.o cpu_setup_ppc970.o \ - cpu_setup_pa6t.o \ - firmware.o nvram_64.o + paca.o nvram_64.o firmware.o +obj-$(CONFIG_PPC_BOOK3S_64) += cpu_setup_ppc970.o cpu_setup_pa6t.o obj64-$(CONFIG_RELOCATABLE) += reloc_64.o +obj-$(CONFIG_PPC_BOOK3E_64) += exceptions-64e.o obj-$(CONFIG_PPC64) += vdso64/ obj-$(CONFIG_ALTIVEC) += vecemu.o obj-$(CONFIG_PPC_970_NAP) += idle_power4.o
@@ -63,8 +63,8 @@ obj-$(CONFIG_MODULES) += module.o modul obj-$(CONFIG_44x) += cpu_setup_44x.o obj-$(CONFIG_FSL_BOOKE) += cpu_setup_fsl_booke.o dbell.o -extra-$(CONFIG_PPC_STD_MMU) := head_32.o -extra-$(CONFIG_PPC64) := head_64.o +extra-y := head_$(CONFIG_WORD_SIZE).o +extra-$(CONFIG_PPC_BOOK3E_32) := head_new_booke.o extra-$(CONFIG_40x) := head_40x.o extra-$(CONFIG_44x) := head_44x.o extra-$(CONFIG_FSL_BOOKE) := head_fsl_booke.o
arch/powerpc/kernel/exceptions-64e.S new file +784 -0
784 lines not on this page · raw message
arch/powerpc/kernel/head_64.S +63 -5
180 lines not on this page · raw message
arch/powerpc/kernel/entry_64.S +55 -5
179 lines not on this page · raw message
arch/powerpc/kernel/cputable.c +25 -2
@@ -93,7 +93,7 @@ extern void __restore_cpu_power7(void); PPC_FEATURE_BOOKE) static struct cpu_spec __initdata cpu_specs[] = { -#ifdef CONFIG_PPC64 +#ifdef CONFIG_PPC_BOOK3S_64 { /* Power3 */ .pvr_mask = 0xffff0000, .pvr_value = 0x00400000,
@@ -508,7 +508,30 @@ static struct cpu_spec __initdata cpu_sp .machine_check = machine_check_generic, .platform = "power4", } -#endif /* CONFIG_PPC64 */ +#endif /* CONFIG_PPC_BOOK3S_64 */ +#ifdef CONFIG_PPC_BOOK3E_64 + { /* This is a default entry to get going, to be replaced by + * a real one at some stage + */ +#define CPU_FTRS_BASE_BOOK3E (CPU_FTR_USE_TB | \ + CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_SMT | \ + CPU_FTR_NODSISRALIGN | CPU_FTR_NOEXECUTE) + .pvr_mask = 0x00000000, + .pvr_value = 0x00000000, + .cpu_name = "Book3E", + .cpu_features = CPU_FTRS_BASE_BOOK3E, + .cpu_user_features = COMMON_USER_PPC64, + .mmu_features = MMU_FTR_TYPE_3E | MMU_FTR_USE_TLBILX | + MMU_FTR_USE_TLBIVAX_BCAST | + MMU_FTR_LOCK_BCAST_INVAL, + .icache_bsize = 64, + .dcache_bsize = 64, + .num_pmcs = 0, + .machine_check = machine_check_generic, + .platform = "power6", + }, +#endif + #ifdef CONFIG_PPC32 #if CLASSIC_PPC { /* 601 */
arch/powerpc/mm/Makefile +1 -0
@@ -13,6 +13,7 @@ obj-y := fault.o mem.o pgtable.o gup. pgtable_$(CONFIG_WORD_SIZE).o obj-$(CONFIG_PPC_MMU_NOHASH) += mmu_context_nohash.o tlb_nohash.o \ tlb_nohash_low.o +obj-$(CONFIG_PPC_BOOK3E) += tlb_low_$(CONFIG_WORD_SIZE)e.o obj-$(CONFIG_PPC64) += mmap_64.o hash64-$(CONFIG_PPC_NATIVE) := hash_native_64.o obj-$(CONFIG_PPC_STD_MMU_64) += hash_utils_64.o \
arch/powerpc/kernel/setup_64.c +19 -0
@@ -454,6 +454,24 @@ static void __init irqstack_early_init(v#define irqstack_early_init ()#endif +#ifdef CONFIG_PPC_BOOK3E +static void __init exc_lvl_early_init (void ) +{ +unsigned int i; + +for_each_possible_cpu (i) { + critirq_ctx[i] = (struct thread_info *) +__va (lmb_alloc (THREAD_SIZE ,THREAD_SIZE )); + dbgirq_ctx[i] = (struct thread_info *) +__va (lmb_alloc (THREAD_SIZE ,THREAD_SIZE )); + mcheckirq_ctx[i] = (struct thread_info *) +__va (lmb_alloc (THREAD_SIZE ,THREAD_SIZE )); + } +} +#else +#define exc_lvl_early_init () +#endif +/* * Stack space used when we detect a bad kernel stack pointer, and * early in SMP boots before relocation is enabled.
@@ -513,6 +531,7 @@ void __init setup_arch(char **cmdline_p) init_mm.brk = klimit;irqstack_early_init (); +exc_lvl_early_init ();emergency_stack_init ();#ifdef CONFIG_PPC_STD_MMU_64
arch/powerpc/include/asm/hw_irq.h +5 -0
@@ -49,8 +49,13 @@ extern void iseries_handle_interrupts(vo#define raw_irqs_disabled () (local_get_flags() == 0)#define raw_irqs_disabled_flags (flags) ((flags) == 0) +#ifdef CONFIG_PPC_BOOK3E +#define __hard_irq_enable () __asm__ __volatile__("wrteei 1": : :"memory"); +#define __hard_irq_disable () __asm__ __volatile__("wrteei 0": : :"memory"); +#else #define __hard_irq_enable () __mtmsrd(mfmsr() | MSR_EE, 1)#define __hard_irq_disable () __mtmsrd(mfmsr() & ~MSR_EE, 1) +#endif #define hard_irq_disable () \ do { \
arch/powerpc/xmon/xmon.c +1 -1
@@ -2570,7 +2570,7 @@ static void xmon_print_symbol(unsigned lprintf ("%s" , after); } -#ifdef CONFIG_PPC64 +#ifdef CONFIG_PPC_BOOK3S_64 static void dump_slb (void ) {int i;
arch/powerpc/platforms/Kconfig.cputype +33 -5
@@ -57,15 +57,35 @@ config E200 endchoice -config PPC_BOOK3S_64 - def_bool y +choice + prompt "Processor Type" depends on PPC64 + help + There are two families of 64 bit PowerPC chips supported. + The most common ones are the desktop and server CPUs + (POWER3, RS64, POWER4, POWER5, POWER5+, POWER6, ...) + + The other are the "embedded" processors compliant with the + "Book 3E" variant of the architecture + +config PPC_BOOK3S_64 + bool "Server processors" select PPC_FPU +config PPC_BOOK3E_64 + bool "Embedded processors" + select PPC_FPU # Make it a choice ? + +endchoice + config PPC_BOOK3S def_bool y depends on PPC_BOOK3S_32 || PPC_BOOK3S_64 +config PPC_BOOK3E + def_bool y + depends on PPC_BOOK3E_64 + config POWER4_ONLY bool "Optimize for POWER4" depends on PPC64 && PPC_BOOK3S
@@ -125,7 +145,7 @@ config 4xx config BOOKE bool - depends on E200 || E500 || 44x + depends on E200 || E500 || 44x || PPC_BOOK3E default y config FSL_BOOKE
@@ -223,9 +243,17 @@ config PPC_MMU_NOHASH def_bool y depends on !PPC_STD_MMU +config PPC_MMU_NOHASH_32 + def_bool y + depends on PPC_MMU_NOHASH && PPC32 + +config PPC_MMU_NOHASH_64 + def_bool y + depends on PPC_MMU_NOHASH && PPC64 + config PPC_BOOK3E_MMU def_bool y - depends on FSL_BOOKE + depends on FSL_BOOKE || PPC_BOOK3E config PPC_MM_SLICES bool
@@ -257,7 +285,7 @@ config PPC_PERF_CTRS This enables the powerpc-specific perf_counter back-end. config SMP - depends on PPC_STD_MMU || FSL_BOOKE + depends on PPC_BOOK3S || PPC_BOOK3E || FSL_BOOKE bool "Symmetric multi-processing support" ---help--- This enables support for systems with more than one CPU. If you have
arch/powerpc/include/asm/smp.h +1 -0
@@ -149,6 +149,7 @@ extern void arch_send_call_function_singextern void arch_send_call_function_ipi (cpumask_t mask);#ifdef CONFIG_PPC64 +extern void generic_secondary_thread_init (void );extern void generic_secondary_smp_init (void );extern unsigned long __secondary_hold_spinloop;#endif /* CONFIG_PPC64 */
arch/powerpc/Kconfig +1 -1
@@ -472,7 +472,7 @@ config PPC_16K_PAGES bool "16k page size" if 44x config PPC_64K_PAGES - bool "64k page size" if 44x || PPC_STD_MMU_64 + bool "64k page size" if 44x || PPC_STD_MMU_64 || PPC_BOOK3E_64 select PPC_HAS_HASH_64K if PPC_STD_MMU_64 config PPC_256K_PAGES