From patchwork Fri May 3 03:59:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederick Lawler X-Patchwork-Id: 10927893 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 91CFB1398 for ; Fri, 3 May 2019 04:00:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7FFC927D4A for ; Fri, 3 May 2019 04:00:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 715F227E5A; Fri, 3 May 2019 04:00:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82D2A27D4A for ; Fri, 3 May 2019 04:00:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726475AbfECEAc (ORCPT ); Fri, 3 May 2019 00:00:32 -0400 Received: from mail-ot1-f68.google.com ([209.85.210.68]:33607 "EHLO mail-ot1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726462AbfECEAc (ORCPT ); Fri, 3 May 2019 00:00:32 -0400 Received: by mail-ot1-f68.google.com with SMTP id s11so4181736otp.0 for ; Thu, 02 May 2019 21:00:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fredlawl-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bemVwThYo9q0n2DK440xU+X442vQzc77GP4hVe0jJ4E=; b=MnuOKR7uG7pcPWkW0rMB7/FyUielosvBYmm0XrwCCwnW4LRtq1TtyeVBtpov/f+Oyq 6mgPbXjtka7FR9CM4Ht5ZxnQJsg9oDOzdBV/cgmtMSbJZ1X78/vkNwYVKVmJm0HBKxnJ 9v7y+BwJfVo/FGZjua2oTpKv2boZMR/0ilGGA6TaEpJ4vW+JKYKJpdY78BrOUSLsjvxM vtYu4ipowTeu/xdDgl/IkFqkAjkj44aep0VIG1zHfuMQo7zr9pIQRoSp93NHmD4abncR nZMTsl0GE6RdK1d6Z3L2xVfJT0B7/Qlt1/NWBMR1vWbC1l3LwmY5txCHi/WpIJBVq29q 2/cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bemVwThYo9q0n2DK440xU+X442vQzc77GP4hVe0jJ4E=; b=kh6Q1IK9ayH6mrwbf2ddW6a2N775diDOxyaCGv/L7BByDGy3LmxP3xvESggDP4mGSF aJHoWXE2WOmEtQMdwysUOOd2t14WyR3aRjFoH8Ux1lu5/dkXhE6mO3AAoyacj8N9N2Ae ptSUxtZt6TbNrCiZ/oYrdd210qhFQePk/nKkEVNWfb90Ys0tyqvb1HxIrpZBDYC6JK4w d1sPn5vrALGZwY8Rv90WV/yt32o+LM3M52Migdyo6Tt/3e0TKvfLPEjF+G2gk3d9PLMo 6FvBU9F8nepBuvcNcxVzi3ZqnMY7akPzcF9mPcuxj6xrrE1lEb9wUpUiHRSmcvgJOA/6 RIBA== X-Gm-Message-State: APjAAAX1gNopaaoy9kf1HLYS+OtXFkrJdl1tCF3EeBBrNztSbi5b/9uK LJzQOcUCXg9c3s9QBcuWzp/bvg== X-Google-Smtp-Source: APXvYqzevyK5hKzuuX2jq7wn+tEh7BNGFYIuDk83wNoyfY1H+obg1w1W5gHg0HTbDu5owkm/TgdvKQ== X-Received: by 2002:a9d:7cc3:: with SMTP id r3mr3257835otn.44.1556856031210; Thu, 02 May 2019 21:00:31 -0700 (PDT) Received: from linux.fredlawl.com ([2600:1700:18a0:11d0:5518:38b8:ef25:393a]) by smtp.gmail.com with ESMTPSA id m20sm434952otq.30.2019.05.02.21.00.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2019 21:00:30 -0700 (PDT) From: Frederick Lawler To: bhelgaas@google.com Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, mika.westerberg@linux.intel.com, lukas@wunner.de, andriy.shevchenko@linux.intel.com, keith.busch@intel.com, mr.nuke.me@gmail.com, liudongdong3@huawei.com, thesven73@gmail.com, Frederick Lawler Subject: [PATCH v2 6/9] PCI: hotplug: Prefix dmesg logs with PCIe service name Date: Thu, 2 May 2019 22:59:43 -0500 Message-Id: <20190503035946.23608-7-fred@fredlawl.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190503035946.23608-1-fred@fredlawl.com> References: <20190503035946.23608-1-fred@fredlawl.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Prefix dmesg logs with PCIe service name. Signed-off-by: Frederick Lawler --- 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); \ } 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 " */ +#define pr_fmt(fmt) "pciehp: " fmt +#define dev_fmt pr_fmt + #include #include #include @@ -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 #include #include 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 , */ +#define dev_fmt(fmt) "pciehp: " fmt + #include #include #include @@ -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 #include #include