From: Sean V Kelley <sean.v.kelley@intel.com>
To: bhelgaas@google.com, Jonathan.Cameron@huawei.com,
rjw@rjwysocki.net, ashok.raj@intel.com, tony.luck@intel.com,
sathyanarayanan.kuppuswamy@linux.intel.com
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Qiuxu Zhuo <qiuxu.zhuo@intel.com>,
Sean V Kelley <sean.v.kelley@intel.com>
Subject: [PATCH V2 3/9] PCI/portdrv: Add pcie_walk_rcec() to walk RCiEPs associated with RCEC
Date: Tue, 4 Aug 2020 12:40:46 -0700 [thread overview]
Message-ID: <20200804194052.193272-4-sean.v.kelley@intel.com> (raw)
In-Reply-To: <20200804194052.193272-1-sean.v.kelley@intel.com>
From: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
When an RCEC device signals error(s) to a CPU core, the CPU core
needs to walk all the RCiEPs associated with that RCEC to check
errors. So add the function pcie_walk_rcec() to walk all RCiEPs
associated with the RCEC device.
Co-developed-by: Sean V Kelley <sean.v.kelley@intel.com>
Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
Signed-off-by: Sean V Kelley <sean.v.kelley@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/pci/pcie/portdrv.h | 2 +
drivers/pci/pcie/portdrv_core.c | 82 +++++++++++++++++++++++++++++++++
2 files changed, 84 insertions(+)
diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h
index af7cf237432a..c11d5ecbad76 100644
--- a/drivers/pci/pcie/portdrv.h
+++ b/drivers/pci/pcie/portdrv.h
@@ -116,6 +116,8 @@ void pcie_port_service_unregister(struct pcie_port_service_driver *new);
extern struct bus_type pcie_port_bus_type;
int pcie_port_device_register(struct pci_dev *dev);
+void pcie_walk_rcec(struct pci_dev *rcec, int (*cb)(struct pci_dev *, void *),
+ void *userdata);
#ifdef CONFIG_PM
int pcie_port_device_suspend(struct device *dev);
int pcie_port_device_resume_noirq(struct device *dev);
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 5d4a400094fc..daa2dfa83a0b 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -14,6 +14,7 @@
#include <linux/pm_runtime.h>
#include <linux/string.h>
#include <linux/slab.h>
+#include <linux/bitops.h>
#include <linux/aer.h>
#include "../pci.h"
@@ -365,6 +366,87 @@ int pcie_port_device_register(struct pci_dev *dev)
return status;
}
+static int pcie_walk_rciep_devfn(struct pci_bus *pbus, int (*cb)(struct pci_dev *, void *),
+ void *userdata, unsigned long bitmap)
+{
+ unsigned int dev, fn;
+ struct pci_dev *pdev;
+ int retval;
+
+ for_each_set_bit(dev, &bitmap, 32) {
+ for (fn = 0; fn < 8; fn++) {
+ pdev = pci_get_slot(pbus, PCI_DEVFN(dev, fn));
+
+ if (!pdev || pci_pcie_type(pdev) != PCI_EXP_TYPE_RC_END)
+ continue;
+
+ retval = cb(pdev, userdata);
+ if (retval)
+ return retval;
+ }
+ }
+
+ return 0;
+}
+
+/**
+ * pcie_walk_rcec - Walk RCiEP devices associating with RCEC and call callback.
+ * @rcec RCEC whose RCiEP devices should be walked.
+ * @cb Callback to be called for each RCiEP device found.
+ * @userdata Arbitrary pointer to be passed to callback.
+ *
+ * Walk the given RCEC. Call the provided callback on each RCiEP device found.
+ *
+ * We check the return of @cb each time. If it returns anything
+ * other than 0, we break out.
+ */
+void pcie_walk_rcec(struct pci_dev *rcec, int (*cb)(struct pci_dev *, void *),
+ void *userdata)
+{
+ u32 pos, bitmap, hdr, busn;
+ u8 ver, nextbusn, lastbusn;
+ struct pci_bus *pbus;
+ unsigned int bnr;
+
+ pos = pci_find_ext_capability(rcec, PCI_EXT_CAP_ID_RCEC);
+ if (!pos)
+ return;
+
+ pbus = pci_find_bus(pci_domain_nr(rcec->bus), rcec->bus->number);
+ if (!pbus)
+ return;
+
+ pci_read_config_dword(rcec, pos + PCI_RCEC_RCIEP_BITMAP, &bitmap);
+
+ /* Find RCiEP devices on the same bus as the RCEC */
+ if (pcie_walk_rciep_devfn(pbus, cb, userdata, (unsigned long)bitmap))
+ return;
+
+ /* Check whether RCEC BUSN register is present */
+ pci_read_config_dword(rcec, pos, &hdr);
+ ver = PCI_EXT_CAP_VER(hdr);
+ if (ver < PCI_RCEC_BUSN_REG_VER)
+ return;
+
+ pci_read_config_dword(rcec, pos + PCI_RCEC_BUSN, &busn);
+ nextbusn = PCI_RCEC_BUSN_NEXT(busn);
+ lastbusn = PCI_RCEC_BUSN_LAST(busn);
+
+ /* All RCiEP devices are on the same bus as the RCEC */
+ if (nextbusn == 0xff && lastbusn == 0x00)
+ return;
+
+ for (bnr = nextbusn; bnr <= lastbusn; bnr++) {
+ pbus = pci_find_bus(pci_domain_nr(rcec->bus), bnr);
+ if (!pbus)
+ continue;
+
+ /* Find RCiEP devices on the given bus */
+ if (pcie_walk_rciep_devfn(pbus, cb, userdata, 0xffffffff))
+ return;
+ }
+}
+
#ifdef CONFIG_PM
typedef int (*pcie_pm_callback_t)(struct pcie_device *);
--
2.27.0
next prev parent reply other threads:[~2020-08-04 19:41 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-04 19:40 [PATCH V2 0/9] Add RCEC handling to PCI/AER Sean V Kelley
2020-08-04 19:40 ` [PATCH V2 1/9] pci_ids: Add class code and extended capability for RCEC Sean V Kelley
2020-08-05 3:01 ` Bjorn Helgaas
2020-08-04 19:40 ` [PATCH V2 2/9] PCI: Extend Root Port Driver to support RCEC Sean V Kelley
2020-08-05 17:43 ` Bjorn Helgaas
2020-08-05 18:14 ` Sean V Kelley
2020-08-05 17:45 ` Jonathan Cameron
2020-08-05 17:50 ` Sean V Kelley
2020-08-26 16:16 ` Kuppuswamy, Sathyanarayanan
2020-08-26 18:29 ` sean.v.kelley
2020-08-04 19:40 ` Sean V Kelley [this message]
2020-08-05 17:43 ` [PATCH V2 3/9] PCI/portdrv: Add pcie_walk_rcec() to walk RCiEPs associated with RCEC Bjorn Helgaas
2020-08-05 18:07 ` Sean V Kelley
2020-08-26 16:20 ` Kuppuswamy, Sathyanarayanan
2020-08-26 18:37 ` sean.v.kelley
2020-08-04 19:40 ` [PATCH V2 4/9] PCI/AER: Extend AER error handling to RCECs Sean V Kelley
2020-08-07 22:53 ` Bjorn Helgaas
2020-08-08 0:55 ` Sean V Kelley
2020-08-10 9:32 ` Jonathan Cameron
2020-08-17 22:24 ` Bjorn Helgaas
2020-08-18 9:01 ` Jonathan Cameron
2020-08-04 19:40 ` [PATCH V2 5/9] PCI/AER: Apply function level reset to RCiEP on fatal error Sean V Kelley
2020-08-04 19:40 ` [PATCH V2 6/9] PCI: Add 'rcec' field to pci_dev for associated RCiEPs Sean V Kelley
2020-08-05 17:40 ` Jonathan Cameron
2020-08-05 17:48 ` Sean V Kelley
2020-08-04 19:40 ` [PATCH V2 7/9] PCI/AER: Add RCEC AER handling Sean V Kelley
2020-08-05 17:49 ` Jonathan Cameron
2020-08-04 19:40 ` [PATCH V2 8/9] PCI/PME: Add RCEC PME handling Sean V Kelley
2020-08-05 17:51 ` Jonathan Cameron
2020-08-04 19:40 ` [PATCH V2 9/9] PCI/AER: Add RCEC AER error injection support Sean V Kelley
2020-08-05 17:54 ` Jonathan Cameron
2020-08-05 18:09 ` Sean V Kelley
2020-08-05 18:00 ` [PATCH V2 0/9] Add RCEC handling to PCI/AER Bjorn Helgaas
2020-08-05 18:12 ` Sean V Kelley
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=20200804194052.193272-4-sean.v.kelley@intel.com \
--to=sean.v.kelley@intel.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=ashok.raj@intel.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=qiuxu.zhuo@intel.com \
--cc=rjw@rjwysocki.net \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
--cc=tony.luck@intel.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).