PCI: Consolidate TLP Log reading and printing
Subsystems (2)
v7 cover PCI: Consolidate TLP Log reading and printing
This series has the remaining patches of the AER & DPC TLP Log handling consolidation and now includes a few minor improvements to the earlier accepted TLP Logging code.
I only now realized the last patch will conflict with my pci_printk() cleanups series. I'm sorry for the extra hassle.
v7:
- Explain in commit message reasoning why eetlp_prefix_max stores Max End-End TLP Prefixes value instead of limiting it by the bridge/RP imposed limits
- Take account TLP Prefix Log Present flag.
- Align PCI_ERR_CAP_* flags in pci_regs.h
- Add EE_PREFIX_STR define to be able to take its sizeof() for output char[] sizing.
v6:
- Preserve "AER:"/"DPC:" prefix on the printed TLP line
- New patch to add "AER:" also on other lines of the AER error dump
v5:
- Fix build with AER=y and DPC=n
- Match kerneldoc and function parameter name
v4:
- Added patches:
- Remove EXPORT of pcie_read_tlp_log()
- Moved code to pcie/tlp.c and build only with AER enabled
- Match variables in prototype and function
- int -> unsigned int conversion
- eetlp_prefix_max into own patch
- struct pcie_tlp_log param consistently called "log" within tlp.c
- Moved function prototypes into drivers/pci/pci.h
- Describe AER/DPC differences more clearly in one commit message
v3:
- Small rewording in a commit message
v2:
- Don't add EXPORT()s
- Don't include igxbe changes
- Don't use pr_cont() as it's incompatible with pci_err() and according to Andy Shevchenko should not be used in the first place
Ilpo Järvinen (8):
PCI: Don't expose pcie_read_tlp_log() outside of PCI subsystem
PCI: Move TLP Log handling to own file
PCI: Make pcie_read_tlp_log() signature same
PCI: Use unsigned int i in pcie_read_tlp_log()
PCI: Store # of supported End-End TLP Prefixes
PCI: Add TLP Prefix reading into pcie_read_tlp_log()
PCI: Create helper to print TLP Header and Prefix Log PCI/AER: Add prefixes to printouts
drivers/pci/ats.c | 2 +- drivers/pci/pci.c | 28 --------- drivers/pci/pci.h | 9 +++ drivers/pci/pcie/Makefile | 2 +- drivers/pci/pcie/aer.c | 27 ++++---- drivers/pci/pcie/dpc.c | 14 ++--- drivers/pci/pcie/tlp.c | 112 ++++++++++++++++++++++++++++++++++ drivers/pci/probe.c | 14 +++-- include/linux/aer.h | 3 +- include/linux/pci.h | 2 +- include/uapi/linux/pci_regs.h | 11 ++-- 11 files changed, 158 insertions(+), 66 deletions(-) create mode 100644 drivers/pci/pcie/tlp.c
Signature · 1 line
2.39.5
PATCH v7 1/8 PCI: Don't expose pcie_read_tlp_log() outside of PCI subsystem
pcie_read_tlp_log() was exposed by the commit 0a5a46a6a61b ("PCI/AER:
Generalize TLP Header Log reading") but this is now considered a mistake. No drivers outside of PCI subsystem should build their own diagnostic logging but should rely on PCI core doing it for them.
There's currently one driver (ixgbe) doing it independently which was the initial reason why the export was added but it was decided by the PCI maintainer that it's something that should be eliminated.
Remove the unwanted EXPORT of pcie_read_tlp_log() and remove it from include/linux/aer.h.
--- drivers/pci/pci.c | 1 - drivers/pci/pci.h | 4 ++++ include/linux/aer.h | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-)
drivers/pci/pci.c +0 -1
@@ -1125,7 +1125,6 @@ int pcie_read_tlp_log(struct pci_dev *dev, int where,return 0 ; } -EXPORT_SYMBOL_GPL (pcie_read_tlp_log);/** * pci_restore_bars - restore a device's BAR values (e.g. after wake-up)
drivers/pci/pci.h +4 -0
@@ -4,6 +4,8 @@#include <linux/pci.h> +struct pcie_tlp_log ; +/* Number of possible devfns: 0.0 to 1f.7 inclusive */ #define MAX_NR_DEVFNS 256
@@ -549,6 +551,8 @@ 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 */ +int pcie_read_tlp_log (struct pci_dev *dev,int where,struct pcie_tlp_log *log); +#ifdef CONFIG_PCIEPORTBUS /* Cached RCEC Endpoint Association */ struct rcec_ea {
include/linux/aer.h +0 -2
@@ -37,8 +37,6 @@ struct aer_capability_regs {u16 uncor_err_source; }; -int pcie_read_tlp_log (struct pci_dev *dev,int where,struct pcie_tlp_log *log); -#if defined(CONFIG_PCIEAER )int pci_aer_clear_nonfatal_status (struct pci_dev *dev);int pcie_aer_is_native (struct pci_dev *dev);
Signature · 1 line
2.39.5
PATCH v7 2/8 PCI: Move TLP Log handling to own file
In reply to Ilpo JärvinenTLP Log is PCIe feature and is processed only by AER and DPC. Configwise, DPC depends AER being enabled. In lack of better place, the TLP Log handling code was initially placed into pci.c but it can be easily placed in a separate file.
Move TLP Log handling code to own file under pcie/ subdirectory and include it only when AER is enabled.
--- drivers/pci/pci.c | 27 --------------------------- drivers/pci/pci.h | 2 +- drivers/pci/pcie/Makefile | 2 +- drivers/pci/pcie/tlp.c | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 29 deletions(-) create mode 100644 drivers/pci/pcie/tlp.c
drivers/pci/pci.c +0 -27
@@ -1099,33 +1099,6 @@ static void pci_enable_acs(struct pci_dev *dev)pci_write_config_word (dev, pos +PCI_ACS_CTRL , caps.ctrl); } -/** -* pcie_read_tlp_log - read TLP Header Log -* @dev: PCIe device -* @where: PCI Config offset of TLP Header Log -* @tlp_log: TLP Log structure to fill -* -* Fill @tlp_log from TLP Header Log registers, e.g., AER or DPC. -* -* Return: 0 on success and filled TLP Log structure, <0 on error. -*/ -int pcie_read_tlp_log (struct pci_dev *dev,int where, -struct pcie_tlp_log *tlp_log) -{ -int i, ret; - -memset (tlp_log,0 ,sizeof (*tlp_log)); - -for (i =0 ; i <4 ; i++) { - ret =pci_read_config_dword (dev, where + i *4 , - &tlp_log->dw[i]); -if (ret) -return pcibios_err_to_errno (ret); - } - -return 0 ; -} -/** * pci_restore_bars - restore a device's BAR values (e.g. after wake-up) * @dev: PCI device to have its BARs restored
drivers/pci/pci.h +1 -1
@@ -549,9 +549,9 @@ struct aer_err_info {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 */ int pcie_read_tlp_log (struct pci_dev *dev,int where,struct pcie_tlp_log *log); +#endif /* CONFIG_PCIEAER */ #ifdef CONFIG_PCIEPORTBUS /* Cached RCEC Endpoint Association */
drivers/pci/pcie/Makefile +1 -1
@@ -7,7 +7,7 @@ pcieportdrv-y := portdrv.o rcec.o obj-$(CONFIG_PCIEPORTBUS) += pcieportdrv.o bwctrl.o obj-y += aspm.o -obj-$(CONFIG_PCIEAER) += aer.o err.o +obj-$(CONFIG_PCIEAER) += aer.o err.o tlp.o obj-$(CONFIG_PCIEAER_INJECT) += aer_inject.o obj-$(CONFIG_PCIE_PME) += pme.o obj-$(CONFIG_PCIE_DPC) += dpc.o
drivers/pci/pcie/tlp.c new file +39 -0
@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* PCIe TLP Log handling +* +* Copyright (C) 2024 Intel Corporation +*/ + +#include <linux/aer.h> +#include <linux/pci.h> +#include <linux/string.h> + +#include "../pci.h" + +/** +* pcie_read_tlp_log - read TLP Header Log +* @dev: PCIe device +* @where: PCI Config offset of TLP Header Log +* @tlp_log: TLP Log structure to fill +* +* Fill @tlp_log from TLP Header Log registers, e.g., AER or DPC. +* +* Return: 0 on success and filled TLP Log structure, <0 on error. +*/ +int pcie_read_tlp_log (struct pci_dev *dev,int where, +struct pcie_tlp_log *tlp_log) +{ +int i, ret; + +memset (tlp_log,0 ,sizeof (*tlp_log)); + +for (i =0 ; i <4 ; i++) { + ret =pci_read_config_dword (dev, where + i *4 , + &tlp_log->dw[i]); +if (ret) +return pcibios_err_to_errno (ret); + } + +return 0 ; +}
Signature · 1 line
2.39.5
PATCH v7 3/8 PCI: Make pcie_read_tlp_log() signature same
In reply to Ilpo Järvinenpcie_read_tlp_log()'s prototype and function signature diverged due to changes made while applying.
Make the parameters of pcie_read_tlp_log() named identically.
--- drivers/pci/pcie/tlp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/pci/pcie/tlp.c +5 -6
@@ -15,22 +15,21 @@* pcie_read_tlp_log - read TLP Header Log * @dev: PCIe device * @where: PCI Config offset of TLP Header Log -* @tlp_log: TLP Log structure to fill +* @log: TLP Log structure to fill * -* Fill @tlp_log from TLP Header Log registers, e.g., AER or DPC. +* Fill @log from TLP Header Log registers, e.g., AER or DPC. * * Return: 0 on success and filled TLP Log structure, <0 on error. */ int pcie_read_tlp_log (struct pci_dev *dev,int where, -struct pcie_tlp_log *tlp_log) +struct pcie_tlp_log *log) {int i, ret; -memset (tlp_log,0 ,sizeof (*tlp_log)); +memset (log,0 ,sizeof (*log));for (i =0 ; i <4 ; i++) { - ret =pci_read_config_dword (dev, where + i *4 , - &tlp_log->dw[i]); + ret =pci_read_config_dword (dev, where + i *4 , &log->dw[i]);if (ret)return pcibios_err_to_errno (ret); }
Signature · 1 line
2.39.5
PATCH v7 4/8 PCI: Use unsigned int i in pcie_read_tlp_log()
In reply to Ilpo JärvinenLoop variable i counting from 0 upwards does not need to be signed so make it unsigned int.
--- drivers/pci/pcie/tlp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pci/pcie/tlp.c +2 -1
@@ -24,7 +24,8 @@int pcie_read_tlp_log (struct pci_dev *dev,int where,struct pcie_tlp_log *log) { -int i, ret; +unsigned int i; +int ret;memset (log,0 ,sizeof (*log));
Signature · 1 line
2.39.5
PATCH v7 5/8 PCI: Store # of supported End-End TLP Prefixes
In reply to Ilpo Järvineneetlp_prefix_path in the struct pci_dev tells if End-End TLP Prefixes are supported by the path or not, the value is only calculated if CONFIG_PCI_PASID is set.
The Max End-End TLP Prefixes field in the Device Capabilities Register 2 also tells how many (1-4) End-End TLP Prefixes are supported (PCIe r6.2 sec 7.5.3.15). The number of supported End-End Prefixes is useful for reading correct number of DWORDs from TLP Prefix Log register in AER capability (PCIe r6.2 sec 7.8.4.12).
Replace eetlp_prefix_path with eetlp_prefix_max and determine the number of supported End-End Prefixes regardless of CONFIG_PCI_PASID so that an upcoming commit generalizing TLP Prefix Log register reading does not have to read extra DWORDs for End-End Prefixes that never will be there.
The value stored into eetlp_prefix_max is directly derived from device's Max End-End TLP Prefixes and does not consider limitations imposed by bridges or the Root Port beyond supported/not supported flags. This is intentional for two reasons:
1) PCIe r6.2 spec sections r6.1 2.2.10.4 & 6.2.4.4 indicate that TLP is handled malformed only if the number of prefixes exceed the number of Max End-End TLP Prefixes, which seems to be the case even if the device could never receive that many prefixes due to smaller maximum imposed by a bridge or the Root Port. If TLP parsing is later added, this distinction is significant in interpreting what is logged by the TLP Prefix Log registers and the value matching to the Malformed TLP threshold is going to be more useful.
2) TLP Prefix handling happens autonomously on a low layer and the value in eetlp_prefix_max is not programmed anywhere by the kernel (i.e., there is no limiter OS can control to prevent sending more than n TLP Prefixes).
--- drivers/pci/ats.c | 2 +- drivers/pci/probe.c | 14 +++++++++----- include/linux/pci.h | 2 +- include/uapi/linux/pci_regs.h | 1 + 4 files changed, 12 insertions(+), 7 deletions(-)
drivers/pci/ats.c +1 -1
@@ -410,7 +410,7 @@ int pci_enable_pasid(struct pci_dev *pdev, int features)if (WARN_ON (pdev->pasid_enabled))return -EBUSY ; -if (!pdev->eetlp_prefix_path && !pdev->pasid_no_tlp) +if (!pdev->eetlp_prefix_max && !pdev->pasid_no_tlp)return -EINVAL ;if (!pasid)
drivers/pci/probe.c +9 -5
@@ -2251,8 +2251,8 @@ static void pci_configure_relaxed_ordering(struct pci_dev *dev)static void pci_configure_eetlp_prefix (struct pci_dev *dev) { -#ifdef CONFIG_PCI_PASID struct pci_dev *bridge; +unsigned int eetlp_max;int pcie_type;u32 cap;
@@ -2264,15 +2264,19 @@ static void pci_configure_eetlp_prefix(struct pci_dev *dev)return ; pcie_type =pci_pcie_type (dev); + + eetlp_max =FIELD_GET (PCI_EXP_DEVCAP2_EE_PREFIX_MAX , cap); +/* 00b means 4 */ + eetlp_max = eetlp_max ?:4 ; +if (pcie_type ==PCI_EXP_TYPE_ROOT_PORT || pcie_type ==PCI_EXP_TYPE_RC_END ) - dev->eetlp_prefix_path =1 ; + dev->eetlp_prefix_max = eetlp_max;else { bridge =pci_upstream_bridge (dev); -if (bridge && bridge->eetlp_prefix_path) - dev->eetlp_prefix_path =1 ; +if (bridge && bridge->eetlp_prefix_max) + dev->eetlp_prefix_max = eetlp_max; } -#endif }static void pci_configure_serr (struct pci_dev *dev)
include/linux/pci.h +1 -1
@@ -407,7 +407,7 @@ struct pci_dev {supported from root to here */ #endif unsigned int pasid_no_tlp:1; /* PASID works without TLP Prefix */ - unsigned int eetlp_prefix_path:1; /* End-to-End TLP Prefix */ + unsigned int eetlp_prefix_max:3; /* Max # of End-End TLP Prefixes, 0=not supported */pci_channel_state_t error_state;/* Current connectivity state */ struct device dev;/* Generic device interface */
include/uapi/linux/pci_regs.h +1 -0
@@ -665,6 +665,7 @@#define PCI_EXP_DEVCAP2_OBFF_MSG 0x00040000/* New message signaling */ #define PCI_EXP_DEVCAP2_OBFF_WAKE 0x00080000/* Re-use WAKE# for OBFF */ #define PCI_EXP_DEVCAP2_EE_PREFIX 0x00200000/* End-End TLP Prefix */ +#define PCI_EXP_DEVCAP2_EE_PREFIX_MAX 0x00c00000/* Max End-End TLP Prefixes */ #define PCI_EXP_DEVCTL2 0x28/* Device Control 2 */ #define PCI_EXP_DEVCTL2_COMP_TIMEOUT 0x000f/* Completion Timeout Value */ #define PCI_EXP_DEVCTL2_COMP_TMOUT_DIS 0x0010/* Completion Timeout Disable */
Signature · 1 line
2.39.5
PATCH v7 6/8 PCI: Add TLP Prefix reading into pcie_read_tlp_log()
In reply to Ilpo Järvinenpcie_read_tlp_log() handles only 4 Header Log DWORDs but TLP Prefix Log (PCIe r6.1 secs 7.8.4.12 & 7.9.14.13) may also be present.
Generalize pcie_read_tlp_log() and struct pcie_tlp_log to handle also TLP Prefix Log. The relevant registers are formatted identically in AER and DPC Capability, but has these variations:
a) The offsets of TLP Prefix Log registers vary.
b) DPC RP PIO TLP Prefix Log register can be < 4 DWORDs.
c) AER TLP Prefix Log Present (PCIe r6.1 sec 7.8.4.7) can indicate Prefix Log is not present.
Therefore callers must pass the offset of the TLP Prefix Log register and the entire length to pcie_read_tlp_log() to be able to read the correct number of TLP Prefix DWORDs from the correct offset.
--- drivers/pci/pci.h | 5 +++- drivers/pci/pcie/aer.c | 5 +++- drivers/pci/pcie/dpc.c | 13 +++++---- drivers/pci/pcie/tlp.c | 50 +++++++++++++++++++++++++++++++---- include/linux/aer.h | 1 + include/uapi/linux/pci_regs.h | 10 ++++--- 6 files changed, 66 insertions(+), 18 deletions(-)
drivers/pci/pci.h +4 -1
@@ -550,7 +550,9 @@ struct aer_err_info {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); -int pcie_read_tlp_log (struct pci_dev *dev,int where,struct pcie_tlp_log *log); +int pcie_read_tlp_log (struct pci_dev *dev,int where,int where2, +unsigned int tlp_len,struct pcie_tlp_log *log); +unsigned int aer_tlp_log_len (struct pci_dev *dev,u32 aercc);#endif /* CONFIG_PCIEAER */ #ifdef CONFIG_PCIEPORTBUS
@@ -569,6 +571,7 @@ void pci_dpc_init(struct pci_dev *pdev);void dpc_process_error (struct pci_dev *pdev);pci_ers_result_t dpc_reset_link (struct pci_dev *pdev);bool pci_dpc_recovered (struct pci_dev *pdev); +unsigned int dpc_tlp_log_len (struct pci_dev *dev);#else static inline void pci_save_dpc_state (struct pci_dev *dev) { }static inline void pci_restore_dpc_state (struct pci_dev *dev) { }
drivers/pci/pcie/aer.c +4 -1
@@ -1248,7 +1248,10 @@ int aer_get_device_error_info(struct pci_dev *dev, struct aer_err_info *info)if (info->status &AER_LOG_TLP_MASKS ) { info->tlp_header_valid =1 ; -pcie_read_tlp_log (dev, aer +PCI_ERR_HEADER_LOG , &info->tlp); +pcie_read_tlp_log (dev, aer +PCI_ERR_HEADER_LOG , + aer +PCI_ERR_PREFIX_LOG , +aer_tlp_log_len (dev, aercc), + &info->tlp); } }
drivers/pci/pcie/dpc.c +6 -7
@@ -190,7 +190,7 @@ pci_ers_result_t dpc_reset_link(struct pci_dev *pdev)static void dpc_process_rp_pio_error (struct pci_dev *pdev) {u16 cap = pdev->dpc_cap, dpc_status, first_error; -u32 status, mask, sev, syserr, exc, log, prefix; +u32 status, mask, sev, syserr, exc, log;struct pcie_tlp_log tlp_log;int i;
@@ -217,20 +217,19 @@ static void dpc_process_rp_pio_error(struct pci_dev *pdev)if (pdev->dpc_rp_log_size <4 ) goto clear_status; -pcie_read_tlp_log (pdev, cap +PCI_EXP_DPC_RP_PIO_HEADER_LOG , &tlp_log); +pcie_read_tlp_log (pdev, cap +PCI_EXP_DPC_RP_PIO_HEADER_LOG , + cap +PCI_EXP_DPC_RP_PIO_TLPPREFIX_LOG , +dpc_tlp_log_len (pdev), &tlp_log);pci_err (pdev,"TLP Header: %#010x %#010x %#010x %#010x\n" , tlp_log.dw[0 ], tlp_log.dw[1 ], tlp_log.dw[2 ], tlp_log.dw[3 ]); +for (i =0 ; i < pdev->dpc_rp_log_size -5 ; i++) +pci_err (pdev,"TLP Prefix Header: dw%d, %#010x\n" , i, tlp_log.prefix[i]);if (pdev->dpc_rp_log_size <5 ) goto clear_status;pci_read_config_dword (pdev, cap +PCI_EXP_DPC_RP_PIO_IMPSPEC_LOG , &log);pci_err (pdev,"RP PIO ImpSpec Log %#010x\n" , log); -for (i =0 ; i < pdev->dpc_rp_log_size -5 ; i++) { -pci_read_config_dword (pdev, - cap +PCI_EXP_DPC_RP_PIO_TLPPREFIX_LOG + i *4 , &prefix); -pci_err (pdev,"TLP Prefix Header: dw%d, %#010x\n" , i, prefix); - } clear_status:pci_write_config_dword (pdev, cap +PCI_EXP_DPC_RP_PIO_STATUS , status); }
drivers/pci/pcie/tlp.c +45 -5
71 lines not on this page · raw message
include/linux/aer.h +1 -0
@@ -20,6 +20,7 @@ struct pci_dev;struct pcie_tlp_log {u32 dw[4 ]; +u32 prefix[4 ]; };struct aer_capability_regs {
include/uapi/linux/pci_regs.h +6 -4
@@ -790,10 +790,11 @@/* Same bits as above */ #define PCI_ERR_CAP 0x18/* Advanced Error Capabilities & Ctrl*/ #define PCI_ERR_CAP_FEP (x) ((x) & 0x1f)/* First Error Pointer */ -#define PCI_ERR_CAP_ECRC_GENC 0x00000020/* ECRC Generation Capable */ -#define PCI_ERR_CAP_ECRC_GENE 0x00000040/* ECRC Generation Enable */ -#define PCI_ERR_CAP_ECRC_CHKC 0x00000080/* ECRC Check Capable */ -#define PCI_ERR_CAP_ECRC_CHKE 0x00000100/* ECRC Check Enable */ +#define PCI_ERR_CAP_ECRC_GENC 0x00000020/* ECRC Generation Capable */ +#define PCI_ERR_CAP_ECRC_GENE 0x00000040/* ECRC Generation Enable */ +#define PCI_ERR_CAP_ECRC_CHKC 0x00000080/* ECRC Check Capable */ +#define PCI_ERR_CAP_ECRC_CHKE 0x00000100/* ECRC Check Enable */ +#define PCI_ERR_CAP_PREFIX_LOG_PRESENT 0x00000800/* TLP Prefix Log Present */ #define PCI_ERR_HEADER_LOG 0x1c/* Header Log Register (16 bytes) */ #define PCI_ERR_ROOT_COMMAND 0x2c/* Root Error Command */ #define PCI_ERR_ROOT_CMD_COR_EN 0x00000001/* Correctable Err Reporting Enable */
@@ -809,6 +810,7 @@#define PCI_ERR_ROOT_FATAL_RCV 0x00000040/* Fatal Received */ #define PCI_ERR_ROOT_AER_IRQ 0xf8000000/* Advanced Error Interrupt Message Number */ #define PCI_ERR_ROOT_ERR_SRC 0x34/* Error Source Identification */ +#define PCI_ERR_PREFIX_LOG 0x38/* TLP Prefix LOG Register (up to 16 bytes) */ /* Virtual Channel */ #define PCI_VC_PORT_CAP1 0x04
Signature · 1 line
2.39.5
Re: [PATCH v7 6/8] PCI: Add TLP Prefix reading into pcie_read_tlp_log()
Quoted 110 lines · Ilpo Järvinen
pcie_read_tlp_log()handles only 4 Header Log DWORDs but TLP Prefix Log (PCIe r6.1 secs 7.8.4.12 & 7.9.14.13) may also be present.Generalize
pcie_read_tlp_log()and structpcie_tlp_logto handle also TLP Prefix Log. The relevant registers are formatted identically in AER and DPC Capability, but has these variations:a) The offsets of TLP Prefix Log registers vary.
b) DPC RP PIO TLP Prefix Log register can be < 4 DWORDs.
c) AER TLP Prefix Log Present (PCIe r6.1 sec 7.8.4.7) can indicate Prefix Log is not present.Therefore callers must pass the offset of the TLP Prefix Log register and the entire length to
pcie_read_tlp_log()to be able to read the correct number of TLP Prefix DWORDs from the correct offset.Signed-off-by Ilpo Järvinen <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>--- drivers/pci/pci.h | 5 +++- drivers/pci/pcie/aer.c | 5 +++- drivers/pci/pcie/dpc.c | 13 +++++---- drivers/pci/pcie/tlp.c | 50 +++++++++++++++++++++++++++++++---- include/linux/aer.h | 1 + include/uapi/linux/pci_regs.h | 10 ++++--- 6 files changed, 66 insertions(+), 18 deletions(-)drivers/pci/pci.h +4
-1@@ -550,7 +550,9 @@ struct aer_err_info {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); -int pcie_read_tlp_log (struct pci_dev *dev,int where,struct pcie_tlp_log *log); +int pcie_read_tlp_log (struct pci_dev *dev,int where,int where2, +unsigned int tlp_len,struct pcie_tlp_log *log); +unsigned int aer_tlp_log_len (struct pci_dev *dev,u32 aercc);#endif /* CONFIG_PCIEAER */ #ifdef CONFIG_PCIEPORTBUS @@ -569,6 +571,7 @@ void pci_dpc_init(struct pci_dev *pdev);void dpc_process_error (struct pci_dev *pdev);pci_ers_result_t dpc_reset_link (struct pci_dev *pdev);bool pci_dpc_recovered (struct pci_dev *pdev); +unsigned int dpc_tlp_log_len (struct pci_dev *dev);#else static inline void pci_save_dpc_state (struct pci_dev *dev) { }static inline void pci_restore_dpc_state (struct pci_dev *dev) { }drivers/pci/pcie/aer.c +4
-1@@ -1248,7 +1248,10 @@ int aer_get_device_error_info(struct pci_dev *dev, struct aer_err_info *info)if (info->status &AER_LOG_TLP_MASKS ) { info->tlp_header_valid =1 ; -pcie_read_tlp_log (dev, aer +PCI_ERR_HEADER_LOG , &info->tlp); +pcie_read_tlp_log (dev, aer +PCI_ERR_HEADER_LOG , + aer +PCI_ERR_PREFIX_LOG , +aer_tlp_log_len (dev, aercc), + &info->tlp); } }drivers/pci/pcie/dpc.c +6
-7@@ -190,7 +190,7 @@ pci_ers_result_t dpc_reset_link(struct pci_dev *pdev)static void dpc_process_rp_pio_error (struct pci_dev *pdev) {u16 cap = pdev->dpc_cap, dpc_status, first_error; -u32 status, mask, sev, syserr, exc, log, prefix; +u32 status, mask, sev, syserr, exc, log;struct pcie_tlp_log tlp_log;int i;@@ -217,20 +217,19 @@ static void dpc_process_rp_pio_error(struct pci_dev *pdev)if (pdev->dpc_rp_log_size <4 ) goto clear_status; -pcie_read_tlp_log (pdev, cap +PCI_EXP_DPC_RP_PIO_HEADER_LOG , &tlp_log); +pcie_read_tlp_log (pdev, cap +PCI_EXP_DPC_RP_PIO_HEADER_LOG , + cap +PCI_EXP_DPC_RP_PIO_TLPPREFIX_LOG , +dpc_tlp_log_len (pdev), &tlp_log);pci_err (pdev,"TLP Header: %#010x %#010x %#010x %#010x\n" , tlp_log.dw[0 ], tlp_log.dw[1 ], tlp_log.dw[2 ], tlp_log.dw[3 ]); +for (i =0 ; i < pdev->dpc_rp_log_size -5 ; i++) +pci_err (pdev,"TLP Prefix Header: dw%d, %#010x\n" , i, tlp_log.prefix[i]);if (pdev->dpc_rp_log_size <5 ) goto clear_status;pci_read_config_dword (pdev, cap +PCI_EXP_DPC_RP_PIO_IMPSPEC_LOG , &log);pci_err (pdev,"RP PIO ImpSpec Log %#010x\n" , log); -for (i =0 ; i < pdev->dpc_rp_log_size -5 ; i++) { -pci_read_config_dword (pdev, - cap +PCI_EXP_DPC_RP_PIO_TLPPREFIX_LOG + i *4 , &prefix); -pci_err (pdev,"TLP Prefix Header: dw%d, %#010x\n" , i, prefix); - } clear_status:pci_write_config_dword (pdev, cap +PCI_EXP_DPC_RP_PIO_STATUS , status); }drivers/pci/pcie/tlp.c +0
-0
drivers/pci/pcie/tlp.c line 20
Quoted 10 lines
drivers/pci/pcie/tlp.c +7
-0@@ -11,26 +11,66 @@#include "../pci.h" +/** +* aer_tlp_log_len - Calculates AER Capability TLP Header/Prefix Log length +* @dev: PCIe device +* +* Return: TLP Header/Prefix Log length +*/ +unsigned int aer_tlp_log_len (struct pci_dev *dev,u32 aercc)
Hmpf, it seems I forgot to move the @aercc kerneldoc from Flit mode series patch were it was originally added to here when I needed aercc to the PCI_ERR_CAP_PREFIX_LOG_PRESENT check.
I'll send an update in a day or two.
drivers/pci/pcie/tlp.c line 24
Quoted 4 lines
drivers/pci/pcie/tlp.c +4
-0+{ +return 4 + (aercc &PCI_ERR_CAP_PREFIX_LOG_PRESENT ) ? + dev->eetlp_prefix_max :0 ; +}
--
i.
PATCH v7 7/8 PCI: Create helper to print TLP Header and Prefix Log
In reply to Ilpo JärvinenAdd pcie_print_tlp_log() helper to print TLP Header and Prefix Log. Print End-End Prefixes only if they are non-zero.
Consolidate the few places which currently print TLP using custom formatting.
The first attempt used pr_cont() instead of building a string first but it turns out pr_cont() is not compatible with pci_err() and prints on a separate line. When I asked about this, Andy Shevchenko suggested pr_cont() should not be used in the first place (to eventually get rid of it) so pr_cont() is now replaced with building the string first.
--- drivers/pci/pci.h | 2 ++ drivers/pci/pcie/aer.c | 10 ++-------- drivers/pci/pcie/dpc.c | 5 +---- drivers/pci/pcie/tlp.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 12 deletions(-)
drivers/pci/pci.h +2 -0
@@ -553,6 +553,8 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info);int pcie_read_tlp_log (struct pci_dev *dev,int where,int where2,unsigned int tlp_len,struct pcie_tlp_log *log);unsigned int aer_tlp_log_len (struct pci_dev *dev,u32 aercc); +void pcie_print_tlp_log (const struct pci_dev *dev, +const struct pcie_tlp_log *log,const char *pfx);#endif /* CONFIG_PCIEAER */ #ifdef CONFIG_PCIEPORTBUS
drivers/pci/pcie/aer.c +2 -8
@@ -665,12 +665,6 @@ static void pci_rootport_aer_stats_incr(struct pci_dev *pdev, } } -static void __print_tlp_header (struct pci_dev *dev,struct pcie_tlp_log *t) -{ -pci_err (dev," TLP Header: %08x %08x %08x %08x\n" , - t->dw[0 ], t->dw[1 ], t->dw[2 ], t->dw[3 ]); -} -static void __aer_print_error (struct pci_dev *dev,struct aer_err_info *info) {
@@ -725,7 +719,7 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)__aer_print_error (dev, info);if (info->tlp_header_valid) -__print_tlp_header (dev, &info->tlp); +pcie_print_tlp_log (dev, &info->tlp,dev_fmt (" " )); out:if (info->id && info->error_dev_num >1 && info->id == id)
@@ -797,7 +791,7 @@ void pci_print_aer(struct pci_dev *dev, int aer_severity, aer->uncor_severity);if (tlp_header_valid) -__print_tlp_header (dev, &aer->header_log); +pcie_print_tlp_log (dev, &aer->header_log,dev_fmt (" " ));trace_aer_event (dev_name (&dev->dev), (status & ~mask), aer_severity, tlp_header_valid, &aer->header_log);
drivers/pci/pcie/dpc.c +1 -4
@@ -220,10 +220,7 @@ static void dpc_process_rp_pio_error(struct pci_dev *pdev)pcie_read_tlp_log (pdev, cap +PCI_EXP_DPC_RP_PIO_HEADER_LOG , cap +PCI_EXP_DPC_RP_PIO_TLPPREFIX_LOG ,dpc_tlp_log_len (pdev), &tlp_log); -pci_err (pdev,"TLP Header: %#010x %#010x %#010x %#010x\n" , - tlp_log.dw[0 ], tlp_log.dw[1 ], tlp_log.dw[2 ], tlp_log.dw[3 ]); -for (i =0 ; i < pdev->dpc_rp_log_size -5 ; i++) -pci_err (pdev,"TLP Prefix Header: dw%d, %#010x\n" , i, tlp_log.prefix[i]); +pcie_print_tlp_log (pdev, &tlp_log,dev_fmt ("" ));if (pdev->dpc_rp_log_size <5 ) goto clear_status;
drivers/pci/pcie/tlp.c +33 -0
@@ -6,6 +6,7 @@*/ #include <linux/aer.h> +#include <linux/array_size.h> #include <linux/pci.h> #include <linux/string.h>
@@ -77,3 +78,35 @@ int pcie_read_tlp_log(struct pci_dev *dev, int where, int where2,return 0 ; } + +#define EE_PREFIX_STR " E-E Prefixes:" + +/** +* pcie_print_tlp_log - Print TLP Header / Prefix Log contents +* @dev: PCIe device +* @log: TLP Log structure +* @pfx: String prefix +* +* Prints TLP Header and Prefix Log information held by @log. +*/ +void pcie_print_tlp_log (const struct pci_dev *dev, +const struct pcie_tlp_log *log,const char *pfx) +{ +char buf[11 * (4 +ARRAY_SIZE (log->prefix)) +sizeof (EE_PREFIX_STR )]; +unsigned int i; +int len; + + len =scnprintf (buf,sizeof (buf),"%#010x %#010x %#010x %#010x" , + log->dw[0 ], log->dw[1 ], log->dw[2 ], log->dw[3 ]); + +if (log->prefix[0 ]) + len +=scnprintf (buf + len,sizeof (buf) - len,EE_PREFIX_STR ); +for (i =0 ; i <ARRAY_SIZE (log->prefix); i++) { +if (!log->prefix[i]) +break ; + len +=scnprintf (buf + len,sizeof (buf) - len, +" %#010x" , log->prefix[i]); + } + +pci_err (dev,"%sTLP Header: %s\n" , pfx, buf); +}
Signature · 1 line
2.39.5
PATCH v7 8/8 PCI/AER: Add prefixes to printouts
In reply to Ilpo JärvinenOnly part of the AER diagnostic printouts use "AER:" prefix because they use low-level pci_printk() directly to allow selecting level.
Add "AER:" prefix to lines that are printed with pci_printk().
--- drivers/pci/pcie/aer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/pci/pcie/aer.c +6 -6
@@ -686,8 +686,8 @@ static void __aer_print_error(struct pci_dev *dev,if (!errmsg) errmsg ="Unknown Error Bit" ; -pci_printk (level, dev," [%2d] %-22s%s\n" , i, errmsg, - info->first_error == i ?" (First)" :"" ); +pci_printk (level, dev,"%s [%2d] %-22s%s\n" ,dev_fmt ("" ), i, + errmsg, info->first_error == i ?" (First)" :"" ); }pci_dev_aer_stats_incr (dev, info); }
@@ -709,12 +709,12 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info) level = (info->severity ==AER_CORRECTABLE ) ?KERN_WARNING :KERN_ERR ; -pci_printk (level, dev,"PCIe Bus Error: severity=%s, type=%s, (%s)\n" , - aer_error_severity_string[info->severity], +pci_printk (level, dev,"%sPCIe Bus Error: severity=%s, type=%s, (%s)\n" , +dev_fmt ("" ), aer_error_severity_string[info->severity], aer_error_layer[layer], aer_agent_string[agent]); -pci_printk (level, dev," device [%04x:%04x] error status/mask=%08x/%08x\n" , - dev->vendor, dev->device, info->status, info->mask); +pci_printk (level, dev,"%s device [%04x:%04x] error status/mask=%08x/%08x\n" , +dev_fmt ("" ), dev->vendor, dev->device, info->status, info->mask);__aer_print_error (dev, info);
Signature · 1 line
2.39.5
Re: [PATCH v7 8/8] PCI/AER: Add prefixes to printouts
Quoted 5 lines · Ilpo Järvinen
Only part of the AER diagnostic printouts use "AER:" prefix because they use low-level
pci_printk()directly to allow selecting level.Add "AER:" prefix to lines that are printed with
pci_printk().
Can we please include the "HW_ERR" prefix also? IMO, it would make the kernel messages more consistent if all hardware error info had it.
Thanks,
Yazen
Re: [PATCH v7 8/8] PCI/AER: Add prefixes to printouts
Quoted 8 lines · Yazen Ghannam
Quoted 4 lines · Ilpo Järvinen
Only part of the AER diagnostic printouts use "AER:" prefix because they use low-level
pci_printk()directly to allow selecting level.Add "AER:" prefix to lines that are printed with
pci_printk().Can we please include the "
HW_ERR" prefix also? IMO, it would make the kernel messages more consistent if all hardware error info had it.
While I'm not against your suggestion, it doesn't belong into this patch as there are other lines beyond those touched in this patch that would need to have HW_ERR as well.
I think I'll just drop this patch from this series and move it into the pci_printk() series to avoid the inter-series conflict. Adding the HW_ERR change would conflict badly with Karolina Stolarek's series so I'm not sure if I want to pursue that change at this point (it's only my todo list so it won't get forgotten).
Signature · 1 line
i.