powerpc/book3e: support kexec and kdump
Subsystems (2)
v4 cover powerpc/book3e: support kexec and kdump
Ben,
I don't see any further comments, so could you merge this kindly?
This patchset is used to support kexec and kdump on book3e.
Tested on fsl-p5040 DS.
v4:
* rebase on next branch
v3:
* add one patch to rename interrupt_end_book3e with __end_interrupts then we can have a unique lable for book3e and book3s.
* add some comments for "book3e/kexec/kdump: enable kexec for kernel"
* clean "book3e/kexec/kdump: introduce a kexec kernel flag"
v2:
* rebase on merge branch
v1:
* improve some patch head
* rebase on next branch with patch 7
----------------------------------------------------------------
Tiejun Chen (8):
powerpc/book3e: rename interrupt_end_book3e with __end_interrupts powerpc/book3e: support CONFIG_RELOCATABLE book3e/kexec/kdump: enable kexec for kernel book3e/kexec/kdump: create a 1:1 TLB mapping book3e/kexec/kdump: introduce a kexec kernel flag book3e/kexec/kdump: implement ppc64 kexec specfic book3e/kexec/kdump: redefine VIRT_PHYS_OFFSET book3e/kexec/kdump: recover "r4 = 0" to create the initial TLB
arch/powerpc/Kconfig | 2 +- arch/powerpc/include/asm/exception-64e.h | 11 +++ arch/powerpc/include/asm/page.h | 2 + arch/powerpc/include/asm/smp.h | 1 + arch/powerpc/kernel/exceptions-64e.S | 26 +++++- arch/powerpc/kernel/head_64.S | 48 +++++++++- arch/powerpc/kernel/machine_kexec_64.c | 148 +++++++++++++++++------------- arch/powerpc/kernel/misc_64.S | 67 +++++++++++++- arch/powerpc/platforms/85xx/smp.c | 33 ++++++- 9 files changed, 257 insertions(+), 81 deletions(-)
Tiejun
PATCH v4 1/8 powerpc/book3e: rename interrupt_end_book3e with __end_interrupts
We can rename 'interrupt_end_book3e' with '__end_interrupts' then book3s/book3e can share this unique label to make sure we can use this conveniently.
--- arch/powerpc/kernel/exceptions-64e.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/kernel/exceptions-64e.S +4 -4
@@ -309,8 +309,8 @@ interrupt_base_book3e: /* fake trap */ EXCEPTION_STUB(0x300, hypercall) EXCEPTION_STUB(0x320, ehpriv) - .globl interrupt_end_book3e -interrupt_end_book3e: + .globl __end_interrupts +__end_interrupts: /* Critical Input Interrupt */ START_EXCEPTION(critical_input);
@@ -493,7 +493,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) beq+ 1f LOAD_REG_IMMEDIATE(r14,interrupt_base_book3e) - LOAD_REG_IMMEDIATE(r15,interrupt_end_book3e) + LOAD_REG_IMMEDIATE(r15,__end_interrupts) cmpld cr0,r10,r14 cmpld cr1,r10,r15 blt+ cr0,1f
@@ -559,7 +559,7 @@ kernel_dbg_exc: beq+ 1f LOAD_REG_IMMEDIATE(r14,interrupt_base_book3e) - LOAD_REG_IMMEDIATE(r15,interrupt_end_book3e) + LOAD_REG_IMMEDIATE(r15,__end_interrupts) cmpld cr0,r10,r14 cmpld cr1,r10,r15 blt+ cr0,1f
Signature · 1 line
1.7.9.5
PATCH v4 2/8 powerpc/book3e: support CONFIG_RELOCATABLE
In reply to Tiejun Chenbook3e is different with book3s since 3s includes the exception vectors code in head_64.S as it relies on absolute addressing which is only possible within this compilation unit. So we have to get that label address with got.
And when boot a relocated kernel, we should reset ipvr properly again after .relocate.
--- arch/powerpc/include/asm/exception-64e.h | 11 +++++++++++ arch/powerpc/kernel/exceptions-64e.S | 18 +++++++++++++++++- arch/powerpc/kernel/head_64.S | 25 +++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-)
arch/powerpc/include/asm/exception-64e.h +11 -0
@@ -214,10 +214,21 @@ exc_##label##_book3e:#define TLB_MISS_STATS_SAVE_INFO_BOLTED #endif +#ifndef CONFIG_RELOCATABLE #define SET_IVOR (vector_number, vector_offset) \ li r3,vector_offset@l; \ ori r3,r3,interrupt_base_book3e@l; \ mtspr SPRN_IVOR##vector_number,r3; +#else /* !CONFIG_RELOCATABLE */ +/* In relocatable case the value of the constant expression 'expr' is only +* offset. So instead, we should loads the address of label 'name'. +*/ +#define SET_IVOR (vector_number, vector_offset) \ + LOAD_REG_ADDR(r3,interrupt_base_book3e);\ + rlwinm r3,r3,0,15,0; \ + ori r3,r3,vector_offset@l; \ + mtspr SPRN_IVOR##vector_number,r3; +#endif /* CONFIG_RELOCATABLE */ #endif /* _ASM_POWERPC_EXCEPTION_64E_H */
arch/powerpc/kernel/exceptions-64e.S +17 -1
@@ -1097,7 +1097,15 @@ skpinv: addi r6,r6,1 /* Increment */ * r4 = MAS0 w/TLBSEL & ESEL for the temp mapping */ /* Now we branch the new virtual address mapped by this entry */ +#ifdef CONFIG_RELOCATABLE + /* We have to find out address from lr. */ + bl 1f /* Find our address */ +1: mflr r6 + addi r6,r6,(2f - 1b) + tovirt(r6,r6) +#else LOAD_REG_IMMEDIATE(r6,2f) +#endif lis r7,MSR_KERNEL@h ori r7,r7,MSR_KERNEL@l mtspr SPRN_SRR0,r6
@@ -1348,9 +1356,17 @@ _GLOBAL(book3e_secondary_thread_init) mflr r28 b 3b -_STATIC(init_core_book3e) +_GLOBAL(init_core_book3e) /* Establish the interrupt vector base */ +#ifdef CONFIG_RELOCATABLE +/* In relocatable case the value of the constant expression 'expr' is only + * offset. So instead, we should loads the address of label 'name'. + */ + tovirt(r2,r2) + LOAD_REG_ADDR(r3, interrupt_base_book3e) +#else LOAD_REG_IMMEDIATE(r3, interrupt_base_book3e) +#endif mtspr SPRN_IVPR,r3 sync blr
arch/powerpc/kernel/head_64.S +25 -0
@@ -414,12 +414,25 @@ _STATIC(__after_prom_start) /* process relocations for the final address of the kernel */ lis r25,PAGE_OFFSET@highest /* compute virtual base of kernel */ sldi r25,r25,32 +#if defined(CONFIG_PPC_BOOK3E) + tovirt(r26,r26) /* on booke, we already run at PAGE_OFFSET */ +#endif lwz r7,__run_at_load-_stext(r26) +#if defined(CONFIG_PPC_BOOK3E) + tophys(r26,r26) /* Restore for the remains. */ +#endif cmplwi cr0,r7,1 /* flagged to stay where we are ? */ bne 1f add r25,r25,r26 1: mr r3,r25 bl .relocate +#if defined(CONFIG_PPC_BOOK3E) + /* In relocatable case we always have to load the address of label 'name' + * to set IVPR. So after .relocate we have to update IVPR with current + * address of label. + */ + bl .init_core_book3e +#endif #endif /*
@@ -447,12 +460,24 @@ _STATIC(__after_prom_start) * variable __run_at_load, if it is set the kernel is treated as relocatable * kernel, otherwise it will be moved to PHYSICAL_START */ +#if defined(CONFIG_PPC_BOOK3E) + tovirt(r26,r26) /* on booke, we already run at PAGE_OFFSET */ +#endif lwz r7,__run_at_load-_stext(r26) +#if defined(CONFIG_PPC_BOOK3E) + tophys(r26,r26) /* Restore for the remains. */ +#endif cmplwi cr0,r7,1 bne 3f +#ifdef CONFIG_PPC_BOOK3E + LOAD_REG_ADDR(r5, __end_interrupts) + LOAD_REG_ADDR(r11, _stext) + sub r5,r5,r11 +#else /* just copy interrupts */ LOAD_REG_IMMEDIATE(r5, __end_interrupts - _stext) +#endif b 5f 3: #endif
Signature · 1 line
1.7.9.5
PATCH v4 3/8 book3e/kexec/kdump: enable kexec for kernel
In reply to Tiejun ChenWe need to active KEXEC for book3e and bypass or convert non-book3e stuff in kexec coverage.
--- arch/powerpc/Kconfig | 2 +- arch/powerpc/kernel/machine_kexec_64.c | 148 ++++++++++++++++++-------------- arch/powerpc/kernel/misc_64.S | 6 ++ 3 files changed, 89 insertions(+), 67 deletions(-)
arch/powerpc/Kconfig +1 -1
@@ -378,7 +378,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE config KEXEC bool "kexec system call" - depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP)) + depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP)) || PPC_BOOK3E help kexec is a system call that implements the ability to shutdown your current kernel, and to start another kernel. It is like a reboot
arch/powerpc/kernel/machine_kexec_64.c +82 -66
163 lines not on this page · raw message
arch/powerpc/kernel/misc_64.S +6 -0
@@ -563,9 +563,13 @@ _GLOBAL(kexec_sequence) lhz r25,PACAHWCPUID(r13) /* get our phys cpu from paca */ /* disable interrupts, we are overwriting kernel data next */ +#ifndef CONFIG_PPC_BOOK3E mfmsr r3 rlwinm r3,r3,0,17,15 mtmsrd r3,1 +#else + wrteei 0 +#endif /* copy dest pages, flush whole dest image */ mr r3,r29
@@ -587,10 +591,12 @@ _GLOBAL(kexec_sequence) li r6,1 stw r6,kexec_flag-1b(5) +#ifndef CONFIG_PPC_BOOK3E /* clear out hardware hash page table and tlb */ ld r5,0(r27) /* deref function descriptor */ mtctr r5 bctrl /* ppc_md.hpte_clear_all(void); */ +#endif /* * kexec image calling is:
Signature · 1 line
1.7.9.5
PATCH v4 4/8 book3e/kexec/kdump: create a 1:1 TLB mapping
In reply to Tiejun Chenbook3e have no real MMU mode so we have to create a 1:1 TLB mapping to make sure we can access the real physical address. And correct something to support this pseudo real mode on book3e.
--- arch/powerpc/kernel/head_64.S | 9 ++++--- arch/powerpc/kernel/misc_64.S | 55 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 4 deletions(-)
arch/powerpc/kernel/head_64.S +6 -3
@@ -447,12 +447,12 @@ _STATIC(__after_prom_start) tovirt(r3,r3) /* on booke, we already run at PAGE_OFFSET */ #endif mr. r4,r26 /* In some cases the loader may */ +#if defined(CONFIG_PPC_BOOK3E) + tovirt(r4,r4) +#endif beq 9f /* have already put us at zero */ li r6,0x100 /* Start offset, the first 0x100 */ /* bytes were copied earlier. */ -#ifdef CONFIG_PPC_BOOK3E - tovirt(r6,r6) /* on booke, we already run at PAGE_OFFSET */ -#endif #ifdef CONFIG_RELOCATABLE /*
@@ -495,6 +495,9 @@ _STATIC(__after_prom_start) p_end: .llong _end - _stext 4: /* Now copy the rest of the kernel up to _end */ +#if defined(CONFIG_PPC_BOOK3E) + tovirt(r26,r26) +#endif addis r5,r26,(p_end - _stext)@ha ld r5,(p_end - _stext)@l(r5) /* get _end */ 5: bl .copy_and_flush /* copy the rest */
arch/powerpc/kernel/misc_64.S +54 -1
85 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v4 5/8 book3e/kexec/kdump: introduce a kexec kernel flag
In reply to Tiejun ChenWe need to introduce a flag to indicate we're already running a kexec kernel then we can go proper path. For example, We shouldn't access spin_table from the bootloader to up any secondary cpu for kexec kernel, and kexec kernel already know how to jump to generic_secondary_smp_init.
--- arch/powerpc/include/asm/smp.h | 1 + arch/powerpc/kernel/head_64.S | 10 ++++++++++ arch/powerpc/kernel/misc_64.S | 6 ++++++ arch/powerpc/platforms/85xx/smp.c | 20 +++++++++++++++----- 4 files changed, 32 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/smp.h +1 -0
@@ -207,6 +207,7 @@ extern void generic_secondary_thread_init(void);extern unsigned long __secondary_hold_spinloop;extern unsigned long __secondary_hold_acknowledge;extern char __secondary_hold; +extern unsigned long __run_at_kexec;extern void __early_start (void );#endif /* __ASSEMBLY__ */
arch/powerpc/kernel/head_64.S +10 -0
@@ -89,6 +89,10 @@ __secondary_hold_spinloop: __secondary_hold_acknowledge: .llong 0x0 + .globl __run_at_kexec +__run_at_kexec: + .llong 0x0 /* Flag for the secondary kernel from kexec. */ + #ifdef CONFIG_RELOCATABLE /* This flag is set to 1 by a loader if the kernel should run * at the loaded address instead of the linked address. This
@@ -426,6 +430,7 @@ _STATIC(__after_prom_start) add r25,r25,r26 1: mr r3,r25 bl .relocate + #if defined(CONFIG_PPC_BOOK3E) /* In relocatable case we always have to load the address of label 'name' * to set IVPR. So after .relocate we have to update IVPR with current
@@ -463,6 +468,11 @@ _STATIC(__after_prom_start) #if defined(CONFIG_PPC_BOOK3E) tovirt(r26,r26) /* on booke, we already run at PAGE_OFFSET */ #endif +#if defined(CONFIG_KEXEC) || defined(CONFIG_CRASH_DUMP) + /* If relocated we need to restore this flag on that relocated address. */ + ld r7,__run_at_kexec-_stext(r3) + std r7,__run_at_kexec-_stext(r26) +#endif lwz r7,__run_at_load-_stext(r26) #if defined(CONFIG_PPC_BOOK3E) tophys(r26,r26) /* Restore for the remains. */
arch/powerpc/kernel/misc_64.S +6 -0
@@ -639,6 +639,12 @@ _GLOBAL(kexec_sequence) bl .copy_and_flush /* (dest, src, copy limit, start offset) */ 1: /* assume normal blr return */ + /* notify we're going into kexec kernel for SMP. */ + LOAD_REG_ADDR(r3,__run_at_kexec) + li r4,1 + std r4,0(r3) + sync + /* release other cpus to the new kernel secondary start at 0x60 */ mflr r5 li r6,1
arch/powerpc/platforms/85xx/smp.c +15 -5
@@ -150,6 +150,9 @@ static int smp_85xx_kick_cpu(int nr)int hw_cpu =get_hard_smp_processor_id (nr);int ioremappable;int ret =0 ; +#ifdef CONFIG_PPC64 +unsigned long *ptr =NULL ; +#endif WARN_ON (nr <0 || nr >=NR_CPUS );WARN_ON (hw_cpu <0 || hw_cpu >=NR_CPUS );
@@ -238,11 +241,18 @@ out:#else smp_generic_kick_cpu (nr); -flush_spin_table (spin_table); -out_be32 (&spin_table->pir, hw_cpu); -out_be64 ((u64 *)(&spin_table->addr_h), -__pa ((u64)*((unsigned long long *)generic_secondary_smp_init))); -flush_spin_table (spin_table); + ptr = (unsigned long *)((unsigned long )&__run_at_kexec); +/* We shouldn't access spin_table from the bootloader to up any +* secondary cpu for kexec kernel, and kexec kernel already +* know how to jump to generic_secondary_smp_init. +*/ +if (!*ptr) { +flush_spin_table (spin_table); +out_be32 (&spin_table->pir, hw_cpu); +out_be64 ((u64 *)(&spin_table->addr_h), +__pa ((u64)*((unsigned long long *)generic_secondary_smp_init))); +flush_spin_table (spin_table); + }#endif local_irq_restore (flags);
Signature · 1 line
1.7.9.5
PATCH v4 6/8 book3e/kexec/kdump: implement ppc64 kexec specfic
In reply to Tiejun Chenppc64 kexec mechanism has a different implementation with ppc32.
--- arch/powerpc/platforms/85xx/smp.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/powerpc/platforms/85xx/smp.c +13 -0
@@ -277,6 +277,7 @@ struct smp_ops_t smp_85xx_ops = { };#ifdef CONFIG_KEXEC +#ifdef CONFIG_PPC32 atomic_t kexec_down_cpus =ATOMIC_INIT (0 );void mpc85xx_smp_kexec_cpu_down (int crash_shutdown,int secondary)
@@ -295,6 +296,14 @@ static void mpc85xx_smp_kexec_down(void *arg)if (ppc_md.kexec_cpu_down) ppc_md.kexec_cpu_down(0,1); } +#else +void mpc85xx_smp_kexec_cpu_down (int crash_shutdown,int secondary) +{ +local_irq_disable (); +hard_irq_disable (); +mpic_teardown_this_cpu (secondary); +} +#endif static void map_and_flush (unsigned long paddr) {
@@ -346,11 +355,14 @@ static void mpc85xx_smp_flush_dcache_kexec(struct kimage *image)static void mpc85xx_smp_machine_kexec (struct kimage *image) { +#ifdef CONFIG_PPC32 int timeout =INT_MAX ;int i, num_cpus =num_present_cpus (); +#endif mpc85xx_smp_flush_dcache_kexec (image); +#ifdef CONFIG_PPC32 if (image->type ==KEXEC_TYPE_DEFAULT )smp_call_function (mpc85xx_smp_kexec_down,NULL ,0 );
@@ -368,6 +380,7 @@ static void mpc85xx_smp_machine_kexec(struct kimage *image)if ( i ==smp_processor_id () )continue ; mpic_reset_core(i); } +#endif default_machine_kexec (image); }
Signature · 1 line
1.7.9.5
PATCH v4 7/8 book3e/kexec/kdump: redefine VIRT_PHYS_OFFSET
In reply to Tiejun ChenBook3e is always aligned 1GB to create TLB so we should use (KERNELBASE - MEMORY_START) as VIRT_PHYS_OFFSET to get __pa/__va properly while boot kdump.
--- arch/powerpc/include/asm/page.h | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/include/asm/page.h +2 -0
@@ -112,6 +112,8 @@ extern long long virt_phys_offset;/* See Description below for VIRT_PHYS_OFFSET */ #ifdef CONFIG_RELOCATABLE_PPC32 #define VIRT_PHYS_OFFSET virt_phys_offset +#elif defined(CONFIG_PPC_BOOK3E_64 ) +#define VIRT_PHYS_OFFSET (KERNELBASE - MEMORY_START)#else #define VIRT_PHYS_OFFSET (KERNELBASE - PHYSICAL_START)#endif
Signature · 1 line
1.7.9.5
PATCH v4 8/8 book3e/kexec/kdump: recover "r4 = 0" to create the initial TLB
In reply to Tiejun ChenIn commit 96f013f, "powerpc/kexec: Add kexec "hold" support for Book3e processors", requires that GPR4 survive the "hold" process, for IBM Blue Gene/Q with with some very strange firmware. But for FSL Book3E, r4 = 1 to indicate that the initial TLB entry for this core already exists so we still should set r4 with 0 to create that initial TLB.
--- arch/powerpc/kernel/head_64.S | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/kernel/head_64.S +4 -0
@@ -127,6 +127,10 @@ __secondary_hold: /* Grab our physical cpu number */ mr r24,r3 /* stash r4 for book3e */ +#ifdef CONFIG_PPC_FSL_BOOK3E + /* we need to setup initial TLB entry. */ + li r4,0 +#endif mr r25,r4 /* Tell the master cpu we're here */
Signature · 1 line
1.7.9.5