Patchwork [3/4] powerpc/pseries: Check for MSI-X also in rtas_msi_pci_irq_fixup()

login
register
mail settings
Submitter Michael Ellerman
Date Jan. 23, 2009, 6:54 a.m.
Message ID <ee8cba6700ad2d6d0967e49ac5bfd2e4f01b5d84.1232693349.git.michael@ellerman.id.au>
Download mbox | patch
Permalink /patch/20019/
State Accepted, archived
Commit 649781f82782d142443d895b98edbd8be4e75c56
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Michael Ellerman - Jan. 23, 2009, 6:54 a.m.
We also need to check that the device isn't using MSI-X in the irq fixup
routine, otherwise we might leave MSI-Xs configured at boot.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
 arch/powerpc/platforms/pseries/msi.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c
index acf1070..e6c80ac 100644
--- a/arch/powerpc/platforms/pseries/msi.c
+++ b/arch/powerpc/platforms/pseries/msi.c
@@ -244,8 +244,8 @@  static void rtas_msi_pci_irq_fixup(struct pci_dev *pdev)
 	}
 
 	/* No MSI -> MSIs can't have been assigned by fw, leave LSI */
-	if (check_req_msi(pdev, 1)) {
-		dev_dbg(&pdev->dev, "rtas_msi: no req#msi, nothing to do.\n");
+	if (check_req_msi(pdev, 1) && check_req_msix(pdev, 1)) {
+		dev_dbg(&pdev->dev, "rtas_msi: no req#msi/x, nothing to do.\n");
 		return;
 	}