From patchwork Wed Feb 21 10:26:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oza Pawandeep X-Patchwork-Id: 10231807 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.web.codeaurora.org (Postfix) with ESMTP id 15C9460209 for ; Wed, 21 Feb 2018 10:28:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F30BA28AE5 for ; Wed, 21 Feb 2018 10:28:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E74D828AEE; Wed, 21 Feb 2018 10:28:32 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 1DCCD28AE5 for ; Wed, 21 Feb 2018 10:28:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933055AbeBUK2a (ORCPT ); Wed, 21 Feb 2018 05:28:30 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:47938 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933054AbeBUK1R (ORCPT ); Wed, 21 Feb 2018 05:27:17 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 02AE3609FD; Wed, 21 Feb 2018 10:27:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1519208837; bh=Bl8FOr3vIC9A1OvKerbk7qEYARE+btHzXNptLpDkM+8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Djv5WE6TqB4hdVfQAPIcBGTred3LIwt0vHyDo/zQjNf4xbGYxw7zI2KERTMh48T6k zhUEHEcOO6ltc0h3gcPb5hZOZ3Z1RmCgjkF3IWeS02svcQ2qTlARNe2IcBccy7JGv4 owGzKqDXuc61Px8wITwH3TyQDDSMLXHMa+F3e6WU= Received: from blr-ubuntu-poza.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.18.19]) (using TLSv1.1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: poza@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id D15B460F72; Wed, 21 Feb 2018 10:27:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1519208835; bh=Bl8FOr3vIC9A1OvKerbk7qEYARE+btHzXNptLpDkM+8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IUVeCuUHduyZ76nEW9PgJ440i0x2dmJY2TmIs8Oi2znHiTao7WZAm/2yy/gZvG1nP /qSxgmmrD+cnLH0wQfp8xJ1yRLIVX3w4qdNVVA2IdiEuiTtzGxyRcGn3hQIs7tOBM7 7KqULrXz4Y9rha+c2NTpnkdczFfVUEfma2zXgw/A= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org D15B460F72 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=poza@codeaurora.org From: Oza Pawandeep To: Bjorn Helgaas , Philippe Ombredanne , Thomas Gleixner , Greg Kroah-Hartman , Kate Stewart , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Dongdong Liu , Keith Busch , Wei Zhang , Sinan Kaya , Timur Tabi Cc: Oza Pawandeep Subject: [PATCH v8 4/7] PCI/DPC: Unify and plumb error handling into DPC Date: Wed, 21 Feb 2018 15:56:41 +0530 Message-Id: <1519208804-24512-5-git-send-email-poza@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1519208804-24512-1-git-send-email-poza@codeaurora.org> References: <1519208804-24512-1-git-send-email-poza@codeaurora.org> 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 Current DPC driver does not do recovery, e.g. calling end-point's driver's callbacks, which sanitize the sw. DPC driver implements link_reset callback, and calls pci_do_recovery. Signed-off-by: Oza Pawandeep diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index a5a79f0..124f42e 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -343,6 +343,8 @@ static inline resource_size_t pci_resource_alignment(struct pci_dev *dev, void pci_enable_acs(struct pci_dev *dev); /* PCI error reporting and recovery */ +#define DPC_FATAL 4 + void pci_do_recovery(struct pci_dev *dev, int severity); #ifdef CONFIG_PCIEASPM diff --git a/drivers/pci/pcie/pcie-dpc.c b/drivers/pci/pcie/pcie-dpc.c index 38e40c6..208b427 100644 --- a/drivers/pci/pcie/pcie-dpc.c +++ b/drivers/pci/pcie/pcie-dpc.c @@ -13,6 +13,7 @@ #include #include "../pci.h" #include "aer/aerdrv.h" +#include "portdrv.h" struct dpc_dev { struct pcie_device *dev; @@ -45,6 +46,60 @@ struct dpc_dev { "Memory Request Completion Timeout", /* Bit Position 18 */ }; +static int find_dpc_dev_iter(struct device *device, void *data) +{ + struct pcie_port_service_driver *service_driver; + struct device **dev; + + dev = (struct device **) data; + + if (device->bus == &pcie_port_bus_type && device->driver) { + service_driver = to_service_driver(device->driver); + if (service_driver->service == PCIE_PORT_SERVICE_DPC) { + *dev = device; + return 1; + } + } + + return 0; +} + +static struct device *pci_find_dpc_dev(struct pci_dev *pdev) +{ + struct device *dev = NULL; + + device_for_each_child(&pdev->dev, &dev, find_dpc_dev_iter); + + return dev; +} + +static int find_dpc_service_iter(struct device *device, void *data) +{ + struct pcie_port_service_driver *service_driver, **drv; + + drv = (struct pcie_port_service_driver **) data; + + if (device->bus == &pcie_port_bus_type && device->driver) { + service_driver = to_service_driver(device->driver); + if (service_driver->service == PCIE_PORT_SERVICE_DPC) { + *drv = service_driver; + return 1; + } + } + + return 0; +} + +struct pcie_port_service_driver *pci_find_dpc_service(struct pci_dev *dev) +{ + struct pcie_port_service_driver *drv = NULL; + + device_for_each_child(&dev->dev, &drv, find_dpc_service_iter); + + return drv; +} +EXPORT_SYMBOL(pci_find_dpc_service); + static int dpc_wait_rp_inactive(struct dpc_dev *dpc) { unsigned long timeout = jiffies + HZ; @@ -82,12 +137,25 @@ static void dpc_wait_link_inactive(struct dpc_dev *dpc) dev_warn(dev, "Link state not disabled for DPC event\n"); } -static void dpc_work(struct work_struct *work) +/** + * dpc_reset_link - reset link DPC routine + * @dev: pointer to Root Port's pci_dev data structure + * + * Invoked by Port Bus driver when performing link reset at Root Port. + */ +static pci_ers_result_t dpc_reset_link(struct pci_dev *pdev) { - struct dpc_dev *dpc = container_of(work, struct dpc_dev, work); - struct pci_dev *dev, *temp, *pdev = dpc->dev->port; struct pci_bus *parent = pdev->subordinate; - u16 cap = dpc->cap_pos, ctl; + struct pci_dev *dev, *temp; + struct dpc_dev *dpc; + struct pcie_device *pciedev; + struct device *devdpc; + u16 cap, ctl; + + devdpc = pci_find_dpc_dev(pdev); + pciedev = to_pcie_device(devdpc); + dpc = get_service_data(pciedev); + cap = dpc->cap_pos; pci_lock_rescan_remove(); list_for_each_entry_safe_reverse(dev, temp, &parent->devices, @@ -104,21 +172,31 @@ static void dpc_work(struct work_struct *work) dpc_wait_link_inactive(dpc); if (dpc->rp_extensions && dpc_wait_rp_inactive(dpc)) - return; + return PCI_ERS_RESULT_DISCONNECT; if (dpc->rp_extensions && dpc->rp_pio_status) { pci_write_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_STATUS, dpc->rp_pio_status); dpc->rp_pio_status = 0; } - pci_write_config_word(pdev, cap + PCI_EXP_DPC_STATUS, + pci_write_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_STATUS, PCI_EXP_DPC_STATUS_TRIGGER | PCI_EXP_DPC_STATUS_INTERRUPT); pci_read_config_word(pdev, cap + PCI_EXP_DPC_CTL, &ctl); pci_write_config_word(pdev, cap + PCI_EXP_DPC_CTL, - ctl | PCI_EXP_DPC_CTL_INT_EN); + ctl | PCI_EXP_DPC_CTL_INT_EN); + + return PCI_ERS_RESULT_RECOVERED; } +static void dpc_work(struct work_struct *work) +{ + struct dpc_dev *dpc = container_of(work, struct dpc_dev, work); + struct pci_dev *pdev = dpc->dev->port; + + /* From DPC point of view error is always FATAL. */ + pci_do_recovery(pdev, DPC_FATAL); +} static void dpc_process_rp_pio_error(struct dpc_dev *dpc) { struct device *dev = &dpc->dev->device; @@ -297,6 +375,7 @@ static void dpc_remove(struct pcie_device *dev) .service = PCIE_PORT_SERVICE_DPC, .probe = dpc_probe, .remove = dpc_remove, + .reset_link = dpc_reset_link, }; static int __init dpc_service_init(void) diff --git a/drivers/pci/pcie/pcie-err.c b/drivers/pci/pcie/pcie-err.c index 8318c84..6844347 100644 --- a/drivers/pci/pcie/pcie-err.c +++ b/drivers/pci/pcie/pcie-err.c @@ -19,6 +19,7 @@ #include #include #include "portdrv.h" +#include "./../pci.h" static DEFINE_MUTEX(pci_err_recovery_lock); @@ -181,7 +182,7 @@ static pci_ers_result_t default_reset_link(struct pci_dev *dev) return PCI_ERS_RESULT_RECOVERED; } -static pci_ers_result_t reset_link(struct pci_dev *dev) +static pci_ers_result_t reset_link(struct pci_dev *dev, int severity) { struct pci_dev *udev; pci_ers_result_t status; @@ -195,9 +196,17 @@ static pci_ers_result_t reset_link(struct pci_dev *dev) udev = dev->bus->self; } + + /* Use the service driver of the component firstly */ +#if IS_ENABLED(CONFIG_PCIE_DPC) + if (severity == DPC_FATAL) + driver = pci_find_dpc_service(udev); +#endif #if IS_ENABLED(CONFIG_PCIEAER) - /* Use the aer driver of the component firstly */ - driver = pci_find_aer_service(udev); + if ((severity == AER_FATAL) || + (severity == AER_NONFATAL) || + (severity == AER_CORRECTABLE)) + driver = pci_find_aer_service(udev); #endif if (driver && driver->reset_link) { @@ -287,7 +296,8 @@ void pci_do_recovery(struct pci_dev *dev, int severity) mutex_lock(&pci_err_recovery_lock); - if (severity == AER_FATAL) + if ((severity == AER_FATAL) || + (severity == DPC_FATAL)) state = pci_channel_io_frozen; else state = pci_channel_io_normal; @@ -297,10 +307,14 @@ void pci_do_recovery(struct pci_dev *dev, int severity) "error_detected", report_error_detected); - if (severity == AER_FATAL) { - result = reset_link(dev); + if ((severity == AER_FATAL) || + (severity == DPC_FATAL)) { + result = reset_link(dev, severity); if (result != PCI_ERS_RESULT_RECOVERED) goto failed; + else if (severity == DPC_FATAL) + goto resume; + } if (status == PCI_ERS_RESULT_CAN_RECOVER) @@ -324,6 +338,7 @@ void pci_do_recovery(struct pci_dev *dev, int severity) if (status != PCI_ERS_RESULT_RECOVERED) goto failed; +resume: broadcast_error_message(dev, state, "resume", diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h index 4f1992d..b013e24 100644 --- a/drivers/pci/pcie/portdrv.h +++ b/drivers/pci/pcie/portdrv.h @@ -80,4 +80,5 @@ static inline void pcie_port_platform_notify(struct pci_dev *port, int *mask){} #endif /* !CONFIG_ACPI */ struct pcie_port_service_driver *pci_find_aer_service(struct pci_dev *dev); +struct pcie_port_service_driver *pci_find_dpc_service(struct pci_dev *dev); #endif /* _PORTDRV_H_ */