On Mon, 2019-09-09 at 17:45 +0200, Frederic Barrat wrote:
> Unlike real PCI slots, opencapi slots are directly associated to
> the (virtual) opencapi PHB, there's no intermediate bridge. So when
> looking for a slot ID, we must start the search from the device node
> itself and not its parent.
>
> Also, the slot ID is not attached to a specific bdfn, so let's build
> it from the PHB ID, like skiboot.
>
> Signed-off-by: Frederic Barrat <fbar...@linux.ibm.com>
> ---
> arch/powerpc/include/asm/pnv-pci.h | 1 +
> arch/powerpc/platforms/powernv/pci.c | 10 +++++++---
> 2 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/pnv-pci.h
> b/arch/powerpc/include/asm/pnv-pci.h
> index edcb1fc50aeb..d0ee0ede5767 100644
> --- a/arch/powerpc/include/asm/pnv-pci.h
> +++ b/arch/powerpc/include/asm/pnv-pci.h
> @@ -15,6 +15,7 @@
> #define PCI_SLOT_ID_PREFIX (1UL << 63)
> #define PCI_SLOT_ID(phb_id, bdfn) \
> (PCI_SLOT_ID_PREFIX | ((uint64_t)(bdfn) << 16) | (phb_id))
> +#define PCI_PHB_SLOT_ID(phb_id) (phb_id)
>
> extern int pnv_pci_get_slot_id(struct device_node *np, uint64_t
> *id);
> extern int pnv_pci_get_device_tree(uint32_t phandle, void *buf,
> uint64_t len);
> diff --git a/arch/powerpc/platforms/powernv/pci.c
> b/arch/powerpc/platforms/powernv/pci.c
> index 6104418c9ad5..00a79f3c989f 100644
> --- a/arch/powerpc/platforms/powernv/pci.c
> +++ b/arch/powerpc/platforms/powernv/pci.c
> @@ -48,13 +48,14 @@ int pnv_pci_get_slot_id(struct device_node *np,
> uint64_t *id)
> return -ENXIO;
>
> bdfn = ((bdfn & 0x00ffff00) >> 8);
> - while ((parent = of_get_parent(parent))) {
> + for (parent = np; parent; parent = of_get_parent(parent)) {
> if (!PCI_DN(parent)) {
> of_node_put(parent);
> 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,ioda2-npu2-
> opencapi-phb")) {
> of_node_put(parent);
> continue;
> }
> @@ -65,7 +66,10 @@ int pnv_pci_get_slot_id(struct device_node *np,
> uint64_t *id)
> return -ENXIO;
> }
>
> - *id = PCI_SLOT_ID(phbid, bdfn);
> + if (of_device_is_compatible(parent, "ibm,ioda2-npu2-
> opencapi-phb"))
> + *id = PCI_PHB_SLOT_ID(phbid);
> + else
> + *id = PCI_SLOT_ID(phbid, bdfn);
> return 0;
> }
>
Reviewed-by: Alastair D'Silva <alast...@d-silva.org>
--
Alastair D'Silva
Open Source Developer
Linux Technology Centre, IBM Australia
mob: 0423 762 819
