From 0f53328c34579cbf3aae2230e2469611eff1f48b Mon Sep 17 00:00:00 2001
From: Matthew McClintock <msm@freescale.com>
Date: Thu, 16 Sep 2010 17:58:23 -0500
Subject: [PATCH] --- yaml --- r: 212879 b: refs/heads/master c:
 c71635d288ffd3bcdfb30308f681f9af34f0fc81 h: refs/heads/master i:   212877:
 be97d7720ede21f87f93f3d3caadf1f898ddb39f   212875:
 a8155e37431e710f0bc0274beb10c2013abbd0b9   212871:
 9ebe54a3f6cd0cf65ea77a64cae0bb05d616ef65   212863:
 b277bf504bfe0c2b0dd3d764f8d3af413fd4eebb v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/powerpc/include/asm/kexec.h       |  1 +
 trunk/arch/powerpc/kernel/crash.c            | 13 +----------
 trunk/arch/powerpc/kernel/machine_kexec.c    | 24 ++++++++++++++++++++
 trunk/arch/powerpc/kernel/machine_kexec_32.c |  4 ++++
 5 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 052c7c890caf..f7df59000eee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbdd7144ceadd578bc2a875af1dabd67e80ba0d0
+refs/heads/master: c71635d288ffd3bcdfb30308f681f9af34f0fc81
diff --git a/trunk/arch/powerpc/include/asm/kexec.h b/trunk/arch/powerpc/include/asm/kexec.h
index 076327f2eff7..f54408d995b5 100644
--- a/trunk/arch/powerpc/include/asm/kexec.h
+++ b/trunk/arch/powerpc/include/asm/kexec.h
@@ -91,6 +91,7 @@ extern void machine_kexec_simple(struct kimage *image);
 extern void crash_kexec_secondary(struct pt_regs *regs);
 extern int overlaps_crashkernel(unsigned long start, unsigned long size);
 extern void reserve_crashkernel(void);
+extern void machine_kexec_mask_interrupts(void);
 
 #else /* !CONFIG_KEXEC */
 static inline int kexec_sr_activated(int cpu) { return 0; }
diff --git a/trunk/arch/powerpc/kernel/crash.c b/trunk/arch/powerpc/kernel/crash.c
index 4457382f8667..832c8c4db254 100644
--- a/trunk/arch/powerpc/kernel/crash.c
+++ b/trunk/arch/powerpc/kernel/crash.c
@@ -414,18 +414,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
 	crash_kexec_wait_realmode(crashing_cpu);
 #endif
 
-	for_each_irq(i) {
-		struct irq_desc *desc = irq_to_desc(i);
-
-		if (!desc || !desc->chip || !desc->chip->eoi)
-			continue;
-
-		if (desc->status & IRQ_INPROGRESS)
-			desc->chip->eoi(i);
-
-		if (!(desc->status & IRQ_DISABLED))
-			desc->chip->shutdown(i);
-	}
+	machine_kexec_mask_interrupts();
 
 	/*
 	 * Call registered shutdown routines savely.  Swap out
diff --git a/trunk/arch/powerpc/kernel/machine_kexec.c b/trunk/arch/powerpc/kernel/machine_kexec.c
index dd6c141f1662..df7e20c191cd 100644
--- a/trunk/arch/powerpc/kernel/machine_kexec.c
+++ b/trunk/arch/powerpc/kernel/machine_kexec.c
@@ -14,10 +14,34 @@
 #include <linux/threads.h>
 #include <linux/memblock.h>
 #include <linux/of.h>
+#include <linux/irq.h>
+
 #include <asm/machdep.h>
 #include <asm/prom.h>
 #include <asm/sections.h>
 
+void machine_kexec_mask_interrupts(void) {
+	unsigned int i;
+
+	for_each_irq(i) {
+		struct irq_desc *desc = irq_to_desc(i);
+
+		if (!desc || !desc->chip)
+			continue;
+
+		if (desc->chip->eoi &&
+		    desc->status & IRQ_INPROGRESS)
+			desc->chip->eoi(i);
+
+		if (desc->chip->mask)
+			desc->chip->mask(i);
+
+		if (desc->chip->disable &&
+		    !(desc->status & IRQ_DISABLED))
+			desc->chip->disable(i);
+	}
+}
+
 void machine_crash_shutdown(struct pt_regs *regs)
 {
 	if (ppc_md.machine_crash_shutdown)
diff --git a/trunk/arch/powerpc/kernel/machine_kexec_32.c b/trunk/arch/powerpc/kernel/machine_kexec_32.c
index ae63a964b858..e63f2e7d2efb 100644
--- a/trunk/arch/powerpc/kernel/machine_kexec_32.c
+++ b/trunk/arch/powerpc/kernel/machine_kexec_32.c
@@ -39,6 +39,10 @@ void default_machine_kexec(struct kimage *image)
 	/* Interrupts aren't acceptable while we reboot */
 	local_irq_disable();
 
+	/* mask each interrupt so we are in a more sane state for the
+	 * kexec kernel */
+	machine_kexec_mask_interrupts();
+
 	page_list = image->head;
 
 	/* we need both effective and real address here */