lkml.org 
[lkml]   [2019]   [May]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH v2 6/9] PCI: hotplug: Prefix dmesg logs with PCIe service name
    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?

    \
     
     \ /
      Last update: 2019-05-03 22:05    [W:3.711 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site