4 files changed, 30 insertions, 4 deletions

diff --git a/arch/powerpc/include/asm/xics.h b/arch/powerpc/include/asm/xics.h
index 282d43a0c855..0d050ea37a04 100644
--- a/arch/powerpc/include/asm/xics.h
+++ b/arch/powerpc/include/asm/xics.h
@@ -29,6 +29,7 @@
 /* Native ICP */
 #ifdef CONFIG_PPC_ICP_NATIVE
 extern int icp_native_init(void);
+extern void icp_native_flush_interrupt(void);
 #else
 static inline int icp_native_init(void) { return -ENODEV; }
 #endif
diff --git a/arch/powerpc/kernel/idle_power7.S b/arch/powerpc/kernel/idle_power7.S
index be05841396cf..c0754bbf8118 100644
--- a/arch/powerpc/kernel/idle_power7.S
+++ b/arch/powerpc/kernel/idle_power7.S
@@ -73,7 +73,7 @@ _GLOBAL(power7_powersave_common)
 
         /* Check if something happened while soft-disabled */
         lbz     r0,PACAIRQHAPPENED(r13)
-        cmpwi   cr0,r0,0
+        andi.   r0,r0,~PACA_IRQ_HARD_DIS@l
         beq     1f
         cmpwi   cr0,r4,0
         beq     1f
diff --git a/arch/powerpc/platforms/powernv/smp.c b/arch/powerpc/platforms/powernv/smp.c
index b73adc573031..4753958cd509 100644
--- a/arch/powerpc/platforms/powernv/smp.c
+++ b/arch/powerpc/platforms/powernv/smp.c
@@ -168,9 +168,9 @@ static void pnv_smp_cpu_kill_self(void)
                 power7_nap(1);
                 ppc64_runlatch_on();
 
-                /* Reenable IRQs briefly to clear the IPI that woke us */
-                local_irq_enable();
-                local_irq_disable();
+                /* Clear the IPI that woke us up */
+                icp_native_flush_interrupt();
+                local_paca->irq_happened &= PACA_IRQ_HARD_DIS;
                 mb();
 
                 if (cpu_core_split_required())
diff --git a/arch/powerpc/sysdev/xics/icp-native.c b/arch/powerpc/sysdev/xics/icp-native.c
index de8d9483bbe8..2fc4cf1b7557 100644
--- a/arch/powerpc/sysdev/xics/icp-native.c
+++ b/arch/powerpc/sysdev/xics/icp-native.c
@@ -155,6 +155,31 @@ static void icp_native_cause_ipi(int cpu, unsigned long data)
                 icp_native_set_qirr(cpu, IPI_PRIORITY);
 }
 
+/*
+ * Called when an interrupt is received on an off-line CPU to
+ * clear the interrupt, so that the CPU can go back to nap mode.
+ */
+void icp_native_flush_interrupt(void)
+{
+        unsigned int xirr = icp_native_get_xirr();
+        unsigned int vec = xirr & 0x00ffffff;
+
+        if (vec == XICS_IRQ_SPURIOUS)
+                return;
+        if (vec == XICS_IPI) {
+                /* Clear pending IPI */
+                int cpu = smp_processor_id();
+                kvmppc_set_host_ipi(cpu, 0);
+                icp_native_set_qirr(cpu, 0xff);
+        } else {
+                pr_err("XICS: hw interrupt 0x%x to offline cpu, disabling\n",
+                       vec);
+                xics_mask_unknown_vec(vec);
+        }
+        /* EOI the interrupt */
+        icp_native_set_xirr(xirr);
+}
+
 void xics_wake_cpu(int cpu)
 {
         icp_native_set_qirr(cpu, IPI_PRIORITY);