Add RCEC handling to PCI/AER
Subsystems (2)
v10 cover Add RCEC handling to PCI/AER
Changes since v9 [1], based on discussion [2], AER patch [3], and pci/master tree [4]:
- No functional changes. Tested with aer injection.
PCI/RCEC: Add RCiEP's linked RCEC to AER/ERR
- Tighten up aer_root_reset() as a preliminary patch separate from RCEC/RCIEP series. So rebase series with the aer_root_reset() patch.
(Bjorn Helgaas)
[1] https://lore.kernel.org/linux-pci/[email protected]/
[2] https://lore.kernel.org/linux-pci/20201020162820.GA370938@bjorn-Precision-5520/
[3] https://lore.kernel.org/linux-pci/[email protected]/
[4] https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git/log/
Root Complex Event Collectors (RCEC) provide support for terminating error and PME messages from Root Complex Integrated Endpoints (RCiEPs). An RCEC resides on a Bus in the Root Complex. Multiple RCECs can in fact reside on a single bus. An RCEC will explicitly declare supported RCiEPs through the Root Complex Endpoint Association Extended Capability.
(See PCIe 5.0-1, sections 1.3.2.3 (RCiEP), and 7.9.10 (RCEC Ext. Cap.))
The kernel lacks handling for these RCECs and the error messages received from their respective associated RCiEPs. More recently, a new CPU interconnect, Compute eXpress Link (CXL) depends on RCEC capabilities for purposes of error messaging from CXL 1.1 supported RCiEP devices.
DocLink: https://www.computeexpresslink.org/
This use case is not limited to CXL. Existing hardware today includes support for RCECs, such as the Denverton microserver product family. Future hardware will be forthcoming.
(See Intel Document, Order number: 33061-003US)
So services such as AER or PME could be associated with an RCEC driver. In the case of CXL, if an RCiEP (i.e., CXL 1.1 device) is associated with a platform's RCEC it shall signal PME and AER error conditions through that RCEC.
Towards the above use cases, add the missing RCEC class and extend the PCIe Root Port and service drivers to allow association of RCiEPs to their respective parent RCEC and facilitate handling of terminating error and PME messages.
Qiuxu Zhuo (4):
PCI/RCEC: Add RCEC class code and extended capability PCI/RCEC: Bind RCEC devices to the Root Port driver PCI/RCEC: Add RCiEP's linked RCEC to AER/ERR PCI/AER: Add RCEC AER error injection support
Sean V Kelley (12):
AER: aer_root_reset() non-native handling PCI/RCEC: Cache RCEC capabilities in pci_init_capabilities() PCI/ERR: Rename reset_link() to reset_subordinates() PCI/ERR: Simplify by using pci_upstream_bridge() PCI/ERR: Simplify by computing pci_pcie_type() once PCI/ERR: Use "bridge" for clarity in pcie_do_recovery() PCI/ERR: Avoid negated conditional for clarity PCI/ERR: Add pci_walk_bridge() to pcie_do_recovery() PCI/ERR: Limit AER resets in pcie_do_recovery() PCI/RCEC: Add pcie_link_rcec() to associate RCiEPs PCI/AER: Add pcie_walk_rcec() to RCEC AER handling PCI/PME: Add pcie_walk_rcec() to RCEC PME handling
drivers/pci/pci.h | 29 ++++- drivers/pci/pcie/Makefile | 2 +- drivers/pci/pcie/aer.c | 79 +++++++++---- drivers/pci/pcie/aer_inject.c | 5 +- drivers/pci/pcie/err.c | 93 +++++++++++----- drivers/pci/pcie/pme.c | 15 ++- drivers/pci/pcie/portdrv_core.c | 9 +- drivers/pci/pcie/portdrv_pci.c | 8 +- drivers/pci/pcie/rcec.c | 190 ++++++++++++++++++++++++++++++++ drivers/pci/probe.c | 2 + include/linux/pci.h | 5 + include/linux/pci_ids.h | 1 + include/uapi/linux/pci_regs.h | 7 ++ 13 files changed, 382 insertions(+), 63 deletions(-) create mode 100644 drivers/pci/pcie/rcec.c
--
2.29.2
PATCH v10 1/16 AER: aer_root_reset() non-native handling
If an OS has not been granted AER control via _OSC, then the OS should not make changes to PCI_ERR_ROOT_COMMAND and PCI_ERR_ROOT_STATUS related registers. Per section 4.5.1 of the System Firmware Intermediary (SFI) _OSC and DPC Updates ECN [1], this bit also covers these aspects of the PCI Express Advanced Error Reporting. Based on the above and earlier discussion [2], make the following changes:
Add a check for the native case (i.e., AER control via _OSC)
Note that the current "clear, reset, enable" order suggests that the reset might cause errors that we should ignore. Lacking historical context, these will be retained.
[1] System Firmware Intermediary (SFI) _OSC and DPC Updates ECN, Feb 24, 2020, affecting PCI Firmware Specification, Rev. 3.2
https://members.pcisig.com/wg/PCI-SIG/document/14076
[2] https://lore.kernel.org/linux-pci/20201020162820.GA370938@bjorn-Precision-5520/
--- drivers/pci/pcie/aer.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)
drivers/pci/pcie/aer.c +17 -14
@@ -1358,26 +1358,29 @@ static int aer_probe(struct pcie_device *dev)static pci_ers_result_t aer_root_reset (struct pci_dev *dev) {int aer = dev->aer_cap; +int rc =0 ;u32 reg32; -int rc; - -/* Disable Root's interrupt in response to error messages */ -pci_read_config_dword (dev, aer +PCI_ERR_ROOT_COMMAND , ®32); - reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK ; -pci_write_config_dword (dev, aer +PCI_ERR_ROOT_COMMAND , reg32); +if (pcie_aer_is_native (dev)) { +/* Disable Root's interrupt in response to error messages */ +pci_read_config_dword (dev, aer +PCI_ERR_ROOT_COMMAND , ®32); + reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK ; +pci_write_config_dword (dev, aer +PCI_ERR_ROOT_COMMAND , reg32); + } rc =pci_bus_error_reset (dev); -pci_info (dev,"Root Port link has been reset\n" ); +pci_info (dev,"Root Port link has been reset (%d)\n" , rc); -/* Clear Root Error Status */ -pci_read_config_dword (dev, aer +PCI_ERR_ROOT_STATUS , ®32); -pci_write_config_dword (dev, aer +PCI_ERR_ROOT_STATUS , reg32); +if (pcie_aer_is_native (dev)) { +/* Clear Root Error Status */ +pci_read_config_dword (dev, aer +PCI_ERR_ROOT_STATUS , ®32); +pci_write_config_dword (dev, aer +PCI_ERR_ROOT_STATUS , reg32); -/* Enable Root Port's interrupt in response to error messages */ -pci_read_config_dword (dev, aer +PCI_ERR_ROOT_COMMAND , ®32); - reg32 |=ROOT_PORT_INTR_ON_MESG_MASK ; -pci_write_config_dword (dev, aer +PCI_ERR_ROOT_COMMAND , reg32); +/* Enable Root Port's interrupt in response to error messages */ +pci_read_config_dword (dev, aer +PCI_ERR_ROOT_COMMAND , ®32); + reg32 |=ROOT_PORT_INTR_ON_MESG_MASK ; +pci_write_config_dword (dev, aer +PCI_ERR_ROOT_COMMAND , reg32); + }return rc ?PCI_ERS_RESULT_DISCONNECT :PCI_ERS_RESULT_RECOVERED ; }
Signature · 1 line
2.29.2
PATCH v10 2/16 PCI/RCEC: Add RCEC class code and extended capability
In reply to Sean V KelleyFrom: Qiuxu Zhuo <[email protected]>
A PCIe Root Complex Event Collector (RCEC) has base class 0x08, sub-class 0x07, and programming interface 0x00. Add the class code 0x0807 to identify RCEC devices and add #defines for the RCEC Endpoint Association Extended Capability.
See PCIe r5.0, sec 1.3.4 ("Root Complex Event Collector") and sec 7.9.10 ("Root Complex Event Collector Endpoint Association Extended Capability").
--- include/linux/pci_ids.h | 1 + include/uapi/linux/pci_regs.h | 7 +++++++ 2 files changed, 8 insertions(+)
include/linux/pci_ids.h +1 -0
@@ -81,6 +81,7 @@#define PCI_CLASS_SYSTEM_RTC 0x0803#define PCI_CLASS_SYSTEM_PCI_HOTPLUG 0x0804#define PCI_CLASS_SYSTEM_SDHCI 0x0805 +#define PCI_CLASS_SYSTEM_RCEC 0x0807#define PCI_CLASS_SYSTEM_OTHER 0x0880#define PCI_BASE_CLASS_INPUT 0x09
include/uapi/linux/pci_regs.h +7 -0
@@ -831,6 +831,13 @@#define PCI_PWR_CAP_BUDGET (x) ((x) & 1)/* Included in system budget */ #define PCI_EXT_CAP_PWR_SIZEOF 16 +/* Root Complex Event Collector Endpoint Association */ +#define PCI_RCEC_RCIEP_BITMAP 4/* Associated Bitmap for RCiEPs */ +#define PCI_RCEC_BUSN 8/* RCEC Associated Bus Numbers */ +#define PCI_RCEC_BUSN_REG_VER 0x02/* Least version with BUSN present */ +#define PCI_RCEC_BUSN_NEXT (x) (((x) >> 8) & 0xff) +#define PCI_RCEC_BUSN_LAST (x) (((x) >> 16) & 0xff) +/* Vendor-Specific (VSEC, PCI_EXT_CAP_ID_VNDR) */ #define PCI_VNDR_HEADER 4/* Vendor-Specific Header */ #define PCI_VNDR_HEADER_ID (x) ((x) & 0xffff)
Signature · 1 line
2.29.2
PATCH v10 3/16 PCI/RCEC: Bind RCEC devices to the Root Port driver
In reply to Sean V KelleyFrom: Qiuxu Zhuo <[email protected]>
If a Root Complex Integrated Endpoint (RCiEP) is implemented, it may signal errors through a Root Complex Event Collector (RCEC). Each RCiEP must be associated with no more than one RCEC.
For an RCEC (which is technically not a Bridge), error messages "received" from associated RCiEPs must be enabled for "transmission" in order to cause a System Error via the Root Control register or (when the Advanced Error Reporting Capability is present) reporting via the Root Error Command register and logging in the Root Error Status register and Error Source Identification register.
Given the commonality with Root Ports and the need to also support AER and PME services for RCECs, extend the Root Port driver to support RCEC devices by adding the RCEC Class ID to the driver structure.
--- drivers/pci/pcie/portdrv_pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/pci/pcie/portdrv_pci.c +4 -1
@@ -106,7 +106,8 @@ static int pcie_portdrv_probe(struct pci_dev *dev,if (!pci_is_pcie (dev) || ((pci_pcie_type (dev) !=PCI_EXP_TYPE_ROOT_PORT ) && (pci_pcie_type (dev) !=PCI_EXP_TYPE_UPSTREAM ) && - (pci_pcie_type (dev) !=PCI_EXP_TYPE_DOWNSTREAM ))) + (pci_pcie_type (dev) !=PCI_EXP_TYPE_DOWNSTREAM ) && + (pci_pcie_type (dev) !=PCI_EXP_TYPE_RC_EC )))return -ENODEV ; status =pcie_port_device_register (dev);
@@ -195,6 +196,8 @@ static const struct pci_device_id port_pci_ids[] = { { PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x00), ~0) },/* subtractive decode PCI-to-PCI bridge, class type is 060401h */ { PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x01), ~0) }, +/* handle any Root Complex Event Collector */ + { PCI_DEVICE_CLASS(((PCI_CLASS_SYSTEM_RCEC << 8) | 0x00), ~0) }, { }, };
Signature · 1 line
2.29.2
PATCH v10 4/16 PCI/RCEC: Cache RCEC capabilities in pci_init_capabilities()
In reply to Sean V KelleyExtend support for Root Complex Event Collectors by decoding and caching the RCEC Endpoint Association Extended Capabilities when enumerating. Use that cached information for later error source reporting. See PCIe r5.0, sec 7.9.10.
--- drivers/pci/pci.h | 17 +++++++++++ drivers/pci/pcie/Makefile | 2 +- drivers/pci/pcie/rcec.c | 59 +++++++++++++++++++++++++++++++++++++++ drivers/pci/probe.c | 2 ++ include/linux/pci.h | 4 +++ 5 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 drivers/pci/pcie/rcec.c
drivers/pci/pci.h +17 -0
@@ -448,6 +448,15 @@ int aer_get_device_error_info(struct pci_dev *dev, struct aer_err_info *info);void aer_print_error (struct pci_dev *dev,struct aer_err_info *info);#endif /* CONFIG_PCIEAER */ +#ifdef CONFIG_PCIEPORTBUS +/* Cached RCEC Endpoint Association */ +struct rcec_ea { +u8 nextbusn; +u8 lastbusn; +u32 bitmap; +}; +#endif +#ifdef CONFIG_PCIE_DPC void pci_save_dpc_state (struct pci_dev *dev);void pci_restore_dpc_state (struct pci_dev *dev);
@@ -460,6 +469,14 @@ static inline void pci_restore_dpc_state(struct pci_dev *dev) {}static inline void pci_dpc_init (struct pci_dev *pdev) {}#endif +#ifdef CONFIG_PCIEPORTBUS +void pci_rcec_init (struct pci_dev *dev); +void pci_rcec_exit (struct pci_dev *dev); +#else +static inline void pci_rcec_init (struct pci_dev *dev) {} +static inline void pci_rcec_exit (struct pci_dev *dev) {} +#endif +#ifdef CONFIG_PCI_ATS /* Address Translation Service */ void pci_ats_init (struct pci_dev *dev);
drivers/pci/pcie/Makefile +1 -1
@@ -2,7 +2,7 @@ # # Makefile for PCI Express features and port driver -pcieportdrv-y := portdrv_core.o portdrv_pci.o err.o +pcieportdrv-y := portdrv_core.o portdrv_pci.o err.o rcec.o obj-$(CONFIG_PCIEPORTBUS) += pcieportdrv.o
drivers/pci/pcie/rcec.c new file +59 -0
59 lines not on this page · raw message
drivers/pci/probe.c +2 -0
@@ -2216,6 +2216,7 @@ static void pci_configure_device(struct pci_dev *dev)static void pci_release_capabilities (struct pci_dev *dev) {pci_aer_exit (dev); +pci_rcec_exit (dev);pci_vpd_release (dev);pci_iov_release (dev);pci_free_cap_save_buffers (dev);
@@ -2415,6 +2416,7 @@ static void pci_init_capabilities(struct pci_dev *dev)pci_ptm_init (dev);/* Precision Time Measurement */ pci_aer_init (dev);/* Advanced Error Reporting */ pci_dpc_init (dev);/* Downstream Port Containment */ +pci_rcec_init (dev);/* Root Complex Event Collector */ pcie_report_downtraining (dev);
include/linux/pci.h +4 -0
@@ -304,6 +304,7 @@ struct pcie_link_state;struct pci_vpd ;struct pci_sriov ;struct pci_p2pdma ; +struct rcec_ea ;/* The pci_dev structure describes PCI devices */ struct pci_dev {
@@ -326,6 +327,9 @@ struct pci_dev {#ifdef CONFIG_PCIEAER u16 aer_cap;/* AER capability offset */ struct aer_stats *aer_stats;/* AER stats for this device */ +#endif +#ifdef CONFIG_PCIEPORTBUS +struct rcec_ea *rcec_ea;/* RCEC cached endpoint association */ #endif u8 pcie_cap;/* PCIe capability offset */ u8 msi_cap;/* MSI capability offset */
Signature · 1 line
2.29.2
PATCH v10 5/16 PCI/ERR: Rename reset_link() to reset_subordinates()
In reply to Sean V Kelleyreset_link() appears to be misnamed. The point is to reset any devices below a given bridge, so rename it to reset_subordinates() to make it clear that we are passing a bridge with the intent to reset the devices below it.
--- drivers/pci/pci.h | 4 ++-- drivers/pci/pcie/err.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/pci/pci.h +2 -2
@@ -572,8 +572,8 @@ static inline int pci_dev_specific_disable_acs_redir(struct pci_dev *dev)/* PCI error reporting and recovery */ pci_ers_result_t pcie_do_recovery (struct pci_dev *dev, -pci_channel_state_t state, -pci_ers_result_t (*reset_link)(struct pci_dev *pdev)); +pci_channel_state_t state, +pci_ers_result_t (*reset_subordinates)(struct pci_dev *pdev));bool pcie_wait_for_link (struct pci_dev *pdev,bool active);#ifdef CONFIG_PCIEASPM
drivers/pci/pcie/err.c +4 -4
@@ -147,8 +147,8 @@ static int report_resume(struct pci_dev *dev, void *data) }pci_ers_result_t pcie_do_recovery (struct pci_dev *dev, -pci_channel_state_t state, -pci_ers_result_t (*reset_link)(struct pci_dev *pdev)) +pci_channel_state_t state, +pci_ers_result_t (*reset_subordinates)(struct pci_dev *pdev)) {pci_ers_result_t status =PCI_ERS_RESULT_CAN_RECOVER ;struct pci_bus *bus;
@@ -165,9 +165,9 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,pci_dbg (dev,"broadcast error_detected message\n" );if (state == pci_channel_io_frozen) {pci_walk_bus (bus, report_frozen_detected, &status); - status =reset_link (dev); + status =reset_subordinates (dev);if (status !=PCI_ERS_RESULT_RECOVERED ) { -pci_warn (dev,"link reset failed\n" ); +pci_warn (dev,"subordinate device reset failed\n" ); goto failed; } }else {
Signature · 1 line
2.29.2
PATCH v10 6/16 PCI/ERR: Simplify by using pci_upstream_bridge()
In reply to Sean V KelleyUse pci_upstream_bridge() in place of dev->bus->self. No functional change intended.
--- drivers/pci/pcie/err.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/pcie/err.c +1 -1
@@ -159,7 +159,7 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,*/ if (!(pci_pcie_type (dev) ==PCI_EXP_TYPE_ROOT_PORT ||pci_pcie_type (dev) ==PCI_EXP_TYPE_DOWNSTREAM )) - dev = dev->bus->self; + dev =pci_upstream_bridge (dev); bus = dev->subordinate;pci_dbg (dev,"broadcast error_detected message\n" );
Signature · 1 line
2.29.2
PATCH v10 7/16 PCI/ERR: Simplify by computing pci_pcie_type() once
In reply to Sean V KelleyInstead of calling pci_pcie_type(dev) twice, call it once and save the result. No functional change intended.
--- drivers/pci/pcie/err.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/pci/pcie/err.c +3 -2
@@ -150,6 +150,7 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,pci_channel_state_t state, pci_ers_result_t (*reset_subordinates)(struct pci_dev *pdev)) { + int type = pci_pcie_type(dev);pci_ers_result_t status =PCI_ERS_RESULT_CAN_RECOVER ;struct pci_bus *bus;
@@ -157,8 +158,8 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,* Error recovery runs on all subordinates of the first downstream port. * If the downstream port detected the error, it is cleared at the end. */ -if (!(pci_pcie_type (dev) ==PCI_EXP_TYPE_ROOT_PORT || -pci_pcie_type (dev) ==PCI_EXP_TYPE_DOWNSTREAM )) +if (!(type ==PCI_EXP_TYPE_ROOT_PORT || + type ==PCI_EXP_TYPE_DOWNSTREAM )) dev =pci_upstream_bridge (dev); bus = dev->subordinate;
Signature · 1 line
2.29.2
PATCH v10 8/16 PCI/ERR: Use "bridge" for clarity in pcie_do_recovery()
In reply to Sean V Kelleypcie_do_recovery() may be called with "dev" being either a bridge (Root Port or Switch Downstream Port) or an Endpoint. The bulk of the function deals with the bridge, so if we start with an Endpoint, we reset "dev" to be the bridge leading to it.
For clarity, replace "dev" in the body of the function with "bridge". No functional change intended.
[bhelgaas: commit log, split pieces out so this is pure rename, also replace "dev" with "bridge" in messages and pci_uevent_ers()]
--- drivers/pci/pcie/err.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-)
drivers/pci/pcie/err.c +20 -17
@@ -151,24 +151,27 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev, pci_ers_result_t (*reset_subordinates)(struct pci_dev *pdev)) {int type =pci_pcie_type (dev); -pci_ers_result_t status =PCI_ERS_RESULT_CAN_RECOVER ; +struct pci_dev *bridge;struct pci_bus *bus; +pci_ers_result_t status =PCI_ERS_RESULT_CAN_RECOVER ;/* -* Error recovery runs on all subordinates of the first downstream port. -* If the downstream port detected the error, it is cleared at the end. +* Error recovery runs on all subordinates of the bridge. If the +* bridge detected the error, it is cleared at the end. */ if (!(type ==PCI_EXP_TYPE_ROOT_PORT || type ==PCI_EXP_TYPE_DOWNSTREAM )) - dev =pci_upstream_bridge (dev); - bus = dev->subordinate; + bridge =pci_upstream_bridge (dev); +else + bridge = dev; -pci_dbg (dev,"broadcast error_detected message\n" ); + bus = bridge->subordinate; +pci_dbg (bridge,"broadcast error_detected message\n" );if (state == pci_channel_io_frozen) {pci_walk_bus (bus, report_frozen_detected, &status); - status =reset_subordinates (dev); + status =reset_subordinates (bridge);if (status !=PCI_ERS_RESULT_RECOVERED ) { -pci_warn (dev,"subordinate device reset failed\n" ); +pci_warn (bridge,"subordinate device reset failed\n" ); goto failed; } }else {
@@ -177,7 +180,7 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,if (status ==PCI_ERS_RESULT_CAN_RECOVER ) { status =PCI_ERS_RESULT_RECOVERED ; -pci_dbg (dev,"broadcast mmio_enabled message\n" ); +pci_dbg (bridge,"broadcast mmio_enabled message\n" );pci_walk_bus (bus, report_mmio_enabled, &status); }
@@ -188,27 +191,27 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,* drivers' slot_reset callbacks? */ status =PCI_ERS_RESULT_RECOVERED ; -pci_dbg (dev,"broadcast slot_reset message\n" ); +pci_dbg (bridge,"broadcast slot_reset message\n" );pci_walk_bus (bus, report_slot_reset, &status); }if (status !=PCI_ERS_RESULT_RECOVERED ) goto failed; -pci_dbg (dev,"broadcast resume message\n" ); +pci_dbg (bridge,"broadcast resume message\n" );pci_walk_bus (bus, report_resume, &status); -if (pcie_aer_is_native (dev)) -pcie_clear_device_status (dev); -pci_aer_clear_nonfatal_status (dev); -pci_info (dev,"device recovery successful\n" ); +if (pcie_aer_is_native (bridge)) +pcie_clear_device_status (bridge); +pci_aer_clear_nonfatal_status (bridge); +pci_info (bridge,"device recovery successful\n" );return status; failed: -pci_uevent_ers (dev,PCI_ERS_RESULT_DISCONNECT ); +pci_uevent_ers (bridge,PCI_ERS_RESULT_DISCONNECT );/* TODO: Should kernel panic here? */ -pci_info (dev,"device recovery failed\n" ); +pci_info (bridge,"device recovery failed\n" );return status; }
Signature · 1 line
2.29.2
PATCH v10 9/16 PCI/ERR: Avoid negated conditional for clarity
In reply to Sean V KelleyReverse the sense of the Root Port/Downstream Port conditional for clarity. No functional change intended.
--- drivers/pci/pcie/err.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/pci/pcie/err.c +4 -4
@@ -159,11 +159,11 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,* Error recovery runs on all subordinates of the bridge. If the * bridge detected the error, it is cleared at the end. */ -if (!(type ==PCI_EXP_TYPE_ROOT_PORT || - type ==PCI_EXP_TYPE_DOWNSTREAM )) - bridge =pci_upstream_bridge (dev); -else +if (type ==PCI_EXP_TYPE_ROOT_PORT || + type ==PCI_EXP_TYPE_DOWNSTREAM ) bridge = dev; +else + bridge =pci_upstream_bridge (dev); bus = bridge->subordinate;pci_dbg (bridge,"broadcast error_detected message\n" );
Signature · 1 line
2.29.2
PATCH v10 10/16 PCI/ERR: Add pci_walk_bridge() to pcie_do_recovery()
In reply to Sean V KelleyConsolidate subordinate bus checks with pci_walk_bus() into pci_walk_bridge() for walking below potentially AER affected bridges.
--- drivers/pci/pcie/err.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-)
drivers/pci/pcie/err.c +23 -7
@@ -146,13 +146,30 @@ static int report_resume(struct pci_dev *dev, void *data)return 0 ; } +/** +* pci_walk_bridge - walk bridges potentially AER affected +* @bridge: bridge which may be a Port +* @cb: callback to be called for each device found +* @userdata: arbitrary pointer to be passed to callback +* +* If the device provided is a bridge, walk the subordinate bus, including +* any bridged devices on buses under this bus. Call the provided callback +* on each device found. +*/ +static void pci_walk_bridge (struct pci_dev *bridge, +int (*cb)(struct pci_dev *,void *), +void *userdata) +{ +if (bridge->subordinate) +pci_walk_bus (bridge->subordinate, cb, userdata); +} +pci_ers_result_t pcie_do_recovery (struct pci_dev *dev,pci_channel_state_t state,pci_ers_result_t (*reset_subordinates)(struct pci_dev *pdev)) {int type =pci_pcie_type (dev);struct pci_dev *bridge; -struct pci_bus *bus;pci_ers_result_t status =PCI_ERS_RESULT_CAN_RECOVER ;/*
@@ -165,23 +182,22 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,else bridge =pci_upstream_bridge (dev); - bus = bridge->subordinate;pci_dbg (bridge,"broadcast error_detected message\n" );if (state == pci_channel_io_frozen) { -pci_walk_bus (bus, report_frozen_detected, &status); +pci_walk_bridge (bridge, report_frozen_detected, &status); status =reset_subordinates (bridge);if (status !=PCI_ERS_RESULT_RECOVERED ) {pci_warn (bridge,"subordinate device reset failed\n" ); goto failed; } }else { -pci_walk_bus (bus, report_normal_detected, &status); +pci_walk_bridge (bridge, report_normal_detected, &status); }if (status ==PCI_ERS_RESULT_CAN_RECOVER ) { status =PCI_ERS_RESULT_RECOVERED ;pci_dbg (bridge,"broadcast mmio_enabled message\n" ); -pci_walk_bus (bus, report_mmio_enabled, &status); +pci_walk_bridge (bridge, report_mmio_enabled, &status); }if (status ==PCI_ERS_RESULT_NEED_RESET ) {
@@ -192,14 +208,14 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,*/ status =PCI_ERS_RESULT_RECOVERED ;pci_dbg (bridge,"broadcast slot_reset message\n" ); -pci_walk_bus (bus, report_slot_reset, &status); +pci_walk_bridge (bridge, report_slot_reset, &status); }if (status !=PCI_ERS_RESULT_RECOVERED ) goto failed;pci_dbg (bridge,"broadcast resume message\n" ); -pci_walk_bus (bus, report_resume, &status); +pci_walk_bridge (bridge, report_resume, &status);if (pcie_aer_is_native (bridge))pcie_clear_device_status (bridge);
Signature · 1 line
2.29.2
PATCH v10 11/16 PCI/ERR: Limit AER resets in pcie_do_recovery()
In reply to Sean V KelleyIn some cases a bridge may not exist as the hardware controlling may be handled only by firmware and so is not visible to the OS. This scenario is also possible in future use cases involving non-native use of RCECs by firmware.
Explicitly apply conditional logic around these resets by limiting them to Root Ports and Downstream Ports.
--- drivers/pci/pcie/err.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-)
drivers/pci/pcie/err.c +25 -6
@@ -148,13 +148,17 @@ static int report_resume(struct pci_dev *dev, void *data)/** * pci_walk_bridge - walk bridges potentially AER affected -* @bridge: bridge which may be a Port +* @bridge: bridge which may be a Port, an RCEC with associated RCiEPs, +* or an RCiEP associated with an RCEC * @cb: callback to be called for each device found * @userdata: arbitrary pointer to be passed to callback * * If the device provided is a bridge, walk the subordinate bus, including * any bridged devices on buses under this bus. Call the provided callback * on each device found. +* +* If the device provided has no subordinate bus, call the callback on the +* device itself. */ static void pci_walk_bridge(struct pci_dev *bridge, int (*cb)(struct pci_dev *, void *),
@@ -162,6 +166,8 @@ static void pci_walk_bridge(struct pci_dev *bridge, {if (bridge->subordinate)pci_walk_bus (bridge->subordinate, cb, userdata); +else +cb (bridge, userdata); } pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,
@@ -174,10 +180,13 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,/* * Error recovery runs on all subordinates of the bridge. If the -* bridge detected the error, it is cleared at the end. +* bridge detected the error, it is cleared at the end. For RCiEPs +* we should reset just the RCiEP itself. */ if (type ==PCI_EXP_TYPE_ROOT_PORT || - type ==PCI_EXP_TYPE_DOWNSTREAM ) + type ==PCI_EXP_TYPE_DOWNSTREAM || + type ==PCI_EXP_TYPE_RC_EC || + type ==PCI_EXP_TYPE_RC_END ) bridge = dev;else bridge =pci_upstream_bridge (dev);
@@ -185,6 +194,12 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,pci_dbg (bridge,"broadcast error_detected message\n" );if (state == pci_channel_io_frozen) {pci_walk_bridge (bridge, report_frozen_detected, &status); +if (type ==PCI_EXP_TYPE_RC_END ) { +pci_warn (dev,"subordinate device reset not possible for RCiEP\n" ); + status =PCI_ERS_RESULT_NONE ; + goto failed; + } + status =reset_subordinates (bridge);if (status !=PCI_ERS_RESULT_RECOVERED ) {pci_warn (bridge,"subordinate device reset failed\n" );
@@ -217,9 +232,13 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,pci_dbg (bridge,"broadcast resume message\n" );pci_walk_bridge (bridge, report_resume, &status); -if (pcie_aer_is_native (bridge)) -pcie_clear_device_status (bridge); -pci_aer_clear_nonfatal_status (bridge); +if (type ==PCI_EXP_TYPE_ROOT_PORT || + type ==PCI_EXP_TYPE_DOWNSTREAM || + type ==PCI_EXP_TYPE_RC_EC ) { +if (pcie_aer_is_native (bridge)) +pcie_clear_device_status (bridge); +pci_aer_clear_nonfatal_status (bridge); + }pci_info (bridge,"device recovery successful\n" );return status;
Signature · 1 line
2.29.2
PATCH v10 12/16 PCI/RCEC: Add pcie_link_rcec() to associate RCiEPs
In reply to Sean V KelleyA Root Complex Event Collector terminates error and PME messages from associated RCiEPs.
Use the RCEC Endpoint Association Extended Capability to identify associated RCiEPs. Link the associated RCiEPs as the RCECs are enumerated.
--- drivers/pci/pci.h | 2 + drivers/pci/pcie/portdrv_pci.c | 3 ++ drivers/pci/pcie/rcec.c | 94 ++++++++++++++++++++++++++++++++++ include/linux/pci.h | 1 + 4 files changed, 100 insertions(+)
drivers/pci/pci.h +2 -0
@@ -472,9 +472,11 @@ static inline void pci_dpc_init(struct pci_dev *pdev) {}#ifdef CONFIG_PCIEPORTBUS void pci_rcec_init (struct pci_dev *dev);void pci_rcec_exit (struct pci_dev *dev); +void pcie_link_rcec (struct pci_dev *rcec);#else static inline void pci_rcec_init (struct pci_dev *dev) {}static inline void pci_rcec_exit (struct pci_dev *dev) {} +static inline void pcie_link_rcec (struct pci_dev *rcec) {}#endif #ifdef CONFIG_PCI_ATS
drivers/pci/pcie/portdrv_pci.c +3 -0
@@ -110,6 +110,9 @@ static int pcie_portdrv_probe(struct pci_dev *dev, (pci_pcie_type(dev) != PCI_EXP_TYPE_RC_EC)))return -ENODEV ; +if (pci_pcie_type (dev) ==PCI_EXP_TYPE_RC_EC ) +pcie_link_rcec (dev); + status =pcie_port_device_register (dev);if (status)return status;
drivers/pci/pcie/rcec.c +94 -0
100 lines not on this page · raw message
include/linux/pci.h +1 -0
@@ -330,6 +330,7 @@ struct pci_dev {#endif #ifdef CONFIG_PCIEPORTBUS struct rcec_ea *rcec_ea;/* RCEC cached endpoint association */ +struct pci_dev *rcec;/* Associated RCEC device */ #endif u8 pcie_cap;/* PCIe capability offset */ u8 msi_cap;/* MSI capability offset */
Signature · 1 line
2.29.2
PATCH v10 13/16 PCI/RCEC: Add RCiEP's linked RCEC to AER/ERR
In reply to Sean V KelleyFrom: Qiuxu Zhuo <[email protected]>
When attempting error recovery for an RCiEP associated with an RCEC device, there needs to be a way to update the Root Error Status, the Uncorrectable Error Status and the Uncorrectable Error Severity of the parent RCEC. In some non-native cases in which there is no OS-visible device associated with the RCiEP, there is nothing to act upon as the firmware is acting before the OS.
Add handling for the linked RCEC in AER/ERR while taking into account non-native cases.
--- drivers/pci/pcie/aer.c | 35 +++++++++++++++++++++++++++-------- drivers/pci/pcie/err.c | 20 ++++++++++---------- 2 files changed, 37 insertions(+), 18 deletions(-)
drivers/pci/pcie/aer.c +27 -8
@@ -1357,29 +1357,48 @@ static int aer_probe(struct pcie_device *dev)*/ static pci_ers_result_t aer_root_reset (struct pci_dev *dev) { +int type =pci_pcie_type (dev);int aer = dev->aer_cap; +struct pci_dev *root;int rc =0 ;u32 reg32; +if (type ==PCI_EXP_TYPE_RC_END ) +/* +* The reset should only clear the Root Error Status +* of the RCEC. Only perform this for the +* native case, i.e., an RCEC is present. +*/ + root = dev->rcec; +else + root = dev; +if (pcie_aer_is_native (dev)) {/* Disable Root's interrupt in response to error messages */ -pci_read_config_dword (dev, aer +PCI_ERR_ROOT_COMMAND , ®32); +pci_read_config_dword (root, aer +PCI_ERR_ROOT_COMMAND , ®32); reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK ; -pci_write_config_dword (dev, aer +PCI_ERR_ROOT_COMMAND , reg32); +pci_write_config_dword (root, aer +PCI_ERR_ROOT_COMMAND , reg32); } - rc =pci_bus_error_reset (dev); -pci_info (dev,"Root Port link has been reset (%d)\n" , rc); +if (type ==PCI_EXP_TYPE_RC_EC || type ==PCI_EXP_TYPE_RC_END ) { +if (pcie_has_flr (root)) { + rc =pcie_flr (root); +pci_info (dev,"has been reset (%d)\n" , rc); + } + }else { + rc =pci_bus_error_reset (root); +pci_info (dev,"Root Port link has been reset (%d)\n" , rc); + }if (pcie_aer_is_native (dev)) {/* Clear Root Error Status */ -pci_read_config_dword (dev, aer +PCI_ERR_ROOT_STATUS , ®32); -pci_write_config_dword (dev, aer +PCI_ERR_ROOT_STATUS , reg32); +pci_read_config_dword (root, aer +PCI_ERR_ROOT_STATUS , ®32); +pci_write_config_dword (root, aer +PCI_ERR_ROOT_STATUS , reg32);/* Enable Root Port's interrupt in response to error messages */ -pci_read_config_dword (dev, aer +PCI_ERR_ROOT_COMMAND , ®32); +pci_read_config_dword (root, aer +PCI_ERR_ROOT_COMMAND , ®32); reg32 |=ROOT_PORT_INTR_ON_MESG_MASK ; -pci_write_config_dword (dev, aer +PCI_ERR_ROOT_COMMAND , reg32); +pci_write_config_dword (root, aer +PCI_ERR_ROOT_COMMAND , reg32); }return rc ?PCI_ERS_RESULT_DISCONNECT :PCI_ERS_RESULT_RECOVERED ;
drivers/pci/pcie/err.c +10 -10
@@ -148,10 +148,10 @@ static int report_resume(struct pci_dev *dev, void *data)/** * pci_walk_bridge - walk bridges potentially AER affected -* @bridge: bridge which may be a Port, an RCEC with associated RCiEPs, -* or an RCiEP associated with an RCEC -* @cb: callback to be called for each device found -* @userdata: arbitrary pointer to be passed to callback +* @bridge bridge which may be an RCEC with associated RCiEPs, +* or a Port. +* @cb callback to be called for each device found +* @userdata arbitrary pointer to be passed to callback. * * If the device provided is a bridge, walk the subordinate bus, including * any bridged devices on buses under this bus. Call the provided callback
@@ -164,8 +164,14 @@ static void pci_walk_bridge(struct pci_dev *bridge, int (*cb)(struct pci_dev *, void *), void *userdata) { +/* +* In a non-native case where there is no OS-visible reporting +* device the bridge will be NULL, i.e., no RCEC, no Downstream Port. +*/ if (bridge->subordinate)pci_walk_bus (bridge->subordinate, cb, userdata); +else if (bridge->rcec) +cb (bridge->rcec, userdata);else cb (bridge, userdata); }
@@ -194,12 +200,6 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,pci_dbg (bridge,"broadcast error_detected message\n" );if (state == pci_channel_io_frozen) {pci_walk_bridge (bridge, report_frozen_detected, &status); -if (type ==PCI_EXP_TYPE_RC_END ) { -pci_warn (dev,"subordinate device reset not possible for RCiEP\n" ); - status =PCI_ERS_RESULT_NONE ; - goto failed; - } - status =reset_subordinates (bridge);if (status !=PCI_ERS_RESULT_RECOVERED ) {pci_warn (bridge,"subordinate device reset failed\n" );
--
2.29.2
Re: [PATCH v10 13/16] PCI/RCEC: Add RCiEP's linked RCEC to AER/ERR
Quoted 57 lines · Sean V Kelley
From: Qiuxu Zhuo <[email protected]>
When attempting error recovery for an RCiEP associated with an RCEC device, there needs to be a way to update the Root Error Status, the Uncorrectable Error Status and the Uncorrectable Error Severity of the parent RCEC. In some non-native cases in which there is no OS-visible device associated with the RCiEP, there is nothing to act upon as the firmware is acting before the OS.
Add handling for the linked RCEC in AER/ERR while taking into account non-native cases.
Co-developed-by Sean V Kelley <[email protected]>Signed-off-by Sean V Kelley <[email protected]>Signed-off-by Qiuxu Zhuo <[email protected]>Signed-off-by Bjorn Helgaas <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>--- drivers/pci/pcie/aer.c | 35 +++++++++++++++++++++++++++-------- drivers/pci/pcie/err.c | 20 ++++++++++---------- 2 files changed, 37 insertions(+), 18 deletions(-)drivers/pci/pcie/aer.c +14
-3@@ -1357,29 +1357,48 @@ static int aer_probe(struct pcie_device *dev)*/ static pci_ers_result_t aer_root_reset (struct pci_dev *dev) { +int type =pci_pcie_type (dev);int aer = dev->aer_cap; +struct pci_dev *root;int rc =0 ;u32 reg32; +if (type ==PCI_EXP_TYPE_RC_END ) +/* +* The reset should only clear the Root Error Status +* of the RCEC. Only perform this for the +* native case, i.e., an RCEC is present. +*/ + root = dev->rcec; +else + root = dev; +if (pcie_aer_is_native (dev)) {/* Disable Root's interrupt in response to error messages */ -pci_read_config_dword (dev, aer +PCI_ERR_ROOT_COMMAND , ®32); +pci_read_config_dword (root, aer +PCI_ERR_ROOT_COMMAND , ®32); reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK ; -pci_write_config_dword (dev, aer +PCI_ERR_ROOT_COMMAND , reg32); +pci_write_config_dword (root, aer +PCI_ERR_ROOT_COMMAND , reg32); } - rc =pci_bus_error_reset (dev);
drivers/pci/pcie/aer.c static int aer_probe(struct pcie_device *dev) · line 1391
Quoted 10 lines
drivers/pci/pcie/aer.c +9
-1-pci_info (dev,"Root Port link has been reset (%d)\n" , rc); +if (type ==PCI_EXP_TYPE_RC_EC || type ==PCI_EXP_TYPE_RC_END ) { +if (pcie_has_flr (root)) { + rc =pcie_flr (root); +pci_info (dev,"has been reset (%d)\n" , rc); + } + }else { + rc =pci_bus_error_reset (root); +pci_info (dev,"Root Port link has been reset (%d)\n" , rc); + }
So this needs to change as I didn’t use the aer = dev->aer_cap from before because I’m checking explicitly for pcie_aer_is_native(). However, we still have the scenario of non-native and root = dev->rcec = NULL. Secondly, for the flr, that should be happening on the dev and that should trump use of the root var anyway.
So I would change it to: (replacing root with dev)
+ if (type == PCI_EXP_TYPE_RC_EC || type == PCI_EXP_TYPE_RC_END) {
+ if (pcie_has_flr(dev)) {
+ rc = pcie_flr(dev);
+ pci_info(dev, "has been reset (%d)\n", rc);
+ }
+ } else {
+ rc = pci_bus_error_reset(dev);
+ pci_info(dev, "Root Port link has been reset (%d)\n", rc);
+ }
Thanks,
Sean
Quoted 74 lines
drivers/pci/pcie/aer.c +4
-4if (pcie_aer_is_native (dev)) {/* Clear Root Error Status */ -pci_read_config_dword (dev, aer +PCI_ERR_ROOT_STATUS , ®32); -pci_write_config_dword (dev, aer +PCI_ERR_ROOT_STATUS , reg32); +pci_read_config_dword (root, aer +PCI_ERR_ROOT_STATUS , ®32); +pci_write_config_dword (root, aer +PCI_ERR_ROOT_STATUS , reg32);/* Enable Root Port's interrupt in response to error messages */ -pci_read_config_dword (dev, aer +PCI_ERR_ROOT_COMMAND , ®32); +pci_read_config_dword (root, aer +PCI_ERR_ROOT_COMMAND , ®32); reg32 |=ROOT_PORT_INTR_ON_MESG_MASK ; -pci_write_config_dword (dev, aer +PCI_ERR_ROOT_COMMAND , reg32); +pci_write_config_dword (root, aer +PCI_ERR_ROOT_COMMAND , reg32); }return rc ?PCI_ERS_RESULT_DISCONNECT :PCI_ERS_RESULT_RECOVERED ;drivers/pci/pcie/err.c +4
-4@@ -148,10 +148,10 @@ static int report_resume(struct pci_dev *dev, void *data)/** * pci_walk_bridge - walk bridges potentially AER affected -* @bridge: bridge which may be a Port, an RCEC with associated RCiEPs, -* or an RCiEP associated with an RCEC -* @cb: callback to be called for each device found -* @userdata: arbitrary pointer to be passed to callback +* @bridge bridge which may be an RCEC with associated RCiEPs, +* or a Port. +* @cb callback to be called for each device found +* @userdata arbitrary pointer to be passed to callback. * * If the device provided is a bridge, walk the subordinate bus,
including
* any bridged devices on buses under this bus. Call the provided
callbackdrivers/pci/pcie/err.c +3
-0@@ -164,8 +164,14 @@ static void pci_walk_bridge(struct pci_dev *bridge, int (*cb)(struct pci_dev *, void *), void *userdata) { +/* +* In a non-native case where there is no OS-visible reporting +* device the bridge will be NULL, i.e., no RCEC, no Downstream Port.
drivers/pci/pcie/err.c +3
-6+*/ if (bridge->subordinate)pci_walk_bus (bridge->subordinate, cb, userdata); +else if (bridge->rcec) +cb (bridge->rcec, userdata);else cb (bridge, userdata); }@@ -194,12 +200,6 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev,pci_dbg (bridge,"broadcast error_detected message\n" );if (state == pci_channel_io_frozen) {pci_walk_bridge (bridge, report_frozen_detected, &status); -if (type ==PCI_EXP_TYPE_RC_END ) { -pci_warn (dev,"subordinate device reset not possible for RCiEP\n"); - status =PCI_ERS_RESULT_NONE ; - goto failed; - } - status =reset_subordinates (bridge);drivers/pci/pcie/err.c +0
-1if (status !=PCI_ERS_RESULT_RECOVERED ) {pci_warn (bridge,"subordinate device reset failed\n" ); --2.29.2
PATCH v10 14/16 PCI/AER: Add pcie_walk_rcec() to RCEC AER handling
In reply to Sean V KelleyRoot Complex Event Collectors (RCEC) appear as peers to Root Ports and also have the AER capability. In addition, actions need to be taken for associated RCiEPs. In such cases the RCECs will need to be walked in order to find and act upon their respective RCiEPs.
Extend the existing ability to link the RCECs with a walking function pcie_walk_rcec(). Add RCEC support to the current AER service driver and attach the AER service driver to the RCEC device.
--- drivers/pci/pci.h | 6 ++++++ drivers/pci/pcie/aer.c | 29 ++++++++++++++++++++++------- drivers/pci/pcie/rcec.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 7 deletions(-)
drivers/pci/pci.h +6 -0
@@ -473,10 +473,16 @@ static inline void pci_dpc_init(struct pci_dev *pdev) {}void pci_rcec_init (struct pci_dev *dev);void pci_rcec_exit (struct pci_dev *dev);void pcie_link_rcec (struct pci_dev *rcec); +void pcie_walk_rcec (struct pci_dev *rcec, +int (*cb)(struct pci_dev *,void *), +void *userdata);#else static inline void pci_rcec_init (struct pci_dev *dev) {}static inline void pci_rcec_exit (struct pci_dev *dev) {}static inline void pcie_link_rcec (struct pci_dev *rcec) {} +static inline void pcie_walk_rcec (struct pci_dev *rcec, +int (*cb)(struct pci_dev *,void *), +void *userdata) {}#endif #ifdef CONFIG_PCI_ATS
drivers/pci/pcie/aer.c +22 -7
@@ -300,7 +300,8 @@ int pci_aer_raw_clear_status(struct pci_dev *dev)return -EIO ; port_type =pci_pcie_type (dev); -if (port_type ==PCI_EXP_TYPE_ROOT_PORT ) { +if (port_type ==PCI_EXP_TYPE_ROOT_PORT || + port_type ==PCI_EXP_TYPE_RC_EC ) {pci_read_config_dword (dev, aer +PCI_ERR_ROOT_STATUS , &status);pci_write_config_dword (dev, aer +PCI_ERR_ROOT_STATUS , status); }
@@ -595,7 +596,8 @@ static umode_t aer_stats_attrs_are_visible(struct kobject *kobj,if ((a == &dev_attr_aer_rootport_total_err_cor.attr || a == &dev_attr_aer_rootport_total_err_fatal.attr || a == &dev_attr_aer_rootport_total_err_nonfatal.attr) && -pci_pcie_type (pdev) !=PCI_EXP_TYPE_ROOT_PORT ) + ((pci_pcie_type (pdev) !=PCI_EXP_TYPE_ROOT_PORT ) && + (pci_pcie_type (pdev) !=PCI_EXP_TYPE_RC_EC )))return 0 ;return a->mode;
@@ -916,7 +918,10 @@ static bool find_source_device(struct pci_dev *parent,if (result)return true; -pci_walk_bus (parent->subordinate, find_device_iter, e_info); +if (pci_pcie_type (parent) ==PCI_EXP_TYPE_RC_EC ) +pcie_walk_rcec (parent, find_device_iter, e_info); +else +pci_walk_bus (parent->subordinate, find_device_iter, e_info);if (!e_info->error_dev_num) {pci_info (parent,"can't find device of ID%04x\n" , e_info->id);
@@ -1053,6 +1058,7 @@ int aer_get_device_error_info(struct pci_dev *dev, struct aer_err_info *info)if (!(info->status & ~info->mask))return 0 ; }else if (pci_pcie_type (dev) ==PCI_EXP_TYPE_ROOT_PORT || +pci_pcie_type (dev) ==PCI_EXP_TYPE_RC_EC ||pci_pcie_type (dev) ==PCI_EXP_TYPE_DOWNSTREAM || info->severity ==AER_NONFATAL ) {
@@ -1205,6 +1211,7 @@ static int set_device_error_reporting(struct pci_dev *dev, void *data)int type =pci_pcie_type (dev);if ((type ==PCI_EXP_TYPE_ROOT_PORT ) || + (type ==PCI_EXP_TYPE_RC_EC ) || (type ==PCI_EXP_TYPE_UPSTREAM ) || (type ==PCI_EXP_TYPE_DOWNSTREAM )) {if (enable)
@@ -1229,9 +1236,12 @@ static void set_downstream_devices_error_reporting(struct pci_dev *dev, {set_device_error_reporting (dev, &enable); -if (!dev->subordinate) -return ; -pci_walk_bus (dev->subordinate, set_device_error_reporting, &enable); +if (pci_pcie_type (dev) ==PCI_EXP_TYPE_RC_EC ) +pcie_walk_rcec (dev, set_device_error_reporting, &enable); +else if (dev->subordinate) +pci_walk_bus (dev->subordinate, set_device_error_reporting, + &enable); + }/**
@@ -1329,6 +1339,11 @@ static int aer_probe(struct pcie_device *dev)struct device *device = &dev->device;struct pci_dev *port = dev->port; +/* Limit to Root Ports or Root Complex Event Collectors */ +if ((pci_pcie_type (port) !=PCI_EXP_TYPE_RC_EC ) && + (pci_pcie_type (port) !=PCI_EXP_TYPE_ROOT_PORT )) +return -ENODEV ; + rpc =devm_kzalloc (device,sizeof (struct aer_rpc ),GFP_KERNEL );if (!rpc)return -ENOMEM ;
@@ -1406,7 +1421,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev)static struct pcie_port_service_driver aerdriver = { .name ="aer" , - .port_type =PCI_EXP_TYPE_ROOT_PORT , + .port_type =PCIE_ANY_PORT , .service =PCIE_PORT_SERVICE_AER , .probe = aer_probe,
drivers/pci/pcie/rcec.c +37 -0
@@ -53,6 +53,18 @@ static int link_rcec_helper(struct pci_dev *dev, void *data)return 0 ; } +static int walk_rcec_helper (struct pci_dev *dev,void *data) +{ +struct walk_rcec_data *rcec_data = data; +struct pci_dev *rcec = rcec_data->rcec; + +if ((pci_pcie_type (dev) ==PCI_EXP_TYPE_RC_END ) && +rcec_assoc_rciep (rcec, dev)) + rcec_data->user_callback (dev, rcec_data->user_data); + +return 0 ; +} +static void walk_rcec (int (*cb)(struct pci_dev *dev,void *data),void *userdata) {
@@ -109,6 +121,31 @@ void pcie_link_rcec(struct pci_dev *rcec)walk_rcec (link_rcec_helper, &rcec_data); } +/** +* 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 callback on each RCiEP found. +* +* If @cb returns anything other than 0, break out. +*/ +void pcie_walk_rcec (struct pci_dev *rcec,int (*cb)(struct pci_dev *,void *), +void *userdata) +{ +struct walk_rcec_data rcec_data; + +if (!rcec->rcec_ea) +return ; + + rcec_data.rcec = rcec; + rcec_data.user_callback = cb; + rcec_data.user_data = userdata; + +walk_rcec (walk_rcec_helper, &rcec_data); +} +void pci_rcec_init (struct pci_dev *dev) {struct rcec_ea *rcec_ea;
Signature · 1 line
2.29.2
PATCH v10 15/16 PCI/PME: Add pcie_walk_rcec() to RCEC PME handling
In reply to Sean V KelleyRoot Complex Event Collectors (RCEC) appear as peers of Root Ports and also have the PME capability. As with AER, there is a need to be able to walk the RCiEPs associated with their RCEC for purposes of acting upon them with callbacks.
Add RCEC support through the use of pcie_walk_rcec() to the current PME service driver and attach the PME service driver to the RCEC device.
--- drivers/pci/pcie/pme.c | 15 +++++++++++---- drivers/pci/pcie/portdrv_core.c | 9 +++------ 2 files changed, 14 insertions(+), 10 deletions(-)
drivers/pci/pcie/pme.c +11 -4
@@ -310,7 +310,10 @@ static int pcie_pme_can_wakeup(struct pci_dev *dev, void *ign)static void pcie_pme_mark_devices (struct pci_dev *port) {pcie_pme_can_wakeup (port,NULL ); -if (port->subordinate) + +if (pci_pcie_type (port) ==PCI_EXP_TYPE_RC_EC ) +pcie_walk_rcec (port, pcie_pme_can_wakeup,NULL ); +else if (port->subordinate)pci_walk_bus (port->subordinate, pcie_pme_can_wakeup,NULL ); }
@@ -320,10 +323,15 @@ static void pcie_pme_mark_devices(struct pci_dev *port)*/ static int pcie_pme_probe (struct pcie_device *srv) { -struct pci_dev *port; +struct pci_dev *port = srv->port;struct pcie_pme_service_data *data;int ret; +/* Limit to Root Ports or Root Complex Event Collectors */ +if ((pci_pcie_type (port) !=PCI_EXP_TYPE_RC_EC ) && + (pci_pcie_type (port) !=PCI_EXP_TYPE_ROOT_PORT )) +return -ENODEV ; + data =kzalloc (sizeof (*data),GFP_KERNEL );if (!data)return -ENOMEM ;
@@ -333,7 +341,6 @@ static int pcie_pme_probe(struct pcie_device *srv) data->srv = srv;set_service_data (srv, data); - port = srv->port;pcie_pme_interrupt_enable (port, false);pcie_clear_root_pme_status (port);
@@ -445,7 +452,7 @@ static void pcie_pme_remove(struct pcie_device *srv)static struct pcie_port_service_driver pcie_pme_driver = { .name ="pcie_pme" , - .port_type =PCI_EXP_TYPE_ROOT_PORT , + .port_type =PCIE_ANY_PORT , .service =PCIE_PORT_SERVICE_PME , .probe = pcie_pme_probe,
drivers/pci/pcie/portdrv_core.c +3 -6
@@ -233,12 +233,9 @@ static int get_port_device_capability(struct pci_dev *dev) }#endif -/* -* Root ports are capable of generating PME too. Root Complex -* Event Collectors can also generate PMEs, but we don't handle -* those yet. -*/ -if (pci_pcie_type (dev) ==PCI_EXP_TYPE_ROOT_PORT && +/* Root Ports and Root Complex Event Collectors may generate PMEs */ +if ((pci_pcie_type (dev) ==PCI_EXP_TYPE_ROOT_PORT || +pci_pcie_type (dev) ==PCI_EXP_TYPE_RC_EC ) && (pcie_ports_native || host->native_pme)) { services |=PCIE_PORT_SERVICE_PME ;
Signature · 1 line
2.29.2
PATCH v10 16/16 PCI/AER: Add RCEC AER error injection support
In reply to Sean V KelleyFrom: Qiuxu Zhuo <[email protected]>
Root Complex Event Collectors (RCEC) appear as peers to Root Ports and may also have the AER capability.
Add RCEC support to the AER error injection driver.
--- drivers/pci/pcie/aer_inject.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/pci/pcie/aer_inject.c +4 -1
@@ -333,8 +333,11 @@ static int aer_inject(struct aer_error_inj *einj)if (!dev)return -ENODEV ; rpdev =pcie_find_root_port (dev); +/* If Root Port not found, try to find an RCEC */ +if (!rpdev) + rpdev = dev->rcec;if (!rpdev) { -pci_err (dev,"Root port not found\n" ); +pci_err (dev,"Neither Root Port nor RCEC found\n" ); ret = -ENODEV ; goto out_put; }
Signature · 1 line
2.29.2