powerpc/pci: Drop XIVE restriction on MSI domains

The PowerNV and pSeries platforms now have support for both the XICS
and XIVE IRQ domains.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210701132750.1475580-23-clg@kaod.org

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index b498876a976f0168c9e41eede02fb49fb1a8ce80..e2454439e5745d7a1f64548cfe7a3f46d8783c62 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -2332,9 +2332,7 @@ static void pnv_pci_init_ioda_msis(struct pnv_phb *phb)
        pr_info("  Allocated bitmap for %d MSIs (base IRQ 0x%x)\n",
                count, phb->msi_base);
 
-       /* Only supported by the XIVE driver */
-       if (xive_enabled())
-               pnv_msi_allocate_domains(phb->hose, count);
+       pnv_msi_allocate_domains(phb->hose, count);
 }
 
 static void pnv_ioda_setup_pe_res(struct pnv_ioda_pe *pe,

diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c
index e2127a3f7ebddeeed668b1e973a033e99afc8909..e196cc1b8540e058434a936052af95026afc7198 100644 (file)
--- a/arch/powerpc/platforms/pseries/msi.c
+++ b/arch/powerpc/platforms/pseries/msi.c
@@ -720,10 +720,6 @@ int pseries_msi_allocate_domains(struct pci_controller *phb)
 {
        int count;
 
-       /* Only supported by the XIVE driver */
-       if (!xive_enabled())
-               return -ENODEV;
-
        if (!__find_pe_total_msi(phb->dn, &count)) {
                pr_err("PCI: failed to find MSIs for bridge %pOF (domain %d)\n",
                       phb->dn, phb->global_number);