On Thu, 22 May 2025, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelg...@google.com>
>
> aer_print_error() produces output at a printk level (KERN_ERR/KERN_WARNING/
> etc) that depends on the kind of error, and it calls pcie_print_tlp_log(),
> which previously always produced output at KERN_ERR.
>
> Add a "level" parameter so aer_print_error() can control the level of the
> pcie_print_tlp_log() output to match.
>
> Signed-off-by: Bjorn Helgaas <bhelg...@google.com>
> ---
> drivers/pci/pci.h | 3 ++-
> drivers/pci/pcie/aer.c | 5 +++--
> drivers/pci/pcie/dpc.c | 2 +-
> drivers/pci/pcie/tlp.c | 6 ++++--
> 4 files changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
> index 705f9ef58acc..1a9bfc708757 100644
> --- a/drivers/pci/pci.h
> +++ b/drivers/pci/pci.h
> @@ -613,7 +613,8 @@ int pcie_read_tlp_log(struct pci_dev *dev, int where, int
> where2,
> 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);
> + const struct pcie_tlp_log *log, const char *level,
> + const char *pfx);
> #endif /* CONFIG_PCIEAER */
>
> #ifdef CONFIG_PCIEPORTBUS
> diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
> index f80c78846a14..f0936759ba8b 100644
> --- a/drivers/pci/pcie/aer.c
> +++ b/drivers/pci/pcie/aer.c
> @@ -734,7 +734,7 @@ void aer_print_error(struct pci_dev *dev, struct
> aer_err_info *info)
> __aer_print_error(dev, info);
>
> if (info->tlp_header_valid)
> - pcie_print_tlp_log(dev, &info->tlp, dev_fmt(" "));
> + pcie_print_tlp_log(dev, &info->tlp, level, dev_fmt(" "));
>
> out:
> if (info->id && info->error_dev_num > 1 && info->id == id)
> @@ -797,7 +797,8 @@ void pci_print_aer(struct pci_dev *dev, int aer_severity,
> aer->uncor_severity);
>
> if (tlp_header_valid)
> - pcie_print_tlp_log(dev, &aer->header_log, dev_fmt(" "));
> + pcie_print_tlp_log(dev, &aer->header_log, info.level,
> + dev_fmt(" "));
> }
> EXPORT_SYMBOL_NS_GPL(pci_print_aer, "CXL");
>
> diff --git a/drivers/pci/pcie/dpc.c b/drivers/pci/pcie/dpc.c
> index 6c98fabdba57..7ae1590ea1da 100644
> --- a/drivers/pci/pcie/dpc.c
> +++ b/drivers/pci/pcie/dpc.c
> @@ -222,7 +222,7 @@ static void dpc_process_rp_pio_error(struct pci_dev *pdev)
> dpc_tlp_log_len(pdev),
> pdev->subordinate->flit_mode,
> &tlp_log);
> - pcie_print_tlp_log(pdev, &tlp_log, dev_fmt(""));
> + pcie_print_tlp_log(pdev, &tlp_log, KERN_ERR, dev_fmt(""));
>
> if (pdev->dpc_rp_log_size < PCIE_STD_NUM_TLP_HEADERLOG + 1)
> goto clear_status;
> diff --git a/drivers/pci/pcie/tlp.c b/drivers/pci/pcie/tlp.c
> index 890d5391d7f5..71f8fc9ea2ed 100644
> --- a/drivers/pci/pcie/tlp.c
> +++ b/drivers/pci/pcie/tlp.c
> @@ -98,12 +98,14 @@ int pcie_read_tlp_log(struct pci_dev *dev, int where, int
> where2,
> * pcie_print_tlp_log - Print TLP Header / Prefix Log contents
> * @dev: PCIe device
> * @log: TLP Log structure
> + * @level: Printk log level
> * @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)
> + const struct pcie_tlp_log *log, const char *level,
> + const char *pfx)
> {
> /* EE_PREFIX_STR fits the extended DW space needed for the Flit mode */
> char buf[11 * PCIE_STD_MAX_TLP_HEADERLOG + 1];
> @@ -130,6 +132,6 @@ void pcie_print_tlp_log(const struct pci_dev *dev,
> }
> }
>
> - pci_err(dev, "%sTLP Header%s: %s\n", pfx,
> + dev_printk(level, &dev->dev, "%sTLP Header%s: %s\n", pfx,
> log->flit ? " (Flit)" : "", buf);
> }
>
Reviewed-by: Ilpo Järvinen <ilpo.jarvi...@linux.intel.com>
--
i.
