On Fri, Feb 14, 2025 at 01:56:47PM +0200, Ilpo Järvinen wrote: > On Thu, 13 Feb 2025, Bjorn Helgaas wrote: > > 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. > > > 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) > > Both shpchp and aer do use pci_printk() before this series (it seems LKP > has also catched it already). > > If you split this series into different branches, this removal of > pci_printk() has to be postponed until the next kernel release (fine for > me if that's what you want to do, just remove this part from this patch > and perhaps adjust the commit message to say it's to prepare for removal > of the pci_printk()). OK. I dropped the pci_printk() removal for now. I'm anticipating more AER changes this cycle, so I'm trying to keep those isolated. Bjorn