From 49658fdb6cd3c2b0293121ce009dbde11e329bd9 Mon Sep 17 00:00:00 2001
From: Andre Detsch <adetsch@br.ibm.com>
Date: Wed, 4 Nov 2009 13:03:19 -0200
Subject: [PATCH] --- yaml --- r: 168272 b: refs/heads/master c:
 8435b027b87a78145992c37b0b8ed0f1b7761bf0 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/powerpc/platforms/pseries/msi.c  | 2 --
 trunk/arch/powerpc/platforms/pseries/xics.c | 9 +++++++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0a8b0e834d78..7021615a167c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 978d7eb31d44de34a7f71e04ed4158f3f854688d
+refs/heads/master: 8435b027b87a78145992c37b0b8ed0f1b7761bf0
diff --git a/trunk/arch/powerpc/platforms/pseries/msi.c b/trunk/arch/powerpc/platforms/pseries/msi.c
index bf2e1ac41308..1164c3430f2c 100644
--- a/trunk/arch/powerpc/platforms/pseries/msi.c
+++ b/trunk/arch/powerpc/platforms/pseries/msi.c
@@ -432,8 +432,6 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
 		/* Read config space back so we can restore after reset */
 		read_msi_msg(virq, &msg);
 		entry->msg = msg;
-
-		unmask_msi_irq(virq);
 	}
 
 	return 0;
diff --git a/trunk/arch/powerpc/platforms/pseries/xics.c b/trunk/arch/powerpc/platforms/pseries/xics.c
index 419f8a637ffe..b9bf0eedccf2 100644
--- a/trunk/arch/powerpc/platforms/pseries/xics.c
+++ b/trunk/arch/powerpc/platforms/pseries/xics.c
@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <linux/radix-tree.h>
 #include <linux/cpu.h>
+#include <linux/msi.h>
 #include <linux/of.h>
 
 #include <asm/firmware.h>
@@ -219,6 +220,14 @@ static void xics_unmask_irq(unsigned int virq)
 
 static unsigned int xics_startup(unsigned int virq)
 {
+	/*
+	 * The generic MSI code returns with the interrupt disabled on the
+	 * card, using the MSI mask bits. Firmware doesn't appear to unmask
+	 * at that level, so we do it here by hand.
+	 */
+	if (irq_to_desc(virq)->msi_desc)
+		unmask_msi_irq(virq);
+
 	/* unmask it */
 	xics_unmask_irq(virq);
 	return 0;