On Mon, Dec 16, 2024 at 06:10:12PM +0200, Ilpo Järvinen wrote: > include/linux/pci.h provides low-level pci_printk() interface that is > only used by AER because it needs to print the same message with > different levels depending on the error severity. No other PCI code > uses that functionality and calls pci_<level>() logging functions > directly with the appropriate level. > > Descope pci_printk() into AER as aer_printk(). > > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx> I applied this patch by itself on pci/aer for v6.15. We also have some work-in-progress on rate limiting errors, which might conflict, but this is simple and shouldn't be hard to reconcile. > --- > drivers/pci/pcie/aer.c | 10 +++++++--- > include/linux/pci.h | 3 --- > 2 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c > index 80c5ba8d8296..bfc6b94dad4d 100644 > --- a/drivers/pci/pcie/aer.c > +++ b/drivers/pci/pcie/aer.c > @@ -17,6 +17,7 @@ > > #include <linux/bitops.h> > #include <linux/cper.h> > +#include <linux/dev_printk.h> > #include <linux/pci.h> > #include <linux/pci-acpi.h> > #include <linux/sched.h> > @@ -35,6 +36,9 @@ > #include "../pci.h" > #include "portdrv.h" > > +#define aer_printk(level, pdev, fmt, arg...) \ > + dev_printk(level, &(pdev)->dev, fmt, ##arg) > + > #define AER_ERROR_SOURCES_MAX 128 > > #define AER_MAX_TYPEOF_COR_ERRS 16 /* as per PCI_ERR_COR_STATUS */ > @@ -692,7 +696,7 @@ 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, > + aer_printk(level, dev, " [%2d] %-22s%s\n", i, errmsg, > info->first_error == i ? " (First)" : ""); > } > pci_dev_aer_stats_incr(dev, info); > @@ -715,11 +719,11 @@ 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_printk(level, dev, "PCIe Bus Error: severity=%s, type=%s, (%s)\n", > 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", > + aer_printk(level, dev, " device [%04x:%04x] error status/mask=%08x/%08x\n", > dev->vendor, dev->device, info->status, info->mask); > > __aer_print_error(dev, info); > diff --git a/include/linux/pci.h b/include/linux/pci.h > index db9b47ce3eef..02d23e795915 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -2685,9 +2685,6 @@ void pci_uevent_ers(struct pci_dev *pdev, enum pci_ers_result err_type); > > #include <linux/dma-mapping.h> > > -#define pci_printk(level, pdev, fmt, arg...) \ > - dev_printk(level, &(pdev)->dev, fmt, ##arg) > - > #define pci_emerg(pdev, fmt, arg...) dev_emerg(&(pdev)->dev, fmt, ##arg) > #define pci_alert(pdev, fmt, arg...) dev_alert(&(pdev)->dev, fmt, ##arg) > #define pci_crit(pdev, fmt, arg...) dev_crit(&(pdev)->dev, fmt, ##arg) > -- > 2.39.5 >
