diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2009-01-22 20:54:32 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-11 13:38:01 +1100 |
| commit | 649781f82782d142443d895b98edbd8be4e75c56 (patch) | |
| tree | b91e5a16ea4b381175da9057ef91a40ff61d60d9 | |
| parent | 3a51c0cbea947dc9194e18f11661eaa4dbfc5c13 (diff) | |
| download | linux-649781f82782d142443d895b98edbd8be4e75c56.tar.gz linux-649781f82782d142443d895b98edbd8be4e75c56.tar.bz2 linux-649781f82782d142443d895b98edbd8be4e75c56.zip | |
powerpc/pseries: Check for MSI-X also in rtas_msi_pci_irq_fixup()
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>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/platforms/pseries/msi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c index acf1070d65c0..e6c80ac07697 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; } |