| Message ID | 20190503035946.23608-7-fred@fredlawl.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | PCI: Use PCIe service name in dmesg logs | expand |
On Thu, May 02, 2019 at 10:59:43PM -0500, Frederick Lawler wrote: > Prefix dmesg logs with PCIe service name. > > Signed-off-by: Frederick Lawler <fred@fredlawl.com> > --- > drivers/pci/hotplug/pciehp.h | 18 +++++++++--------- > drivers/pci/hotplug/pciehp_core.c | 7 +++++-- > drivers/pci/hotplug/pciehp_ctrl.c | 2 ++ > drivers/pci/hotplug/pciehp_hpc.c | 4 +++- > drivers/pci/hotplug/pciehp_pci.c | 2 ++ > 5 files changed, 21 insertions(+), 12 deletions(-) > > diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h > index 506e1d923a1f..78325c8d961e 100644 > --- a/drivers/pci/hotplug/pciehp.h > +++ b/drivers/pci/hotplug/pciehp.h > @@ -34,27 +34,27 @@ extern bool pciehp_debug; > #define dbg(format, arg...) \ > do { \ > if (pciehp_debug) \ > - printk(KERN_DEBUG "%s: " format, MY_NAME, ## arg); \ > + pr_info(format, ## arg); \ This and > #define ctrl_dbg(ctrl, format, arg...) \ > do { \ > if (pciehp_debug) \ > - dev_printk(KERN_DEBUG, &ctrl->pcie->device, \ > - format, ## arg); \ > + pci_info(ctrl->pcie->port, \ > + format, ## arg); \ this are not like the others. I think replacing the special-purpose pciehp_debug with the generic dynamic debug thing is a good thing, but I'd do it in a separate patch, e.g., - if (pciehp_debug) - printk(KERN_DEBUG ...); + pr_dbg(...); And that patch should also remove the pciehp_debug module parameter and documentation at the same time, of course. And the commit log should include an example of how to turn on these messages, boot with "dyndbg='...'". I don't know what the magic string there needs to be, so it'd be nice to have it in the commit log and in a comment near the dbg() and ctrl_dbg() definitions. > } while (0) > #define ctrl_err(ctrl, format, arg...) \ > - dev_err(&ctrl->pcie->device, format, ## arg) > + pci_err(ctrl->pcie->port, format, ## arg) > #define ctrl_info(ctrl, format, arg...) \ > - dev_info(&ctrl->pcie->device, format, ## arg) > + pci_info(ctrl->pcie->port, format, ## arg) > #define ctrl_warn(ctrl, format, arg...) \ > - dev_warn(&ctrl->pcie->device, format, ## arg) > + pci_warn(ctrl->pcie->port, format, ## arg) > > #define SLOT_NAME_SIZE 10 > > diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c > index fc5366b50e95..7e06a0f9e644 100644 > --- a/drivers/pci/hotplug/pciehp_core.c > +++ b/drivers/pci/hotplug/pciehp_core.c > @@ -17,6 +17,9 @@ > * Dely Sy <dely.l.sy@intel.com>" > */ > > +#define pr_fmt(fmt) "pciehp: " fmt > +#define dev_fmt pr_fmt Can these go in pciehp.h?
On Fri, May 03, 2019 at 03:04:37PM -0500, Bjorn Helgaas wrote: > On Thu, May 02, 2019 at 10:59:43PM -0500, Frederick Lawler wrote: > > +#define pr_fmt(fmt) "pciehp: " fmt > > +#define dev_fmt pr_fmt > > Can these go in pciehp.h? In general, no, it can't. The pr_fmt() / dev_fmt() macro must precede any header inclusion, thus it makes them position dependent. Otherwise, one has to guarantee above by accurately keeping a header inclusion ordering.
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index 506e1d923a1f..78325c8d961e 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h @@ -34,27 +34,27 @@ extern bool pciehp_debug; #define dbg(format, arg...) \ do { \ if (pciehp_debug) \ - printk(KERN_DEBUG "%s: " format, MY_NAME, ## arg); \ + pr_info(format, ## arg); \ } while (0) #define err(format, arg...) \ - printk(KERN_ERR "%s: " format, MY_NAME, ## arg) + pr_err(format, ## arg) #define info(format, arg...) \ - printk(KERN_INFO "%s: " format, MY_NAME, ## arg) + pr_info(format, ## arg) #define warn(format, arg...) \ - printk(KERN_WARNING "%s: " format, MY_NAME, ## arg) + pr_warn(format, ## arg) #define ctrl_dbg(ctrl, format, arg...) \ do { \ if (pciehp_debug) \ - dev_printk(KERN_DEBUG, &ctrl->pcie->device, \ - format, ## arg); \ + pci_info(ctrl->pcie->port, \ + format, ## arg); \ } while (0) #define ctrl_err(ctrl, format, arg...) \ - dev_err(&ctrl->pcie->device, format, ## arg) + pci_err(ctrl->pcie->port, format, ## arg) #define ctrl_info(ctrl, format, arg...) \ - dev_info(&ctrl->pcie->device, format, ## arg) + pci_info(ctrl->pcie->port, format, ## arg) #define ctrl_warn(ctrl, format, arg...) \ - dev_warn(&ctrl->pcie->device, format, ## arg) + pci_warn(ctrl->pcie->port, format, ## arg) #define SLOT_NAME_SIZE 10 diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index fc5366b50e95..7e06a0f9e644 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c @@ -17,6 +17,9 @@ * Dely Sy <dely.l.sy@intel.com>" */ +#define pr_fmt(fmt) "pciehp: " fmt +#define dev_fmt pr_fmt + #include <linux/moduleparam.h> #include <linux/kernel.h> #include <linux/slab.h> @@ -182,14 +185,14 @@ static int pciehp_probe(struct pcie_device *dev) if (!dev->port->subordinate) { /* Can happen if we run out of bus numbers during probe */ - dev_err(&dev->device, + pci_err(dev->port, "Hotplug bridge without secondary bus, ignoring\n"); return -ENODEV; } ctrl = pcie_init(dev); if (!ctrl) { - dev_err(&dev->device, "Controller initialization failed\n"); + pci_err(dev->port, "Controller initialization failed\n"); return -ENODEV; } set_service_data(dev, ctrl); diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c index 3f3df4c29f6e..bf81f977a751 100644 --- a/drivers/pci/hotplug/pciehp_ctrl.c +++ b/drivers/pci/hotplug/pciehp_ctrl.c @@ -13,6 +13,8 @@ * */ +#define dev_fmt(fmt) "pciehp: " fmt + #include <linux/kernel.h> #include <linux/types.h> #include <linux/pm_runtime.h> diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 6a2365cd794e..1713b0b08a5e 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -12,6 +12,8 @@ * Send feedback to <greg@kroah.com>,<kristen.c.accardi@intel.com> */ +#define dev_fmt(fmt) "pciehp: " fmt + #include <linux/kernel.h> #include <linux/types.h> #include <linux/jiffies.h> @@ -233,7 +235,7 @@ static bool pci_bus_check_dev(struct pci_bus *bus, int devfn) } while (delay > 0); if (count > 1 && pciehp_debug) - printk(KERN_DEBUG "pci %04x:%02x:%02x.%d id reading try %d times with interval %d ms to get %08x\n", + pr_info("pci %04x:%02x:%02x.%d id reading try %d times with interval %d ms to get %08x\n", pci_domain_nr(bus), bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn), count, step, l); diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c index b9c1396db6fe..d17f3bf36f70 100644 --- a/drivers/pci/hotplug/pciehp_pci.c +++ b/drivers/pci/hotplug/pciehp_pci.c @@ -13,6 +13,8 @@ * */ +#define dev_fmt(fmt) "pciehp: " fmt + #include <linux/kernel.h> #include <linux/types.h> #include <linux/pci.h>
Prefix dmesg logs with PCIe service name. Signed-off-by: Frederick Lawler <fred@fredlawl.com> --- drivers/pci/hotplug/pciehp.h | 18 +++++++++--------- drivers/pci/hotplug/pciehp_core.c | 7 +++++-- drivers/pci/hotplug/pciehp_ctrl.c | 2 ++ drivers/pci/hotplug/pciehp_hpc.c | 4 +++- drivers/pci/hotplug/pciehp_pci.c | 2 ++ 5 files changed, 21 insertions(+), 12 deletions(-)