From patchwork Mon Jan 29 21:31:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 867309 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zVjKj5jVwz9s7s for ; Tue, 30 Jan 2018 08:28:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751856AbeA2V2H (ORCPT ); Mon, 29 Jan 2018 16:28:07 -0500 Received: from mga01.intel.com ([192.55.52.88]:65218 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751737AbeA2V2G (ORCPT ); Mon, 29 Jan 2018 16:28:06 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jan 2018 13:28:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,432,1511856000"; d="scan'208";a="23216152" Received: from unknown (HELO localhost.lm.intel.com) ([10.232.112.44]) by orsmga003.jf.intel.com with ESMTP; 29 Jan 2018 13:28:05 -0800 From: Keith Busch To: Bjorn Helgaas , Linux PCI Cc: Keith Busch Subject: [PATCH 3/6] PCI/DPC: Remove rp_pio_status from dpc struct Date: Mon, 29 Jan 2018 14:31:42 -0700 Message-Id: <20180129213145.26068-3-keith.busch@intel.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180129213145.26068-1-keith.busch@intel.com> References: <20180129213145.26068-1-keith.busch@intel.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org we don't need to save the rp pio status across multiple contexts anymore as all DPC event handling occurs in a single work queue context. Signed-off-by: Keith Busch --- drivers/pci/pcie/pcie-dpc.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/pci/pcie/pcie-dpc.c b/drivers/pci/pcie/pcie-dpc.c index cf0398ccaeb6..f0f5f5ba71ff 100644 --- a/drivers/pci/pcie/pcie-dpc.c +++ b/drivers/pci/pcie/pcie-dpc.c @@ -19,7 +19,6 @@ struct dpc_dev { struct work_struct work; u16 cap_pos; bool rp_extensions; - u32 rp_pio_status; u8 rp_log_size; }; @@ -45,7 +44,7 @@ static const char * const rp_pio_error_string[] = { "Memory Request Completion Timeout", /* Bit Position 18 */ }; -static void dpc_process_rp_pio_error(struct dpc_dev *dpc); +static u32 dpc_process_rp_pio_error(struct dpc_dev *dpc); static int dpc_wait_rp_inactive(struct dpc_dev *dpc) { @@ -90,6 +89,7 @@ static void dpc_work(struct work_struct *work) struct pci_dev *dev, *temp, *pdev = dpc->dev->port; struct pci_bus *parent = pdev->subordinate; u16 cap = dpc->cap_pos, status, source, reason, ext_reason; + u32 pio_status = 0; pci_read_config_word(pdev, cap + PCI_EXP_DPC_STATUS, &status); pci_read_config_word(pdev, cap + PCI_EXP_DPC_SOURCE_ID, &source); @@ -109,7 +109,7 @@ static void dpc_work(struct work_struct *work) "reserved error"); if (dpc->rp_extensions && reason == 3 && ext_reason == 0) - dpc_process_rp_pio_error(dpc); + pio_status = dpc_process_rp_pio_error(dpc); pci_lock_rescan_remove(); list_for_each_entry_safe_reverse(dev, temp, &parent->devices, @@ -127,17 +127,15 @@ static void dpc_work(struct work_struct *work) dpc_wait_link_inactive(dpc); if (dpc->rp_extensions && dpc_wait_rp_inactive(dpc)) return; - if (dpc->rp_extensions && dpc->rp_pio_status) { + if (dpc->rp_extensions && pio_status) pci_write_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_STATUS, - dpc->rp_pio_status); - dpc->rp_pio_status = 0; - } + pio_status); pci_write_config_word(pdev, cap + PCI_EXP_DPC_STATUS, PCI_EXP_DPC_STATUS_TRIGGER | PCI_EXP_DPC_STATUS_INTERRUPT); } -static void dpc_process_rp_pio_error(struct dpc_dev *dpc) +static u32 dpc_process_rp_pio_error(struct dpc_dev *dpc) { struct device *dev = &dpc->dev->device; struct pci_dev *pdev = dpc->dev->port; @@ -148,14 +146,14 @@ static void dpc_process_rp_pio_error(struct dpc_dev *dpc) int i; u32 dw0, dw1, dw2, dw3; u32 log; - u32 prefix; + u32 prefix, pio_status; 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", status, mask); - dpc->rp_pio_status = status; + pio_status = status; 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); @@ -175,7 +173,7 @@ static void dpc_process_rp_pio_error(struct dpc_dev *dpc) } if (dpc->rp_log_size < 4) - return; + return pio_status; pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_HEADER_LOG, &dw0); pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_HEADER_LOG + 4, @@ -188,7 +186,7 @@ static void dpc_process_rp_pio_error(struct dpc_dev *dpc) dw0, dw1, dw2, dw3); if (dpc->rp_log_size < 5) - return; + return pio_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); @@ -197,6 +195,7 @@ static void dpc_process_rp_pio_error(struct dpc_dev *dpc) cap + PCI_EXP_DPC_RP_PIO_TLPPREFIX_LOG, &prefix); dev_err(dev, "TLP Prefix Header: dw%d, %#010x\n", i, prefix); } + return pio_status; } static irqreturn_t dpc_irq(int irq, void *context)