[07/13] powerpc/book3e: Use set_irq_regs() in the msgsnd/msgrcv IPI path

Message ID 1278656215-24705-7-git-send-email-benh@kernel.crashing.org
State Accepted, archived
Commit 0e37d25950f4fd5a7d74723e6ce608aaa972d24c
Headers show

Commit Message

Benjamin Herrenschmidt July 9, 2010, 6:16 a.m.
From: David Gibson <david@gibson.dropbear.id.au>

include/asm-generic/irq_regs.h declares per-cpu irq_regs variables and
get_irq_regs() and set_irq_regs() helper functions to maintain them.
These can be used to access the proper pt_regs structure related to the
current interrupt entry (if any).

In the powerpc arch code, this is used to maintain irq regs on
decrementer and external interrupt exceptions.  However, for the
doorbell exceptions used by the msgsnd/msgrcv IPI mechanism of newer
BookE CPUs, the irq_regs are not kept up to date.

In particular this means that xmon will not work properly on SMP,
because the secondary xmon instances started by IPI will blow up when
they cannot retrieve the irq regs.

This patch fixes the problem by adding calls to maintain the irq regs
across doorbell exceptions.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 arch/powerpc/kernel/dbell.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


diff --git a/arch/powerpc/kernel/dbell.c b/arch/powerpc/kernel/dbell.c
index 1c7a945..f7b5188 100644
--- a/arch/powerpc/kernel/dbell.c
+++ b/arch/powerpc/kernel/dbell.c
@@ -16,6 +16,7 @@ 
 #include <linux/percpu.h>
 #include <asm/dbell.h>
+#include <asm/irq_regs.h>
 #ifdef CONFIG_SMP
 struct doorbell_cpu_info {
@@ -63,17 +64,21 @@  void doorbell_message_pass(int target, int msg)
 void doorbell_exception(struct pt_regs *regs)
+	struct pt_regs *old_regs = set_irq_regs(regs);
 	struct doorbell_cpu_info *info = &__get_cpu_var(doorbell_cpu_info);
 	int msg;
 	/* Warning: regs can be NULL when called from irq enable */
 	if (!info->messages || (num_online_cpus() < 2))
-		return;
+		goto out;
 	for (msg = 0; msg < 4; msg++)
 		if (test_and_clear_bit(msg, &info->messages))
+	set_irq_regs(old_regs);
 #else /* CONFIG_SMP */