From: Frederic Barrat <fbarrat@linux.ibm.com> To: linuxppc-dev@lists.ozlabs.org, andrew.donnellan@au1.ibm.com, clombard@linux.ibm.com Cc: groug@kaod.org, alastair@au1.ibm.com Subject: [PATCH 05/11] powerpc/powernv/ioda: Find opencapi slot for a device node Date: Mon, 9 Sep 2019 17:45:54 +0200 Message-ID: <20190909154600.19917-6-fbarrat@linux.ibm.com> (raw) In-Reply-To: <20190909154600.19917-1-fbarrat@linux.ibm.com> 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 <fbarrat@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; } -- 2.21.0
next prev parent reply index Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-09-09 15:45 [PATCH 00/11] opencapi: enable card reset and link retraining Frederic Barrat 2019-09-09 15:45 ` [PATCH 01/11] powerpc/powernv/ioda: Fix ref count for devices with their own PE Frederic Barrat 2019-09-10 0:20 ` Alastair D'Silva 2019-09-26 16:44 ` Andrew Donnellan 2019-09-26 17:15 ` Frederic Barrat 2019-09-27 6:54 ` Alexey Kardashevskiy 2019-11-12 17:38 ` Frederic Barrat 2019-11-18 1:04 ` Alistair Popple 2019-11-18 1:24 ` Oliver O'Halloran 2019-11-18 2:36 ` Alistair Popple 2019-11-18 18:21 ` Frederic Barrat 2019-09-09 15:45 ` [PATCH 02/11] powerpc/powernv/ioda: Protect PE list Frederic Barrat 2019-09-10 0:34 ` Alastair D'Silva 2019-11-19 12:55 ` Frederic Barrat 2019-11-19 13:22 ` Oliver O'Halloran 2019-11-19 14:36 ` Frederic Barrat 2019-11-19 5:55 ` Andrew Donnellan 2019-09-09 15:45 ` [PATCH 03/11] powerpc/powernv/ioda: set up PE on opencapi device when enabling Frederic Barrat 2019-09-10 0:38 ` Alastair D'Silva 2019-09-27 16:43 ` Andrew Donnellan 2019-09-09 15:45 ` [PATCH 04/11] powerpc/powernv/ioda: Release opencapi device Frederic Barrat 2019-09-10 0:56 ` Alastair D'Silva 2019-11-19 17:32 ` Frederic Barrat 2019-11-19 7:08 ` Andrew Donnellan 2019-09-09 15:45 ` Frederic Barrat [this message] 2019-09-10 0:57 ` [PATCH 05/11] powerpc/powernv/ioda: Find opencapi slot for a device node Alastair D'Silva 2019-11-19 1:26 ` Andrew Donnellan 2019-11-19 14:33 ` Frederic Barrat 2019-09-09 15:45 ` [PATCH 06/11] pci/hotplug/pnv-php: Remove erroneous warning Frederic Barrat 2019-09-10 0:58 ` Alastair D'Silva 2019-11-19 5:00 ` Andrew Donnellan 2019-09-09 15:45 ` [PATCH 07/11] pci/hotplug/pnv-php: Improve error msg on power state change failure Frederic Barrat 2019-09-10 0:59 ` Alastair D'Silva 2019-11-19 2:23 ` Andrew Donnellan 2019-09-09 15:45 ` [PATCH 08/11] pci/hotplug/pnv-php: Register opencapi slots Frederic Barrat 2019-09-10 1:00 ` Alastair D'Silva 2019-11-19 5:18 ` Andrew Donnellan 2019-11-19 15:15 ` Frederic Barrat 2019-09-09 15:45 ` [PATCH 09/11] pci/hotplug/pnv-php: Relax check when disabling slot Frederic Barrat 2019-09-10 1:00 ` Alastair D'Silva 2019-09-27 15:56 ` Andrew Donnellan 2019-09-09 15:45 ` [PATCH 10/11] pci/hotplug/pnv-php: Wrap warnings in macro Frederic Barrat 2019-09-10 1:03 ` Alastair D'Silva 2019-09-26 17:18 ` Andrew Donnellan 2019-09-09 15:46 ` [PATCH 11/11] ocxl: Add PCI hotplug dependency to Kconfig Frederic Barrat 2019-09-10 1:03 ` Alastair D'Silva 2019-09-26 17:11 ` Andrew Donnellan 2019-09-24 4:24 ` [PATCH 00/11] opencapi: enable card reset and link retraining Alexey Kardashevskiy 2019-09-24 6:39 ` Frederic Barrat 2019-09-25 0:20 ` Alexey Kardashevskiy
Reply instructions: You may reply publically to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190909154600.19917-6-fbarrat@linux.ibm.com \ --to=fbarrat@linux.ibm.com \ --cc=alastair@au1.ibm.com \ --cc=andrew.donnellan@au1.ibm.com \ --cc=clombard@linux.ibm.com \ --cc=groug@kaod.org \ --cc=linuxppc-dev@lists.ozlabs.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
LinuxPPC-Dev Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linuxppc-dev/0 linuxppc-dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linuxppc-dev linuxppc-dev/ https://lore.kernel.org/linuxppc-dev \ linuxppc-dev@lists.ozlabs.org linuxppc-dev@ozlabs.org public-inbox-index linuxppc-dev Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.ozlabs.lists.linuxppc-dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git