From: Oliver O'Halloran <oohall@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: alistair@popple.id.au, Oliver O'Halloran <oohall@gmail.com>,
s.miroshnichenko@yadro.com
Subject: [Very RFC 21/46] powernv/eeh: Rework finding an existing edev in probe_pdev()
Date: Wed, 20 Nov 2019 12:28:34 +1100 [thread overview]
Message-ID: <20191120012859.23300-22-oohall@gmail.com> (raw)
In-Reply-To: <20191120012859.23300-1-oohall@gmail.com>
Use the pnv_eeh_find_edev() helper to look up the eeh_dev for a device
rather than doing it via the pci_dn.
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
---
arch/powerpc/platforms/powernv/eeh-powernv.c | 44 ++++++++++++++------
1 file changed, 31 insertions(+), 13 deletions(-)
diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c
index 6ba74836a9f8..1cd80b399995 100644
--- a/arch/powerpc/platforms/powernv/eeh-powernv.c
+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c
@@ -374,20 +374,40 @@ static struct eeh_dev *pnv_eeh_probe_pdev(struct pci_dev *pdev)
int ret;
int config_addr = (pdev->bus->number << 8) | (pdev->devfn);
+ pci_dbg(pdev, "%s: probing\n", __func__);
+
/*
- * When probing the root bridge, which doesn't have any
- * subordinate PCI devices. We don't have OF node for
- * the root bridge. So it's not reasonable to continue
- * the probing.
+ * EEH keeps the eeh_dev alive over a recovery pass even when the
+ * corresponding pci_dev has been torn down. In that case we need
+ * to find the existing eeh_dev and re-bind the two.
*/
- if (!edev || edev->pe)
- return NULL;
+ edev = pnv_eeh_find_edev(phb, config_addr);
+ if (edev) {
+ eeh_edev_dbg(edev, "Found existing edev!\n");
+
+ /*
+ * XXX: eeh_remove_device() clears pdev so we shouldn't hit this
+ * normally. I've found that screwing around with the pci probe
+ * path can result in eeh_probe_pdev() being called twice. This
+ * is harmless at the moment, but it's pretty strange so emit a
+ * warning to be on the safe side.
+ */
+ if (WARN_ON(edev->pdev))
+ eeh_edev_dbg(edev, "%s: already bound to a pdev!\n", __func__);
+
+ edev->pdev = pdev;
+
+ /* should we be doing something with REMOVED too? */
+ edev->mode &= EEH_DEV_DISCONNECTED;
+
+ /* update the primary bus if we need to */
+ // XXX: why do we need to do this? is the pci_bus going away? what cleared the flag?
+ if (!(edev->pe->state & EEH_PE_PRI_BUS)) {
+ edev->pe->bus = pdev->bus;
+ if (edev->pe->bus)
+ edev->pe->state |= EEH_PE_PRI_BUS;
+ }
- /* already configured? */
- if (edev->pdev) {
- pr_debug("%s: found existing edev for %04x:%02x:%02x.%01x\n",
- __func__, hose->global_number, config_addr >> 8,
- PCI_SLOT(config_addr), PCI_FUNC(config_addr));
return edev;
}
@@ -395,8 +415,6 @@ static struct eeh_dev *pnv_eeh_probe_pdev(struct pci_dev *pdev)
if ((pdev->class >> 8) == PCI_CLASS_BRIDGE_ISA)
return NULL;
- eeh_edev_dbg(edev, "Probing device\n");
-
/* Initialize eeh device */
edev->class_code = pdev->class;
edev->pcix_cap = pci_find_capability(pdev, PCI_CAP_ID_PCIX);
--
2.21.0
next prev parent reply other threads:[~2019-11-20 2:12 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-20 1:28 PCIPOCALYPSE Oliver O'Halloran
2019-11-20 1:28 ` [Very RFC 01/46] powerpc/eeh: Don't attempt to restore VF config space after reset Oliver O'Halloran
2019-11-21 3:38 ` Alexey Kardashevskiy
2019-11-21 4:34 ` Oliver O'Halloran
2019-11-20 1:28 ` [Very RFC 02/46] powernv/pci: Add helper to find ioda_pe from BDFN Oliver O'Halloran
2019-11-20 1:28 ` [Very RFC 03/46] powernv/pci: Remove dma_dev_setup() for NPU PHBs Oliver O'Halloran
2019-11-21 3:57 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 04/46] powernv/pci: Move dma_{dev|bus}_setup into pci-ioda.c Oliver O'Halloran
2019-11-21 4:02 ` Alexey Kardashevskiy
2019-11-21 4:33 ` Oliver O'Halloran
2019-11-21 7:46 ` Christoph Hellwig
2019-11-20 1:28 ` [Very RFC 05/46] powernv/pci: Remove the pnv_phb dma_dev_setup callback Oliver O'Halloran
2019-11-21 4:03 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 06/46] powerpc/iov: Move VF pdev fixup into pcibios_fixup_iov() Oliver O'Halloran
2019-11-21 4:34 ` Alexey Kardashevskiy
2019-11-25 4:41 ` Oliver O'Halloran
2019-11-21 7:48 ` Christoph Hellwig
2019-11-25 4:39 ` Oliver O'Halloran
2019-11-20 1:28 ` [Very RFC 07/46] powernv/pci: Rework IODA PE device accounting Oliver O'Halloran
2019-11-21 5:48 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 08/46] powerpc/eeh: Calculate VF index rather than looking it up in pci_dn Oliver O'Halloran
2019-11-22 4:43 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 09/46] powerpc/eeh: Pass eeh_dev to eeh_ops->{read|write}_config() Oliver O'Halloran
2019-11-22 4:52 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 10/46] powerpc/eeh: Pass eeh_dev to eeh_ops->restore_config() Oliver O'Halloran
2019-11-20 1:28 ` [Very RFC 11/46] powerpc/eeh: Convert various printfs to use edev, not pci_dn Oliver O'Halloran
2019-11-22 4:55 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 12/46] powerpc/eeh: Split eeh_probe into probe_pdn and probe_pdev Oliver O'Halloran
2019-11-22 5:45 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 13/46] powerpc/eeh: Rework how pdev_probe() is used Oliver O'Halloran
2019-11-20 1:28 ` [Very RFC 14/46] powernv/eeh: Remove un-necessary call to eeh_add_device_early() Oliver O'Halloran
2019-11-22 6:01 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 15/46] powernv/eeh: Use pnv_eeh_*_config() for internal config ops Oliver O'Halloran
2019-11-22 6:15 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 16/46] powernv/eeh: Use eeh_edev_warn() rather than open-coding a BDFN print Oliver O'Halloran
2019-11-22 6:17 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 17/46] powernv/eeh: add pnv_eeh_find_edev() Oliver O'Halloran
2019-11-25 0:30 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 18/46] powernv/pci: Add pci_bus_to_pnvhb() helper Oliver O'Halloran
2019-11-25 0:42 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 19/46] powernv/eeh: Use standard PCI capability lookup functions Oliver O'Halloran
2019-11-25 1:02 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 20/46] powernv/eeh: Look up device info from pci_dev Oliver O'Halloran
2019-11-25 1:26 ` Alexey Kardashevskiy
2019-11-20 1:28 ` Oliver O'Halloran [this message]
2019-11-25 3:20 ` [Very RFC 21/46] powernv/eeh: Rework finding an existing edev in probe_pdev() Alexey Kardashevskiy
2019-11-25 4:17 ` Oliver O'Halloran
2019-11-20 1:28 ` [Very RFC 22/46] powernv/eeh: Allocate eeh_dev's when needed Oliver O'Halloran
2019-11-25 3:27 ` Alexey Kardashevskiy
2019-11-25 4:26 ` Oliver O'Halloran
2019-11-27 1:50 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 23/46] powerpc/eeh: Moving finding the parent PE into the platform Oliver O'Halloran
2019-11-25 5:00 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 24/46] powernv/pci: Make the pre-cfg EEH freeze check use eeh_dev rather than pci_dn Oliver O'Halloran
2019-11-27 0:21 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 25/46] powernv/pci: Remove pdn from pnv_pci_config_check_eeh() Oliver O'Halloran
2019-11-27 1:05 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 26/46] powernv/pci: Remove pdn from pnv_pci_cfg_{read|write} Oliver O'Halloran
2019-11-27 2:16 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 27/46] powernv/pci: Clear reserved PE freezes Oliver O'Halloran
2019-11-27 3:00 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 28/46] powernv/iov: Move SR-IOV PF state out of pci_dn Oliver O'Halloran
2019-11-27 4:09 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 29/46] powernv/pci: Remove open-coded PE lookup in PELT-V setup Oliver O'Halloran
2019-11-27 4:26 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 30/46] powernv/pci: Remove open-coded PE lookup in PELT-V teardown Oliver O'Halloran
2019-11-27 4:50 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 31/46] powernv/pci: Remove open-coded PE lookup in pnv_pci_ioda_dma_dev_setup() Oliver O'Halloran
2019-11-21 7:52 ` Christoph Hellwig
2019-11-27 4:53 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 32/46] powernv/pci: Remove open-coded PE lookup in iommu_bypass_supported() Oliver O'Halloran
2019-11-27 5:09 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 33/46] powernv/pci: Remove open-coded PE lookup in iommu notifier Oliver O'Halloran
2019-11-27 5:09 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 34/46] powernv/pci: Remove open-coded PE lookup in pnv_pci_enable_device_hook() Oliver O'Halloran
2019-11-27 5:14 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 35/46] powernv/pci: Remove open-coded PE lookup in pnv_pci_release_device Oliver O'Halloran
2019-11-27 5:24 ` Alexey Kardashevskiy
2019-11-27 9:51 ` Oliver O'Halloran
2019-11-20 1:28 ` [Very RFC 36/46] powernv/npu: Remove open-coded PE lookup for GPU device Oliver O'Halloran
2019-11-27 5:45 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 37/46] powernv/pci: Use the PHB's rmap for pnv_ioda_to_pe() Oliver O'Halloran
2019-11-21 3:50 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 38/46] powerpc/pci-hotplug: Scan the whole bus when using PCI_PROBE_NORMAL Oliver O'Halloran
2019-11-27 6:27 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 39/46] powernv/npu: Avoid pci_dn when mapping device_node to a pci_dev Oliver O'Halloran
2019-11-27 6:58 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 40/46] powernv/npu: Don't drop refcount when looking up GPU pci_devs Oliver O'Halloran
2019-11-27 7:09 ` Alexey Kardashevskiy
2019-11-27 8:24 ` Greg Kurz
2019-11-27 9:10 ` Frederic Barrat
2019-11-27 9:33 ` Greg Kurz
2019-11-27 9:40 ` Oliver O'Halloran
2019-11-27 12:00 ` Greg Kurz
2019-11-27 9:47 ` Frederic Barrat
2019-11-27 12:03 ` Greg Kurz
2019-11-20 1:28 ` [Very RFC 41/46] powernv/eeh: Remove pdn setup for SR-IOV VFs Oliver O'Halloran
2019-11-27 7:14 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 42/46] powernv/pci: Don't clear pdn->pe_number in pnv_pci_release_device Oliver O'Halloran
2019-11-27 7:30 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 43/46] powernv/pci: Do not set pdn->pe_number for NPU/CAPI devices Oliver O'Halloran
2019-11-27 22:49 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 44/46] powerpc/pci: Don't set pdn->pe_number when applying the weird P8 NVLink PE hack Oliver O'Halloran
2019-11-27 22:54 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 45/46] powernv/pci: Remove requirement for a pdn in config accessors Oliver O'Halloran
2019-11-27 23:00 ` Alexey Kardashevskiy
2019-11-20 1:28 ` [Very RFC 46/46] HACK: prevent pdn's from being created Oliver O'Halloran
Reply instructions:
You may reply publicly 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=20191120012859.23300-22-oohall@gmail.com \
--to=oohall@gmail.com \
--cc=alistair@popple.id.au \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=s.miroshnichenko@yadro.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).