pci-hotplug/pnv_php: Add support for IODA3 Power9 PHBs (a839bd87) · Commits · 戴 / test

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

arch/powerpc/platforms/powernv/pci.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/pci/hotplug/pnv_php.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -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);

Admin message