From patchwork Fri Jan 19 11:10:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oza Pawandeep X-Patchwork-Id: 863479 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=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="j/6t4vVh"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="U0uKeq9x"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zNJ6v0y42z9s75 for ; Fri, 19 Jan 2018 22:11:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755646AbeASLLc (ORCPT ); Fri, 19 Jan 2018 06:11:32 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:32786 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755344AbeASLKl (ORCPT ); Fri, 19 Jan 2018 06:10:41 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3928D60712; Fri, 19 Jan 2018 11:10:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1516360241; bh=IqpQ7I1v8sf66dRWkBMZZ50qrr/EP0XtmIsX9H5MBaE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j/6t4vVheVmMNfWeHZkba1RfMe//yzCeFmYNpragSEAXePRL0AH6QUYoEWh1JdUWj JCgqa0v05opjPUy4bGZL9kNH5VC9A8XBfGV6ZZIVQT72JSsyTaN3DaqJIHb+PZ97Jv 1w8sLqFdVPmGXuHTqFKsFjYdUsFE1t3geFA/X2og= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,T_DKIM_INVALID,T_FILL_THIS_FORM_SHORT autolearn=no autolearn_force=no version=3.4.0 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 D5FAC609FD; Fri, 19 Jan 2018 11:10:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1516360240; bh=IqpQ7I1v8sf66dRWkBMZZ50qrr/EP0XtmIsX9H5MBaE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U0uKeq9xoF7fbUQyP0J5bycjjmAVVKPf5UV5NajaTPUdX2+PxEXOakDeWwc6QicaX lxp3ZaduCGa2RQE2Y3oMb6LnIMItGB47CJ935+kbP4/hm/rAoLErzIYEAW0co2Dp/o ReL4UjjOPdYKR/M9RhBpWLd4QgRFpAIMwIZZzMW4= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org D5FAC609FD 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 v6 6/7] PCI/DPC: Enumerate the devices after DPC trigger event Date: Fri, 19 Jan 2018 16:40:03 +0530 Message-Id: <1516360204-1586-7-git-send-email-poza@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1516360204-1586-1-git-send-email-poza@codeaurora.org> References: <1516360204-1586-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 Implement error_resume callback in DPC so, after DPC trigger event enumerates the devices beneath. Signed-off-by: Oza Pawandeep diff --git a/drivers/pci/pcie/pcie-dpc.c b/drivers/pci/pcie/pcie-dpc.c index b5c9fbd..1b06a8e 100644 --- a/drivers/pci/pcie/pcie-dpc.c +++ b/drivers/pci/pcie/pcie-dpc.c @@ -161,6 +161,43 @@ static void dpc_wait_link_inactive(struct dpc_dev *dpc) dev_warn(dev, "Link state not disabled for DPC event\n"); } +static bool dpc_wait_link_active(struct pci_dev *pdev) +{ + unsigned long timeout = jiffies + HZ; + u16 lnk_status; + bool ret = true; + + pcie_capability_read_word(pdev, PCI_EXP_LNKSTA, &lnk_status); + + while (!(lnk_status & PCI_EXP_LNKSTA_DLLLA) && + !time_after(jiffies, timeout)) { + msleep(10); + pcie_capability_read_word(pdev, PCI_EXP_LNKSTA, &lnk_status); + } + + if (!(lnk_status & PCI_EXP_LNKSTA_DLLLA)) { + dev_warn(&pdev->dev, "Link state not enabled after DPC event\n"); + ret = false; + } + + return ret; +} + +/** + * dpc_error_resume - enumerate the devices beneath + * @dev: pointer to Root Port's pci_dev data structure + * + * Invoked by Port Bus driver during nonfatal recovery. + */ +static void dpc_error_resume(struct pci_dev *pdev) +{ + if (dpc_wait_link_active(pdev)) { + pci_lock_rescan_remove(); + pci_rescan_bus(pdev->bus); + pci_unlock_rescan_remove(); + } +} + /** * dpc_reset_link - reset link DPC routine * @dev: pointer to Root Port's pci_dev data structure @@ -419,6 +456,7 @@ static void dpc_remove(struct pcie_device *dev) .service = PCIE_PORT_SERVICE_DPC, .probe = dpc_probe, .remove = dpc_remove, + .error_resume = dpc_error_resume, .reset_link = dpc_reset_link, }; diff --git a/drivers/pci/pcie/pcie-err.c b/drivers/pci/pcie/pcie-err.c index 05385c0..c4876ab 100644 --- a/drivers/pci/pcie/pcie-err.c +++ b/drivers/pci/pcie/pcie-err.c @@ -236,6 +236,7 @@ static pci_ers_result_t reset_link(struct pci_dev *dev, int severity) * @state: error state * @error_mesg: message to print * @cb: callback to be broadcasted + * @severity: error severity * * Invoked during error recovery process. Once being invoked, the content * of error severity will be broadcasted to all downstream drivers in a @@ -244,7 +245,8 @@ static pci_ers_result_t reset_link(struct pci_dev *dev, int severity) static pci_ers_result_t broadcast_error_message(struct pci_dev *dev, enum pci_channel_state state, char *error_mesg, - int (*cb)(struct pci_dev *, void *)) + int (*cb)(struct pci_dev *, void *), + int severity) { struct aer_broadcast_data result_data; @@ -256,6 +258,15 @@ static pci_ers_result_t broadcast_error_message(struct pci_dev *dev, result_data.result = PCI_ERS_RESULT_RECOVERED; if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) { + /* If DPC is triggered, call resume error hanlder + * because, at this point we can safely assume that + * link recovery has happened. + */ + if ((severity == DPC_FATAL) && + (cb == report_resume)) { + cb(dev, NULL); + return PCI_ERS_RESULT_RECOVERED; + } /* * If the error is reported by a bridge, we think this error * is related to the downstream link of the bridge, so we @@ -305,7 +316,8 @@ void pci_do_recovery(struct pci_dev *dev, int severity) status = broadcast_error_message(dev, state, "error_detected", - report_error_detected); + report_error_detected, + severity); if ((severity == AER_FATAL) || (severity == DPC_FATAL)) { @@ -318,7 +330,8 @@ void pci_do_recovery(struct pci_dev *dev, int severity) status = broadcast_error_message(dev, state, "mmio_enabled", - report_mmio_enabled); + report_mmio_enabled, + severity); if (status == PCI_ERS_RESULT_NEED_RESET) { /* @@ -329,7 +342,8 @@ void pci_do_recovery(struct pci_dev *dev, int severity) status = broadcast_error_message(dev, state, "slot_reset", - report_slot_reset); + report_slot_reset, + severity); } if (status != PCI_ERS_RESULT_RECOVERED) @@ -338,7 +352,8 @@ void pci_do_recovery(struct pci_dev *dev, int severity) broadcast_error_message(dev, state, "resume", - report_resume); + report_resume, + severity); dev_info(&dev->dev, "Device recovery successful\n"); mutex_unlock(&pci_err_recovery_lock);