aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/setup_64.c
diff options
context:
space:
mode:
authorMahesh Salgaonkar <mahesh@linux.vnet.ibm.com>2013-10-30 10:34:00 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-12-05 00:02:05 -0500
commit729b0f715371ce1e7636b4958fc45d6882442456 (patch)
tree10563ebf4b7536a781eef24ce2e09025f519d275 /arch/powerpc/kernel/setup_64.c
parentb14a7253cf999412e5a0dd39d58b0a42d19fd73a (diff)
powerpc/book3s: Introduce exclusive emergency stack for machine check exception.
This patch introduces exclusive emergency stack for machine check exception. We use emergency stack to handle machine check exception so that we can save MCE information (srr1, srr0, dar and dsisr) before turning on ME bit and be ready for re-entrancy. This helps us to prevent clobbering of MCE information in case of nested machine checks. The reason for using emergency stack over normal kernel stack is that the machine check might occur in the middle of setting up a stack frame which may result into improper use of kernel stack. Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com> Acked-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
-rw-r--r--arch/powerpc/kernel/setup_64.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 5760b9bea936..2232aff66059 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -540,7 +540,8 @@ static void __init exc_lvl_early_init(void)
540 540
541/* 541/*
542 * Stack space used when we detect a bad kernel stack pointer, and 542 * Stack space used when we detect a bad kernel stack pointer, and
543 * early in SMP boots before relocation is enabled. 543 * early in SMP boots before relocation is enabled. Exclusive emergency
544 * stack for machine checks.
544 */ 545 */
545static void __init emergency_stack_init(void) 546static void __init emergency_stack_init(void)
546{ 547{
@@ -563,6 +564,13 @@ static void __init emergency_stack_init(void)
563 sp = memblock_alloc_base(THREAD_SIZE, THREAD_SIZE, limit); 564 sp = memblock_alloc_base(THREAD_SIZE, THREAD_SIZE, limit);
564 sp += THREAD_SIZE; 565 sp += THREAD_SIZE;
565 paca[i].emergency_sp = __va(sp); 566 paca[i].emergency_sp = __va(sp);
567
568#ifdef CONFIG_PPC_BOOK3S_64
569 /* emergency stack for machine check exception handling. */
570 sp = memblock_alloc_base(THREAD_SIZE, THREAD_SIZE, limit);
571 sp += THREAD_SIZE;
572 paca[i].mc_emergency_sp = __va(sp);
573#endif
566 } 574 }
567} 575}
568 576