pci-hotplug/pnv_php: Add support for IODA3 Power9 PHBs

Currently we check that an IODA2 compatible PHB is upstream of this slot.
This is mainly to avoid pnv_php creating slots for the various "virtual
PHBs" that we create for NVLink. There's no real need for this restriction
so allow it on IODA3.

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20190903101605.2890-10-oohall@gmail.com

diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c
index 6104418c9ad5d30ca6cdb2e0342b8127c579ecc8..2825d004dece27ab8acefa4eb1ef2528cfa2aa3b 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci.c
+++ b/arch/powerpc/platforms/powernv/pci.c
@@ -54,7 +54,8 @@ int pnv_pci_get_slot_id(struct device_node *np, uint64_t *id)
                        break;
                }
 
-               if (!of_device_is_compatible(parent, "ibm,ioda2-phb")) {
+               if (!of_device_is_compatible(parent, "ibm,ioda2-phb") &&
+                   !of_device_is_compatible(parent, "ibm,ioda3-phb")) {
                        of_node_put(parent);
                        continue;
                }

diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c
index b0e243dabf77356b183fdbcb593d9b673b4625de..6fdf8b74cb0ac87458ed3e9a859697c565c6a7c3 100644 (file)
--- a/drivers/pci/hotplug/pnv_php.c
+++ b/drivers/pci/hotplug/pnv_php.c
@@ -994,6 +994,9 @@ static int __init pnv_php_init(void)
        for_each_compatible_node(dn, NULL, "ibm,ioda2-phb")
                pnv_php_register(dn);
 
+       for_each_compatible_node(dn, NULL, "ibm,ioda3-phb")
+               pnv_php_register(dn);
+
        return 0;
 }
 
@@ -1003,6 +1006,9 @@ static void __exit pnv_php_exit(void)
 
        for_each_compatible_node(dn, NULL, "ibm,ioda2-phb")
                pnv_php_unregister(dn);
+
+       for_each_compatible_node(dn, NULL, "ibm,ioda3-phb")
+               pnv_php_unregister(dn);
 }
 
 module_init(pnv_php_init);