Skip to content

Commit a839bd8

Browse files
oohalmpe
authored andcommitted
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 <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 7fd1fe4 commit a839bd8

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

arch/powerpc/platforms/powernv/pci.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ int pnv_pci_get_slot_id(struct device_node *np, uint64_t *id)
5454
break;
5555
}
5656

57-
if (!of_device_is_compatible(parent, "ibm,ioda2-phb")) {
57+
if (!of_device_is_compatible(parent, "ibm,ioda2-phb") &&
58+
!of_device_is_compatible(parent, "ibm,ioda3-phb")) {
5859
of_node_put(parent);
5960
continue;
6061
}

drivers/pci/hotplug/pnv_php.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,9 @@ static int __init pnv_php_init(void)
994994
for_each_compatible_node(dn, NULL, "ibm,ioda2-phb")
995995
pnv_php_register(dn);
996996

997+
for_each_compatible_node(dn, NULL, "ibm,ioda3-phb")
998+
pnv_php_register(dn);
999+
9971000
return 0;
9981001
}
9991002

@@ -1003,6 +1006,9 @@ static void __exit pnv_php_exit(void)
10031006

10041007
for_each_compatible_node(dn, NULL, "ibm,ioda2-phb")
10051008
pnv_php_unregister(dn);
1009+
1010+
for_each_compatible_node(dn, NULL, "ibm,ioda3-phb")
1011+
pnv_php_unregister(dn);
10061012
}
10071013

10081014
module_init(pnv_php_init);

0 commit comments

Comments
 (0)