From patchwork Fri May 3 03:59:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederick Lawler X-Patchwork-Id: 10927903 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 E95F01398 for ; Fri, 3 May 2019 04:01:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4E8127E01 for ; Fri, 3 May 2019 04:01:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C800927E71; Fri, 3 May 2019 04:01:06 +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 6E0E127E01 for ; Fri, 3 May 2019 04:01:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725816AbfECEAR (ORCPT ); Fri, 3 May 2019 00:00:17 -0400 Received: from mail-oi1-f196.google.com ([209.85.167.196]:38682 "EHLO mail-oi1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725379AbfECEAQ (ORCPT ); Fri, 3 May 2019 00:00:16 -0400 Received: by mail-oi1-f196.google.com with SMTP id t70so3472038oif.5 for ; Thu, 02 May 2019 21:00:16 -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=rUTSw74gexjNwzq9ZLmaaBHpeJsduJxpcMlGupfmHG4=; b=ZI/oDJADO4rOIoCDUnEV0PbQiau5ydorvrx+xZUz6wqYvpFKXYpKjD09gcXjvLJpdH 2cQCCQkAcf+0n06uPKjdHDUPcXEiKHbg9eHm4XK5AKX46KEiyP+pPzgBnYQefV/+vyFh cKwAIAGh1P4P5VUSJXf4iQx4iVu1ouPvCqcGu2oL9SU61i14VDndeWAEL2v38AtIDuwz NfC49wl8dxQpI9tFDfxwSsZT0qZQ84eYQLUd8B2wLOvZph01gOCgwANcJvzZ1M9yJi2X QFstesEHaDZOYE2n1xzsV0Y0VgXBrnuSBUuBnbB9Zukz/1DEfi6xPsaduTPskGLbajRv KE2w== 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=rUTSw74gexjNwzq9ZLmaaBHpeJsduJxpcMlGupfmHG4=; b=jXUc4VQKGuHGr/DTpfoDzFOldCuLPZJVi47uhGsQr7ApzfcRnCrbJonBGb4gpnlve3 x4yMxjZ9pNMCHC5g+Fdos8dUUvKpfTEdgMIvdqTQ96CnPGRjk6P6rmprDVLCnpNy5qV9 IxEQ/3QcxsHlFdPTgP8nwhGrjosbPeFuZGXASD/xDMEt0kyVOdS+RVe0ogFovtFdkBHC aN7mKVoUiHgHHHqDl/6YfCXqY+ou0rDpcTSiEO8ja9gmckpNGtwllQpSYF32FTvPOVMD sicH/hlNNiGgU+ag2812beSMEgdE924qV6B5y1NjLUp8xC85o3R3SkDOgHSxtjea+hN5 yMOQ== X-Gm-Message-State: APjAAAVc+Gu8sUwMQjEOImz0USFqBDjJoE+vsYy32kUQIGIUzf0wnLyZ glM6D8cr6xBBU0lkVyhP5IVfZg== X-Google-Smtp-Source: APXvYqytlEstswINkPkyIA6Dj4cZY6kaWgFkfd4RiLPYDmMNxSqqtMj7RyWp3JbDg58d1b+iaPcNAA== X-Received: by 2002:aca:5b85:: with SMTP id p127mr4620755oib.90.1556856015507; Thu, 02 May 2019 21:00:15 -0700 (PDT) Received: from linux.fredlawl.com ([2600:1700:18a0:11d0:5518:38b8:ef25:393a]) by smtp.gmail.com with ESMTPSA id 20sm622436oty.58.2019.05.02.21.00.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2019 21:00:14 -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 1/9] PCI/AER: Cleanup dmesg logs Date: Thu, 2 May 2019 22:59:38 -0500 Message-Id: <20190503035946.23608-2-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 Cleanup dmesg logs. Signed-off-by: Frederick Lawler --- drivers/pci/pcie/aer.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index f8fc2114ad39..82eb45335b6f 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -964,8 +964,8 @@ static bool find_source_device(struct pci_dev *parent, pci_walk_bus(parent->subordinate, find_device_iter, e_info); if (!e_info->error_dev_num) { - pci_printk(KERN_DEBUG, parent, "can't find device of ID%04x\n", - e_info->id); + pci_info(parent, "can't find device of ID%04x\n", + e_info->id); return false; } return true; @@ -1380,7 +1380,6 @@ static int aer_probe(struct pcie_device *dev) rpc = devm_kzalloc(device, sizeof(struct aer_rpc), GFP_KERNEL); if (!rpc) { - dev_printk(KERN_DEBUG, device, "alloc AER rpc failed\n"); return -ENOMEM; } rpc->rpd = dev->port; @@ -1389,8 +1388,8 @@ static int aer_probe(struct pcie_device *dev) status = devm_request_threaded_irq(device, dev->irq, aer_irq, aer_isr, IRQF_SHARED, "aerdrv", dev); if (status) { - dev_printk(KERN_DEBUG, device, "request AER IRQ %d failed\n", - dev->irq); + dev_err(device, "request AER IRQ %d failed\n", + dev->irq); return status; } @@ -1419,7 +1418,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev) pci_write_config_dword(dev, pos + PCI_ERR_ROOT_COMMAND, reg32); rc = pci_bus_error_reset(dev); - pci_printk(KERN_DEBUG, dev, "Root Port link has been reset\n"); + pci_info(dev, "Root Port link has been reset\n"); /* Clear Root Error Status */ pci_read_config_dword(dev, pos + PCI_ERR_ROOT_STATUS, ®32); From patchwork Fri May 3 03:59:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederick Lawler X-Patchwork-Id: 10927889 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 62D791515 for ; Fri, 3 May 2019 04:00:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5194527CEE for ; Fri, 3 May 2019 04:00:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3543D27F17; Fri, 3 May 2019 04:00:30 +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 8C27527CEE for ; Fri, 3 May 2019 04:00:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726042AbfECEAT (ORCPT ); Fri, 3 May 2019 00:00:19 -0400 Received: from mail-oi1-f196.google.com ([209.85.167.196]:44443 "EHLO mail-oi1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725813AbfECEAS (ORCPT ); Fri, 3 May 2019 00:00:18 -0400 Received: by mail-oi1-f196.google.com with SMTP id t184so3394696oie.11 for ; Thu, 02 May 2019 21:00:18 -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=ehFlep6RHoGfNzKXt68A98xnVIeOv0Wgz2pAcINSx0w=; b=LVK1/bG0FMi2gOxnOUtEdOrc2NC+ARCm+f2q/4zQN/10NQHVwIdYsz3xLeUZseeH0A lZ5aeqYGQoqLG9yE5KMkS++MjXsy/j1sQz09TwaaALOD2R7QS/hskG6NbVVzlHEJ6Vcx 1OPYo+vsjaQXGksUnrvS3kRu/xxWJCItyTo5C015thwhvXemFz0Kay+yBgotRw/od6oX uZYOsLPIXx1/yNniP1EVU/1Ci/ORc3bc9hVs7uCrn4EGBJpgN/EwiOHzWx5N4OJETk3r d+TeGTlCwuxUvPUmy2EKZVApiz6A82ysFUOv938B9Tzv4FFfPQrwbANFl5eV98nnkK+i 51bQ== 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=ehFlep6RHoGfNzKXt68A98xnVIeOv0Wgz2pAcINSx0w=; b=W3DKo+oF7f5lB5oSJG6DEevHQP73V9QsW6Qb5BZ2Fet7i0voOFKg7daubkn5+ozlKU cprcsqxbniwcQgPJ9SSka+XWoLA2btGWGYHK8VSXGZtbfVUVw9MLLJoFUIKZMbSWZsDZ QGI7MQHqCn0wTjqxLP04n63FkRnKSpWdDH4j8SvhW+nT3Q9P0f95RHAZ7gX3jIv+Zih5 orMd6u9lSj/3a/PtkogM1nttlcDDPOalDykqu65SFMrKW1wgmwL3MSMPNf2aH/z9tEiu Mn1gkdJ1FoCw5B61wz9kw2g/NYmJf3BAGEI9oRU12lLEHerdPXt2gi+xY8Cx/JYBLFV9 3Otg== X-Gm-Message-State: APjAAAX8JCM+qj+rEc5jpc17DAG/pxZVkyuDhvT2tQ1R3nI0ACqTBiHr O5dTfpRpcAvgfBpKfn/5hd3Nsw== X-Google-Smtp-Source: APXvYqwudvvXv9QrPckqhB9/9QIEdpPo75PqFD8VCoGOI3bQltuttSiRozB9BZDZUI1iOVIfENcgEg== X-Received: by 2002:aca:6c47:: with SMTP id h68mr5139285oic.57.1556856017635; Thu, 02 May 2019 21:00:17 -0700 (PDT) Received: from linux.fredlawl.com ([2600:1700:18a0:11d0:5518:38b8:ef25:393a]) by smtp.gmail.com with ESMTPSA id u22sm419161otk.49.2019.05.02.21.00.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2019 21:00:16 -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 2/9] PCI/DPC: Prefix dmesg logs with PCIe service name Date: Thu, 2 May 2019 22:59:39 -0500 Message-Id: <20190503035946.23608-3-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/pcie/dpc.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/drivers/pci/pcie/dpc.c b/drivers/pci/pcie/dpc.c index 7b77754a82de..934391c91c23 100644 --- a/drivers/pci/pcie/dpc.c +++ b/drivers/pci/pcie/dpc.c @@ -6,6 +6,8 @@ * Copyright (C) 2016 Intel Corp. */ +#define dev_fmt(fmt) "DPC: " fmt + #include #include #include @@ -100,7 +102,6 @@ static int dpc_wait_rp_inactive(struct dpc_dev *dpc) { unsigned long timeout = jiffies + HZ; struct pci_dev *pdev = dpc->dev->port; - struct device *dev = &dpc->dev->device; u16 cap = dpc->cap_pos, status; pci_read_config_word(pdev, cap + PCI_EXP_DPC_STATUS, &status); @@ -110,7 +111,7 @@ static int dpc_wait_rp_inactive(struct dpc_dev *dpc) pci_read_config_word(pdev, cap + PCI_EXP_DPC_STATUS, &status); } if (status & PCI_EXP_DPC_RP_BUSY) { - dev_warn(dev, "DPC root port still busy\n"); + pci_warn(pdev, "DPC root port still busy\n"); return -EBUSY; } return 0; @@ -148,7 +149,6 @@ static pci_ers_result_t dpc_reset_link(struct pci_dev *pdev) static void dpc_process_rp_pio_error(struct dpc_dev *dpc) { - struct device *dev = &dpc->dev->device; struct pci_dev *pdev = dpc->dev->port; u16 cap = dpc->cap_pos, dpc_status, first_error; u32 status, mask, sev, syserr, exc, dw0, dw1, dw2, dw3, log, prefix; @@ -156,13 +156,13 @@ static void dpc_process_rp_pio_error(struct dpc_dev *dpc) pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_STATUS, &status); pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_MASK, &mask); - dev_err(dev, "rp_pio_status: %#010x, rp_pio_mask: %#010x\n", + pci_err(pdev, "rp_pio_status: %#010x, rp_pio_mask: %#010x\n", status, mask); pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_SEVERITY, &sev); pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_SYSERROR, &syserr); pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_EXCEPTION, &exc); - dev_err(dev, "RP PIO severity=%#010x, syserror=%#010x, exception=%#010x\n", + pci_err(pdev, "RP PIO severity=%#010x, syserror=%#010x, exception=%#010x\n", sev, syserr, exc); /* Get First Error Pointer */ @@ -171,7 +171,7 @@ static void dpc_process_rp_pio_error(struct dpc_dev *dpc) for (i = 0; i < ARRAY_SIZE(rp_pio_error_string); i++) { if ((status & ~mask) & (1 << i)) - dev_err(dev, "[%2d] %s%s\n", i, rp_pio_error_string[i], + pci_err(pdev, "[%2d] %s%s\n", i, rp_pio_error_string[i], first_error == i ? " (First)" : ""); } @@ -185,18 +185,18 @@ static void dpc_process_rp_pio_error(struct dpc_dev *dpc) &dw2); pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_HEADER_LOG + 12, &dw3); - dev_err(dev, "TLP Header: %#010x %#010x %#010x %#010x\n", + pci_err(pdev, "TLP Header: %#010x %#010x %#010x %#010x\n", dw0, dw1, dw2, dw3); if (dpc->rp_log_size < 5) goto clear_status; pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_IMPSPEC_LOG, &log); - dev_err(dev, "RP PIO ImpSpec Log %#010x\n", log); + pci_err(pdev, "RP PIO ImpSpec Log %#010x\n", log); for (i = 0; i < dpc->rp_log_size - 5; i++) { pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_TLPPREFIX_LOG, &prefix); - dev_err(dev, "TLP Prefix Header: dw%d, %#010x\n", i, prefix); + pci_err(pdev, "TLP Prefix Header: dw%d, %#010x\n", i, prefix); } clear_status: pci_write_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_STATUS, status); @@ -229,18 +229,17 @@ static irqreturn_t dpc_handler(int irq, void *context) struct aer_err_info info; struct dpc_dev *dpc = context; struct pci_dev *pdev = dpc->dev->port; - struct device *dev = &dpc->dev->device; u16 cap = dpc->cap_pos, status, source, reason, ext_reason; pci_read_config_word(pdev, cap + PCI_EXP_DPC_STATUS, &status); pci_read_config_word(pdev, cap + PCI_EXP_DPC_SOURCE_ID, &source); - dev_info(dev, "DPC containment event, status:%#06x source:%#06x\n", + pci_info(pdev, "DPC containment event, status:%#06x source:%#06x\n", status, source); reason = (status & PCI_EXP_DPC_STATUS_TRIGGER_RSN) >> 1; ext_reason = (status & PCI_EXP_DPC_STATUS_TRIGGER_RSN_EXT) >> 5; - dev_warn(dev, "DPC %s detected\n", + pci_warn(pdev, "DPC %s detected\n", (reason == 0) ? "unmasked uncorrectable error" : (reason == 1) ? "ERR_NONFATAL" : (reason == 2) ? "ERR_FATAL" : @@ -307,7 +306,7 @@ static int dpc_probe(struct pcie_device *dev) dpc_handler, IRQF_SHARED, "pcie-dpc", dpc); if (status) { - dev_warn(device, "request IRQ%d failed: %d\n", dev->irq, + pci_warn(pdev, "request IRQ%d failed: %d\n", dev->irq, status); return status; } @@ -319,7 +318,7 @@ static int dpc_probe(struct pcie_device *dev) if (dpc->rp_extensions) { dpc->rp_log_size = (cap & PCI_EXP_DPC_RP_PIO_LOG_SIZE) >> 8; if (dpc->rp_log_size < 4 || dpc->rp_log_size > 9) { - dev_err(device, "RP PIO log size %u is invalid\n", + pci_err(pdev, "RP PIO log size %u is invalid\n", dpc->rp_log_size); dpc->rp_log_size = 0; } @@ -328,11 +327,11 @@ static int dpc_probe(struct pcie_device *dev) ctl = (ctl & 0xfff4) | PCI_EXP_DPC_CTL_EN_FATAL | PCI_EXP_DPC_CTL_INT_EN; pci_write_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_CTL, ctl); - dev_info(device, "DPC error containment capabilities: Int Msg #%d, RPExt%c PoisonedTLP%c SwTrigger%c RP PIO Log %d, DL_ActiveErr%c\n", - cap & PCI_EXP_DPC_IRQ, FLAG(cap, PCI_EXP_DPC_CAP_RP_EXT), - FLAG(cap, PCI_EXP_DPC_CAP_POISONED_TLP), - FLAG(cap, PCI_EXP_DPC_CAP_SW_TRIGGER), dpc->rp_log_size, - FLAG(cap, PCI_EXP_DPC_CAP_DL_ACTIVE)); + pci_info(pdev, "DPC error containment capabilities: Int Msg #%d, RPExt%c PoisonedTLP%c SwTrigger%c RP PIO Log %d, DL_ActiveErr%c\n", + cap & PCI_EXP_DPC_IRQ, FLAG(cap, PCI_EXP_DPC_CAP_RP_EXT), + FLAG(cap, PCI_EXP_DPC_CAP_POISONED_TLP), + FLAG(cap, PCI_EXP_DPC_CAP_SW_TRIGGER), dpc->rp_log_size, + FLAG(cap, PCI_EXP_DPC_CAP_DL_ACTIVE)); pci_add_ext_cap_save_buffer(pdev, PCI_EXT_CAP_ID_DPC, sizeof(u16)); return status; From patchwork Fri May 3 03:59:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederick Lawler X-Patchwork-Id: 10927887 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 481451398 for ; Fri, 3 May 2019 04:00:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34FE827E71 for ; Fri, 3 May 2019 04:00:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 24A3827F10; Fri, 3 May 2019 04:00:30 +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 B749E27D4A for ; Fri, 3 May 2019 04:00:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726041AbfECEAV (ORCPT ); Fri, 3 May 2019 00:00:21 -0400 Received: from mail-oi1-f194.google.com ([209.85.167.194]:43532 "EHLO mail-oi1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725813AbfECEAU (ORCPT ); Fri, 3 May 2019 00:00:20 -0400 Received: by mail-oi1-f194.google.com with SMTP id j9so2711126oie.10 for ; Thu, 02 May 2019 21:00:19 -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=YuWHqWyJ+JP06RXp87S+GiXSAUWX7Ks5BQw57gh+tGk=; b=GZEujWwhMRJwFtd80IdNNMcGZhrNHvNaZZX7gTaAYqA3YN/E9W5VGiG7UdlCXH2b3s eIqNC/5wk26Sy41WqEUjReocbGnnF4GkX7sUhB2N953PxtkkrOg1J1YrDWOXtrmk3nYV YrlPd3nDA5SarFrVu5rYW0UsB4pMQ1DB0kvTaBX5ntuG/6X5+d1eC6/QplkFX67qzWxj 1zguJx34e765vbj7p1PK8rzTaLpxAEM3jjaa8Cpt0SzaXWl6gavE6/PDwbCVIsuB8I4g TVL0/v6WLpZE3W/FbdjzOjGICqVlNBHOgViO5drxoTtFf0d+n04lE79mpiErWvi88LFZ 98Hg== 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=YuWHqWyJ+JP06RXp87S+GiXSAUWX7Ks5BQw57gh+tGk=; b=ILFYI/+5TVc5RXsiVqENcnpC6vK6tJnXUwRJyMr3pHILghNJHQm/c5Gpxxfqv8GLn1 Qx3hpz04O3xnzJBwSuSO/gXu2q/6ayRuWjbsySddoL4Qn5SeYle2d2aGvj8TEZmK7Jyx WeHk8mztoOYgRrtY65SXwIb8xK+qMfkB1SnkfC+j1k2SJ2xZd6j8ibEAFf79NwGnhy3C m25mHlB+ycVAKFISuzPF6Wraht8jmXf5JUze4UFkCrLajXGPXr5ucWVFrwfh8sIWGddr HmUx5lWWcQ5+heaGzR8MxZGOVcjNWJBzj14ZEQe4oqfXaLeavf9EBYaGDJFA8s1ra+Im R6bg== X-Gm-Message-State: APjAAAUc1WHkClgtRe7vAET/uJxaXdFe1UN/phNXHOKmj9wgtX5Ih6pC mnzFKPGktelGaFwjA0bamPYvOA== X-Google-Smtp-Source: APXvYqwqTuUqK/SIef1FttxAcfu0BMnkig8NswvTmUvCK3eoCUT0mnuD/C5o1hlRS51mBDBpdWVnNg== X-Received: by 2002:aca:5203:: with SMTP id g3mr4886547oib.142.1556856019443; Thu, 02 May 2019 21:00:19 -0700 (PDT) Received: from linux.fredlawl.com ([2600:1700:18a0:11d0:5518:38b8:ef25:393a]) by smtp.gmail.com with ESMTPSA id e9sm758897otf.48.2019.05.02.21.00.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2019 21:00:18 -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 3/9] PCI/PME: Prefix dmesg logs with PCIe service name Date: Thu, 2 May 2019 22:59:40 -0500 Message-Id: <20190503035946.23608-4-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/pcie/pme.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/pci/pcie/pme.c b/drivers/pci/pcie/pme.c index 54d593d10396..d6698423a6d6 100644 --- a/drivers/pci/pcie/pme.c +++ b/drivers/pci/pcie/pme.c @@ -7,6 +7,8 @@ * Copyright (C) 2009 Rafael J. Wysocki , Novell Inc. */ +#define dev_fmt(fmt) "PME: " fmt + #include #include #include From patchwork Fri May 3 03:59:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederick Lawler X-Patchwork-Id: 10927891 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 481D092A for ; Fri, 3 May 2019 04:00:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 387EB27D4A for ; Fri, 3 May 2019 04:00:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B5B827E5A; Fri, 3 May 2019 04:00:31 +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 E1DC327E01 for ; Fri, 3 May 2019 04:00:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726261AbfECEAX (ORCPT ); Fri, 3 May 2019 00:00:23 -0400 Received: from mail-oi1-f195.google.com ([209.85.167.195]:38687 "EHLO mail-oi1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725813AbfECEAW (ORCPT ); Fri, 3 May 2019 00:00:22 -0400 Received: by mail-oi1-f195.google.com with SMTP id t70so3472176oif.5 for ; Thu, 02 May 2019 21:00:21 -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=yoA0qcUcZf9hNKPIWW0C4rSDs4LhPQglzx9oFAh3Sp8=; b=PCIU09pTLCDoNBfuGUpnEwF/031Tw8z2XMWTENYF9S2enJJC9C0X9GP97RazgMNftx J6TBwEw1BI93Psj5Fw+9WbYsRWjhAiAMwoF1SBTxWFRmBdt2b2fDMC1CAu6pJl6u9CUk bBaeR5fHRRQQ8ZadgpMzUqYf+1ahLXHpYwsuKWhrVrZWvh+TRaJ8nuhU6hi3RNndaYPN z67KgNqV3la0jAkzrIA130TI32Wx562a5GP+UEUWilbL6JFPvQoWBiDACyxu+uNW1ms8 cro3wAfFUUS1bzig0Lgq1dUivtSZZY2cyAUULOTINeO2agVt9oNDtwvLeiiwtobQPXtd Leog== 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=yoA0qcUcZf9hNKPIWW0C4rSDs4LhPQglzx9oFAh3Sp8=; b=Kl888HVeZkdh0OxZ3iqdgcfkuQsPStc5Lx5NB2STaeKT0q7CX3lHDw+Ur/ZQs3TuId rSApgdxXkabqJzz20nywkgBWZdIwGBtOlSsDldjAr87mFAd8LXm02usC2VThzj2oA2Il HAAlJh7VlUik3qgfE8Rsi1h3Y992tg4nSpjO3+nLLu4D23lO6IfDvAcBmuPoD9o5znrS hd+Ud6exquNwRsckY+1Phb9+UwgwAf+2g1M0Kaivnv2cl/d9mllz0zprpBeQRAwPCcMx MJkbzZkbJ4I/BxaQHxkOyydaeuWWcOotufFrebHVw/psDhgbgw/mOY8i2bqGWJjoV0vL pRGA== X-Gm-Message-State: APjAAAVDmDru2pSBDDYeI3zl5n7Y0ZIv7hR5FHi4HfI1TpT1CGNnDTHW amv8GjyzHMwJjCfDVDFcOqGVMg== X-Google-Smtp-Source: APXvYqzV4giO3K8ryYMsLh3jD9fGBT9x5cgZ/aCBmN7s2tyWpB4CldLG7uLNMfdnn+oxiAcHESSLdg== X-Received: by 2002:aca:4f85:: with SMTP id d127mr4301389oib.123.1556856021605; Thu, 02 May 2019 21:00:21 -0700 (PDT) Received: from linux.fredlawl.com ([2600:1700:18a0:11d0:5518:38b8:ef25:393a]) by smtp.gmail.com with ESMTPSA id w5sm413787otg.34.2019.05.02.21.00.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2019 21:00:20 -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 4/9] PCI/LINK: Prefix dmesg logs with PCIe service name Date: Thu, 2 May 2019 22:59:41 -0500 Message-Id: <20190503035946.23608-5-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 bw_notification.c currently does not have any dmesg logs. As the service continues to expand in functionality, prefix logs anyways. Signed-off-by: Frederick Lawler --- drivers/pci/pcie/bw_notification.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/pci/pcie/bw_notification.c b/drivers/pci/pcie/bw_notification.c index d2eae3b7cc0f..a4bb90562cd5 100644 --- a/drivers/pci/pcie/bw_notification.c +++ b/drivers/pci/pcie/bw_notification.c @@ -14,6 +14,8 @@ * and warns when links become degraded in operation. */ +#define dev_fmt(fmt) "BWN: " fmt + #include "../pci.h" #include "portdrv.h" From patchwork Fri May 3 03:59:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederick Lawler X-Patchwork-Id: 10927901 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 411F51398 for ; Fri, 3 May 2019 04:01:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2D69327D4A for ; Fri, 3 May 2019 04:01:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1DEEB27E5A; Fri, 3 May 2019 04:01:00 +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 B2C2D27D4A for ; Fri, 3 May 2019 04:00:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726449AbfECEAa (ORCPT ); Fri, 3 May 2019 00:00:30 -0400 Received: from mail-ot1-f67.google.com ([209.85.210.67]:40206 "EHLO mail-ot1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726407AbfECEA0 (ORCPT ); Fri, 3 May 2019 00:00:26 -0400 Received: by mail-ot1-f67.google.com with SMTP id w6so4153241otl.7 for ; Thu, 02 May 2019 21:00:26 -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=/LOTiXEeUAfPkAgUbsTAKp8w078GVOXeJxP9ge1byF8=; b=XPNLyukTjtUR1G5C31oqERX/VOGrqG8DcQcBrRJG6f6svZDbARMyBVLoY2RQ7XP3H5 dn+CQGhJ4qPQN1fAjcc/EyONtUj1g8bzZaN8cN62JG5g9IQX78lsdB4xMOwy9XibQLw/ +rQYpwujO4bNYWWQmTEu5eVnpiY5ke3Jmea8tb2GUAtkoi6mXPkn3FNdI89YvYXAGIuF kbQiT6+N3f2g8PzPkUubXXunxMBm5o0c8fivT6YdrmSGedvrsRqqX7NQSgmC8jIzgW+B O71qBgrr7hSvt7jUpbjUiq0u0ladrZoTcPSKKhPVYw/5WmrXslxysNtoBneQIPVL08TP xoTA== 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=/LOTiXEeUAfPkAgUbsTAKp8w078GVOXeJxP9ge1byF8=; b=k7WiMZaZwaoCmhKSZvMumJ9o8UZSgHPRrAXxlUwMHvCnByHaFxUDyiaNaKxHccNhCy NKQUq2RkALmEFCmlE6ylf6X8SA3FBBr5YTrxKZHj5D6hc8DJ3+Zu6TFGJzuqSsKjq+9B LrzgdvVo+9DRZrlx5CnqRLYlrTJsP+fquoH23bsLCaQvJErRKUufym9gKcIAtZVOJRLd CtXExz7DTShlO1WbvqbVENmNi25zLZ/FDCyJXDaGVG1s+YSh2nMPZgp6s11aGNyZyJcK DZX1ieHdReW/2MVDz1/kaZKh9Pvu28rvBiAofVccxuX3hlBD8CNcD5imM/rt6venTf9C Ju+w== X-Gm-Message-State: APjAAAU9Z6rqu3tsKQjZgrdDxgnPodUcyVGXSFQoRDa0DMpgywxuLrmN pxh4NNLaCjj1gQnB5ptyIYLv/w== X-Google-Smtp-Source: APXvYqyfPPmFNQcODBf5kR720aUXI7NwjTYQBV3YUQ7HVat65zmo8DoiqA8XMNbvn2APOVCm0w4sJg== X-Received: by 2002:a05:6830:1251:: with SMTP id s17mr1398446otp.186.1556856026086; Thu, 02 May 2019 21:00:26 -0700 (PDT) Received: from linux.fredlawl.com ([2600:1700:18a0:11d0:5518:38b8:ef25:393a]) by smtp.gmail.com with ESMTPSA id f17sm430149oto.5.2019.05.02.21.00.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2019 21:00:25 -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 5/9] PCI/AER: Prefix dmesg logs with PCIe service name Date: Thu, 2 May 2019 22:59:42 -0500 Message-Id: <20190503035946.23608-6-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/pcie/aer.c | 10 +++++++--- drivers/pci/pcie/aer_inject.c | 6 ++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index 82eb45335b6f..e603084b8fc1 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -12,6 +12,9 @@ * Andrew Patterson */ +#define pr_fmt(fmt) "AER: " fmt +#define dev_fmt pr_fmt + #include #include #include @@ -1377,24 +1380,25 @@ static int aer_probe(struct pcie_device *dev) int status; struct aer_rpc *rpc; struct device *device = &dev->device; + struct pci_dev *port = dev->port; rpc = devm_kzalloc(device, sizeof(struct aer_rpc), GFP_KERNEL); if (!rpc) { return -ENOMEM; } - rpc->rpd = dev->port; + rpc->rpd = port; set_service_data(dev, rpc); status = devm_request_threaded_irq(device, dev->irq, aer_irq, aer_isr, IRQF_SHARED, "aerdrv", dev); if (status) { - dev_err(device, "request AER IRQ %d failed\n", + pci_err(port, "request AER IRQ %d failed\n", dev->irq); return status; } aer_enable_rootport(rpc); - dev_info(device, "AER enabled with IRQ %d\n", dev->irq); + pci_info(port, "AER enabled with IRQ %d\n", dev->irq); return 0; } diff --git a/drivers/pci/pcie/aer_inject.c b/drivers/pci/pcie/aer_inject.c index 95d4759664b3..d4f6d49acd0c 100644 --- a/drivers/pci/pcie/aer_inject.c +++ b/drivers/pci/pcie/aer_inject.c @@ -12,6 +12,8 @@ * Huang Ying */ +#define dev_fmt(fmt) "AER: " fmt + #include #include #include @@ -460,12 +462,12 @@ static int aer_inject(struct aer_error_inj *einj) if (device) { edev = to_pcie_device(device); if (!get_service_data(edev)) { - dev_warn(&edev->device, + pci_warn(edev->port, "aer_inject: AER service is not initialized\n"); ret = -EPROTONOSUPPORT; goto out_put; } - dev_info(&edev->device, + pci_info(edev->port, "aer_inject: Injecting errors %08x/%08x into device %s\n", einj->cor_status, einj->uncor_status, pci_name(dev)); local_irq_disable(); 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 From patchwork Fri May 3 03:59:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederick Lawler X-Patchwork-Id: 10927899 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 0830992A for ; Fri, 3 May 2019 04:00:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE31727D4A for ; Fri, 3 May 2019 04:00:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E296427E5A; Fri, 3 May 2019 04:00:53 +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 9166327D4A for ; Fri, 3 May 2019 04:00:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726506AbfECEAw (ORCPT ); Fri, 3 May 2019 00:00:52 -0400 Received: from mail-oi1-f193.google.com ([209.85.167.193]:34946 "EHLO mail-oi1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726476AbfECEAd (ORCPT ); Fri, 3 May 2019 00:00:33 -0400 Received: by mail-oi1-f193.google.com with SMTP id w197so3493206oia.2 for ; Thu, 02 May 2019 21:00:33 -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=1/+exJcDLfJMbpm+cistYabfcZnJTfblqaDhmOStGDc=; b=nvECSvThLrCazQlaGUsoBn+Ui6ihMBY7wWIM7KpRqGCHm3faImkNGEAOL4e0hphmqf Rtjac3o7G3pGAA3LCozC6SpisiJ1HdY3eONMMeKxwbwpIBT8T4GqX12NwX2yG4YbE6CZ fBPB4BJGzvtbZFMwOlAdOgwWli2RinSwCeqqxbwCMJ5ItvZWhtRCwGufz8Wn7KOaCyJT x58XK1qYNc+nuBqNe25MngzYJF34fGol1JOlNatFnGG/iZS3/BFOB94UjqWPu41UN/dD oCx1W6Kuf7/97ba3R5F0NPEOoYaRFCFEZl/lTvS9xXwTQgTam9YH4FgUIV3tR3cbSpyu xRNg== 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=1/+exJcDLfJMbpm+cistYabfcZnJTfblqaDhmOStGDc=; b=YFcH1/2wqi48Km0lv/CI3GtAyJomgjoyGkxMy7klEumGnHw7N9XKqNyk+htXQGnJzT hLpqiXzFwh6+e+Eq4+Lk1nMezLj0v64q70/ltcPj2q+WXqjHW0vyvfDmIKpkREz83Vxb IbUL3KNJepOskirjP4PdA5hyC69nbLr2m1NPxO3h00USRxcOmSyH3WgVf3Ltq9e67hqg zWdh2YYnfGAwmhsiwnKPkcLLCXB90cjOJaZAvvyXw0WsAgg26fxSWviuaHUM71FIpMFh u8IepNdSWeTKRaabx0S2b1eGlIiyL7JKrWhi+CwQsocrGC+X3pwuE0cvVEXHqvw4+rMT V3yA== X-Gm-Message-State: APjAAAV9PAwCxpirnw/0/z8lX1kcqPt6T2hJgBYIW9kdaIGBQ8fqYsHf mBm90sQ9oV/wr/T5aPcOIwAM2w== X-Google-Smtp-Source: APXvYqzysSZUgZOYjxjq7yOGcMiYONz8+nQQcIn82iUWKC0XQTzAVNNXOmRBcrrUbGjGGTyRjiJsEA== X-Received: by 2002:aca:cc90:: with SMTP id c138mr1851704oig.97.1556856033029; Thu, 02 May 2019 21:00:33 -0700 (PDT) Received: from linux.fredlawl.com ([2600:1700:18a0:11d0:5518:38b8:ef25:393a]) by smtp.gmail.com with ESMTPSA id b23sm403696otl.55.2019.05.02.21.00.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2019 21:00:32 -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 7/9] PCI: hotplug: Prefer CONFIG_DYNAMIC_DEBUG/DEBUG for dmesg logs Date: Thu, 2 May 2019 22:59:44 -0500 Message-Id: <20190503035946.23608-8-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 dbg() and ctrl_dbg() requires pciehp_debug module parameter to be set for debug log purposes. There are niche situations in pciehp_hpc.c where pciehp_debug is used: dbg_ctrl(), and pci_bus_check_dev(). Enabling CONFIG_DYNAMIC_DEBUG/DEBUG is well known for logging debug information. Therefore, prefer pr/pci_dbg() for debug information, and reserve pciehp_debug for niche situations. Signed-off-by: Frederick Lawler --- drivers/pci/hotplug/pciehp.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index 78325c8d961e..e852aa478802 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h @@ -32,10 +32,7 @@ extern int pciehp_poll_time; extern bool pciehp_debug; #define dbg(format, arg...) \ -do { \ - if (pciehp_debug) \ - pr_info(format, ## arg); \ -} while (0) + pr_debug(format, ## arg); #define err(format, arg...) \ pr_err(format, ## arg) #define info(format, arg...) \ @@ -44,11 +41,7 @@ do { \ pr_warn(format, ## arg) #define ctrl_dbg(ctrl, format, arg...) \ - do { \ - if (pciehp_debug) \ - pci_info(ctrl->pcie->port, \ - format, ## arg); \ - } while (0) + pci_dbg(ctrl->pcie->port, format, ## arg) #define ctrl_err(ctrl, format, arg...) \ pci_err(ctrl->pcie->port, format, ## arg) #define ctrl_info(ctrl, format, arg...) \ From patchwork Fri May 3 03:59:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederick Lawler X-Patchwork-Id: 10927897 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 1C8BF92A for ; Fri, 3 May 2019 04:00:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C7C127D4A for ; Fri, 3 May 2019 04:00:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 00CF527E5A; Fri, 3 May 2019 04:00:51 +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 245FE27D4A for ; Fri, 3 May 2019 04:00:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726531AbfECEAk (ORCPT ); Fri, 3 May 2019 00:00:40 -0400 Received: from mail-ot1-f67.google.com ([209.85.210.67]:40213 "EHLO mail-ot1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726503AbfECEAg (ORCPT ); Fri, 3 May 2019 00:00:36 -0400 Received: by mail-ot1-f67.google.com with SMTP id w6so4153474otl.7 for ; Thu, 02 May 2019 21:00:35 -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=dEuYGj0O58tspSnt+ZpOw9dKatfC4l7Bo34N+ze4Knk=; b=V87dHIKzVmPP/S0N0PyA7zHPHu0mXweFGmROyi7cgyoDDCiEgvvPCV1HYDxGPuTgqY Fd0xLFcmafP2TOblvOznWvEiq8HGfuM8kpfMV30SO+9XOjgWLgzOX7UkmZPhrK6QdMWb JsTKAZT5PVeh3jytdlz9OXYKFhHxSpUIMiHE3iHwGdQp6MyfvQz2W74HXZVPMSGLGtd9 elAW+vDgI8ucFakopyD18+qJH3mIxBmJnhFe7Xkcyrk3K3IwUUATHj9KrfNe4tDqC+Yb WN3GhwaDYl4h7nJ2VZfGLeBaT7CZXew5/WDttJw4x5R1q/buXnq04zYNfj5wNG0jAlKG C4/g== 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=dEuYGj0O58tspSnt+ZpOw9dKatfC4l7Bo34N+ze4Knk=; b=BE/VMniYBIfoYL58rd2gF9hyGvd5hyXx+tY2ZGup1om2twzQ8mQytiNveLJsFUBeuk nWlT6K+4bBYNkJa6ZyOc5rnoj99lWJoEJlc3K5aJWY4llPw9/PViI1+jb5hWx33y3MNV Hho+RENPNlqPWya/yUKMMftGZT79Lg46zykQvottWBd9uq/nU30w5PJtH5JT4Aa3GHJi tOPp7Svlp/A8qdTltQn0xORSRzv10xjK6bLPnA0Q8Hnj6X+S2kdPvY2wrLBmoZ30BCTM 1Ok6yWw9q8WsG1/ZAb8fSi42cWIG3WTm8m9V5UIsmogGj47n7nlo8H4VcALKmkHxcH8X 9rWw== X-Gm-Message-State: APjAAAUN5NyiOyxxmVJnkurKrRMEPKcnkxrEyvF8HVUUUWjYRVpJS2C5 hAzM1+DRQmRsCjLxHPuJWZT8ow== X-Google-Smtp-Source: APXvYqyBqDNVdOgBq9t2LsPo/+tMkFG2FU+eo+9lqaRWS7Ru1tZs8aXOCtkYVJOKUbsZm7r5P4ZaIQ== X-Received: by 2002:a9d:609e:: with SMTP id m30mr4650287otj.337.1556856035626; Thu, 02 May 2019 21:00:35 -0700 (PDT) Received: from linux.fredlawl.com ([2600:1700:18a0:11d0:5518:38b8:ef25:393a]) by smtp.gmail.com with ESMTPSA id d78sm543523oib.15.2019.05.02.21.00.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2019 21:00:34 -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 8/9] PCI: hotplug: Remove unnecessary dbg/err/info/warn() printk() wrappers Date: Thu, 2 May 2019 22:59:45 -0500 Message-Id: <20190503035946.23608-9-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 Remove unnecessary deb/err/info/warn() printk() wrappers. Signed-off-by: Frederick Lawler --- drivers/pci/hotplug/pciehp.h | 9 --------- drivers/pci/hotplug/pciehp_core.c | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index e852aa478802..06ff9d31405e 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h @@ -31,15 +31,6 @@ extern bool pciehp_poll_mode; extern int pciehp_poll_time; extern bool pciehp_debug; -#define dbg(format, arg...) \ - pr_debug(format, ## arg); -#define err(format, arg...) \ - pr_err(format, ## arg) -#define info(format, arg...) \ - pr_info(format, ## arg) -#define warn(format, arg...) \ - pr_warn(format, ## arg) - #define ctrl_dbg(ctrl, format, arg...) \ pci_dbg(ctrl->pcie->port, format, ## arg) #define ctrl_err(ctrl, format, arg...) \ diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 7e06a0f9e644..67d024b7f476 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c @@ -331,9 +331,9 @@ int __init pcie_hp_init(void) int retval = 0; retval = pcie_port_service_register(&hpdriver_portdrv); - dbg("pcie_port_service_register = %d\n", retval); + pr_debug("pcie_port_service_register = %d\n", retval); if (retval) - dbg("Failure to register service\n"); + pr_debug("Failure to register service\n"); return retval; } From patchwork Fri May 3 03:59:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederick Lawler X-Patchwork-Id: 10927895 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 8689192A for ; Fri, 3 May 2019 04:00:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 772D127D4A for ; Fri, 3 May 2019 04:00:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B21427E5A; Fri, 3 May 2019 04:00:41 +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 AA6EA27D4A for ; Fri, 3 May 2019 04:00:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726519AbfECEAj (ORCPT ); Fri, 3 May 2019 00:00:39 -0400 Received: from mail-ot1-f67.google.com ([209.85.210.67]:34807 "EHLO mail-ot1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726518AbfECEAi (ORCPT ); Fri, 3 May 2019 00:00:38 -0400 Received: by mail-ot1-f67.google.com with SMTP id n15so4176000ota.1 for ; Thu, 02 May 2019 21:00:38 -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=fQTfIhLtolzo7NGl6+w85L74CyrcJ2T1el+EJtuAO/g=; b=eNQUOsV3p1S5rw9tyuQYQJfwZEwUcT3UzHbe0jfAgqpyBxsmOezGdM7Yj+9eCWnEgj rKEehdR39u9F87bBjLDT7wqIvIA0lzKQ6h1hNmBDwfiqsRS0ixkExaXOAy+lVq5Xritg fFuNh/VgytsD7zz1nnXbms79n+Ha8NZmTdlCmUGGtry6tAVt5lY1V4xipyz4nc3EhJph 5UVbmOsXQCuetOg66HUBJwf944d4osycnUtU39X0U60LsITcnE03kp7qUHx63QbBAo8P xp3V05HvAZZ5fHxZFDmp48OrnI36k1By6ommCwkG+GCzA9vl9048VzLS03x3okLRzqAT PmFQ== 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=fQTfIhLtolzo7NGl6+w85L74CyrcJ2T1el+EJtuAO/g=; b=JyepWHlP7sqdMFA4TZEaRsjnDrmPJ/n8pwu+cD7plkEkgcawrem/sB7CA3haD9zm2z S7c/MKqjptyXrSsMpRy0SXK7dDb7cfbH6qGHOpOyZi4Pl0rR6/LncfPsIy0FoWei9kVP QVBYwZZXDhRam+22sILNjRidloC24r4wwokrBbH5HaraR4ancgHTUhEqBkOwlzOeh+fR jMWWVQ5/Lzi2Cm8sXFTYSRWtFskCjzUa88AObSfHYhWML3oj18C0pdEw+XfXuk4zuepE 1XMt2wgFuV0+2Nq0SeGg4SH2tTRYDmiUa4h2yxloEBRpI2jC+B1p+HRznEBWd/WzZ3lh 2zNw== X-Gm-Message-State: APjAAAW+3pASkK2baak6wsv8+c/a2mcRdjC4V/dqtsmKxiATQ1yVOGGi HZReWose91nGNTt2AgBZGMUC+A== X-Google-Smtp-Source: APXvYqyoZGrcpyztZBaHHgeAY4Ciqk3pTinXMmDdZpwdAJ2/iufAVMAvv38SM30cDZDYpZcDx+4v4g== X-Received: by 2002:a9d:4ef:: with SMTP id 102mr5389441otm.302.1556856037677; Thu, 02 May 2019 21:00:37 -0700 (PDT) Received: from linux.fredlawl.com ([2600:1700:18a0:11d0:5518:38b8:ef25:393a]) by smtp.gmail.com with ESMTPSA id q82sm614742oif.28.2019.05.02.21.00.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2019 21:00:36 -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 9/9] PCI: hotplug: Prefix ctrl_*() dmesg logs with pciehp slot name Date: Thu, 2 May 2019 22:59:46 -0500 Message-Id: <20190503035946.23608-10-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 Remove current uses of "Slot(%s)" and then prefix ctrl_*() dmesg with pciehp slot name to include the slot name for all uses of ctrl_*() wrappers. Signed-off-by: Frederick Lawler --- drivers/pci/hotplug/pciehp.h | 12 ++++--- drivers/pci/hotplug/pciehp_core.c | 9 +++-- drivers/pci/hotplug/pciehp_ctrl.c | 58 ++++++++++++------------------- drivers/pci/hotplug/pciehp_hpc.c | 5 ++- 4 files changed, 38 insertions(+), 46 deletions(-) diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index 06ff9d31405e..e1cdc3565c62 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h @@ -32,13 +32,17 @@ extern int pciehp_poll_time; extern bool pciehp_debug; #define ctrl_dbg(ctrl, format, arg...) \ - pci_dbg(ctrl->pcie->port, format, ## arg) + pci_dbg(ctrl->pcie->port, "Slot(%s): " format, \ + slot_name(ctrl), ## arg) #define ctrl_err(ctrl, format, arg...) \ - pci_err(ctrl->pcie->port, format, ## arg) + pci_err(ctrl->pcie->port, "Slot(%s): " format, \ + slot_name(ctrl), ## arg) #define ctrl_info(ctrl, format, arg...) \ - pci_info(ctrl->pcie->port, format, ## arg) + pci_info(ctrl->pcie->port, "Slot(%s): " format, \ + slot_name(ctrl), ## arg) #define ctrl_warn(ctrl, format, arg...) \ - pci_warn(ctrl->pcie->port, format, ## arg) + pci_warn(ctrl->pcie->port, "Slot(%s): " format, \ + slot_name(ctrl), ## arg) #define SLOT_NAME_SIZE 10 diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 67d024b7f476..ddaa45475572 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c @@ -85,7 +85,8 @@ static int init_slot(struct controller *ctrl) retval = pci_hp_initialize(&ctrl->hotplug_slot, ctrl->pcie->port->subordinate, 0, name); if (retval) { - ctrl_err(ctrl, "pci_hp_initialize failed: error %d\n", retval); + pci_err(ctrl->pcie->port, + "pci_hp_initialize failed: error %d\n", retval); kfree(ops); } return retval; @@ -201,9 +202,11 @@ static int pciehp_probe(struct pcie_device *dev) rc = init_slot(ctrl); if (rc) { if (rc == -EBUSY) - ctrl_warn(ctrl, "Slot already registered by another hotplug driver\n"); + pci_warn(ctrl->pcie->port, + "Slot already registered by another hotplug driver\n"); else - ctrl_err(ctrl, "Slot initialization failed (%d)\n", rc); + pci_err(ctrl->pcie->port, + "Slot initialization failed (%d)\n", rc); goto err_out_release_ctlr; } diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c index bf81f977a751..046ec4d52159 100644 --- a/drivers/pci/hotplug/pciehp_ctrl.c +++ b/drivers/pci/hotplug/pciehp_ctrl.c @@ -76,7 +76,7 @@ static int board_added(struct controller *ctrl) /* Check for a power fault */ if (ctrl->power_fault_detected || pciehp_query_power_fault(ctrl)) { - ctrl_err(ctrl, "Slot(%s): Power fault\n", slot_name(ctrl)); + ctrl_err(ctrl, "Power fault\n"); retval = -EIO; goto err_exit; } @@ -160,12 +160,10 @@ void pciehp_handle_button_press(struct controller *ctrl) case ON_STATE: if (ctrl->state == ON_STATE) { ctrl->state = BLINKINGOFF_STATE; - ctrl_info(ctrl, "Slot(%s): Powering off due to button press\n", - slot_name(ctrl)); + ctrl_info(ctrl, "Powering off due to button press\n"); } else { ctrl->state = BLINKINGON_STATE; - ctrl_info(ctrl, "Slot(%s) Powering on due to button press\n", - slot_name(ctrl)); + ctrl_info(ctrl, "Powering on due to button press\n"); } /* blink green LED and turn off amber */ pciehp_green_led_blink(ctrl); @@ -179,7 +177,7 @@ void pciehp_handle_button_press(struct controller *ctrl) * press the attention again before the 5 sec. limit * expires to cancel hot-add or hot-remove */ - ctrl_info(ctrl, "Slot(%s): Button cancel\n", slot_name(ctrl)); + ctrl_info(ctrl, "Button cancel\n"); cancel_delayed_work(&ctrl->button_work); if (ctrl->state == BLINKINGOFF_STATE) { ctrl->state = ON_STATE; @@ -189,12 +187,11 @@ void pciehp_handle_button_press(struct controller *ctrl) pciehp_green_led_off(ctrl); } pciehp_set_attention_status(ctrl, 0); - ctrl_info(ctrl, "Slot(%s): Action canceled due to button press\n", - slot_name(ctrl)); + ctrl_info(ctrl, "Action canceled due to button press\n"); break; default: - ctrl_err(ctrl, "Slot(%s): Ignoring invalid state %#x\n", - slot_name(ctrl), ctrl->state); + ctrl_err(ctrl, "Ignoring invalid state %#x\n", + ctrl->state); break; } mutex_unlock(&ctrl->state_lock); @@ -232,11 +229,9 @@ void pciehp_handle_presence_or_link_change(struct controller *ctrl, u32 events) ctrl->state = POWEROFF_STATE; mutex_unlock(&ctrl->state_lock); if (events & PCI_EXP_SLTSTA_DLLSC) - ctrl_info(ctrl, "Slot(%s): Link Down\n", - slot_name(ctrl)); + ctrl_info(ctrl, "Link Down\n"); if (events & PCI_EXP_SLTSTA_PDC) - ctrl_info(ctrl, "Slot(%s): Card not present\n", - slot_name(ctrl)); + ctrl_info(ctrl, "Card not present\n"); pciehp_disable_slot(ctrl, SURPRISE_REMOVAL); break; default: @@ -261,11 +256,9 @@ void pciehp_handle_presence_or_link_change(struct controller *ctrl, u32 events) ctrl->state = POWERON_STATE; mutex_unlock(&ctrl->state_lock); if (present) - ctrl_info(ctrl, "Slot(%s): Card present\n", - slot_name(ctrl)); + ctrl_info(ctrl, "Card present\n"); if (link_active) - ctrl_info(ctrl, "Slot(%s): Link Up\n", - slot_name(ctrl)); + ctrl_info(ctrl, "Link Up\n"); ctrl->request_result = pciehp_enable_slot(ctrl); break; default: @@ -281,8 +274,7 @@ static int __pciehp_enable_slot(struct controller *ctrl) if (MRL_SENS(ctrl)) { pciehp_get_latch_status(ctrl, &getstatus); if (getstatus) { - ctrl_info(ctrl, "Slot(%s): Latch open\n", - slot_name(ctrl)); + ctrl_info(ctrl, "Latch open\n"); return -ENODEV; } } @@ -290,8 +282,7 @@ static int __pciehp_enable_slot(struct controller *ctrl) if (POWER_CTRL(ctrl)) { pciehp_get_power_status(ctrl, &getstatus); if (getstatus) { - ctrl_info(ctrl, "Slot(%s): Already enabled\n", - slot_name(ctrl)); + ctrl_info(ctrl, "Already enabled\n"); return 0; } } @@ -323,8 +314,7 @@ static int __pciehp_disable_slot(struct controller *ctrl, bool safe_removal) if (POWER_CTRL(ctrl)) { pciehp_get_power_status(ctrl, &getstatus); if (!getstatus) { - ctrl_info(ctrl, "Slot(%s): Already disabled\n", - slot_name(ctrl)); + ctrl_info(ctrl, "Already disabled\n"); return -EINVAL; } } @@ -367,18 +357,16 @@ int pciehp_sysfs_enable_slot(struct hotplug_slot *hotplug_slot) !atomic_read(&ctrl->pending_events)); return ctrl->request_result; case POWERON_STATE: - ctrl_info(ctrl, "Slot(%s): Already in powering on state\n", - slot_name(ctrl)); + ctrl_info(ctrl, "Already in powering on state\n"); break; case BLINKINGOFF_STATE: case ON_STATE: case POWEROFF_STATE: - ctrl_info(ctrl, "Slot(%s): Already enabled\n", - slot_name(ctrl)); + ctrl_info(ctrl, "Already enabled\n"); break; default: - ctrl_err(ctrl, "Slot(%s): Invalid state %#x\n", - slot_name(ctrl), ctrl->state); + ctrl_err(ctrl, "Invalid state %#x\n", + ctrl->state); break; } mutex_unlock(&ctrl->state_lock); @@ -400,18 +388,16 @@ int pciehp_sysfs_disable_slot(struct hotplug_slot *hotplug_slot) !atomic_read(&ctrl->pending_events)); return ctrl->request_result; case POWEROFF_STATE: - ctrl_info(ctrl, "Slot(%s): Already in powering off state\n", - slot_name(ctrl)); + ctrl_info(ctrl, "Already in powering off state\n"); break; case BLINKINGON_STATE: case OFF_STATE: case POWERON_STATE: - ctrl_info(ctrl, "Slot(%s): Already disabled\n", - slot_name(ctrl)); + ctrl_info(ctrl, "Already disabled\n"); break; default: - ctrl_err(ctrl, "Slot(%s): Invalid state %#x\n", - slot_name(ctrl), ctrl->state); + ctrl_err(ctrl, "Invalid state %#x\n", + ctrl->state); break; } mutex_unlock(&ctrl->state_lock); diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 1713b0b08a5e..2cb85433736d 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -629,15 +629,14 @@ static irqreturn_t pciehp_ist(int irq, void *dev_id) /* Check Attention Button Pressed */ if (events & PCI_EXP_SLTSTA_ABP) { - ctrl_info(ctrl, "Slot(%s): Attention button pressed\n", - slot_name(ctrl)); + ctrl_info(ctrl, "Attention button pressed\n"); pciehp_handle_button_press(ctrl); } /* Check Power Fault Detected */ if ((events & PCI_EXP_SLTSTA_PFD) && !ctrl->power_fault_detected) { ctrl->power_fault_detected = 1; - ctrl_err(ctrl, "Slot(%s): Power fault\n", slot_name(ctrl)); + ctrl_err(ctrl, "Power fault\n"); pciehp_set_attention_status(ctrl, 1); pciehp_green_led_off(ctrl); }