From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227YPYdQAnb+7UHldYtqVmS4dtoqf5t/ugoHTduozgXWp3t1xlVu8c5AGWePEjOZW+uIgEFS ARC-Seal: i=1; a=rsa-sha256; t=1516430157; cv=none; d=google.com; s=arc-20160816; b=W6O6Woh4JZvHw4r2On+hlxTSyM0FVGOTLdXGNKUS+MYrzW3gvuMiv9duNPbBP8Eru2 E83xc2W+E+VB7ze9aHUKcp3h6Zb03gtJHzzrAVpd6wz/kuxl1Yl4WtKz4fFnAr8/rMc5 AOSGNIj1LhOTn5uhbmdSzpDZLlvC7l7EZyheVI+8QsBxTFA0oQYJwQQHF4gbtuiyXPz/ S/cdqB3+tx5TlWmm80hwjPBVOryoLgjrbqQSAzOgRStmOR2B+Fo78Ex8wwRkUlloLX9X /Qwm9s5lpfRwwTK2MNrm5iheUkPwtdUZ+AiMzx1ogpsn26SNd6ptXSYSTnupyKebNWkr pO8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dmarc-filter:dkim-signature:dkim-signature :arc-authentication-results; bh=mYeYtrBYGklG/Q3YwRLfbGxHzM48t/Xa4ac09FiLgaE=; b=UGbxfiSjfGGLZIo3RG26+f3S1SQs8ETgOMZd8doB/JbDluIKaHmV0upbXn5qrd9dnr sfedTJKXdm54Zx+Ri7IVI9kpzQoUgoHzOykhxDmdHp5Jv292A7kDNDATIm4nFeui4IxI U++KwWpsROY8Vt5uOPhmAb5toFeAuoSGf22VQ1pELZ0QTAeBwRUbVijUsafeLYmBvSMX Aeh2D2JGD3mh3RSSJfKaQKDFdTFCm1J1JjgvgBk4xPAglMt1MAG10QObxYSR3eN6MkpP GSZUpbodiKHPK4G1ThE+u8X7zyE5cjYwBEB56H2zt8YXWwIA3Hqyu3DqgJPNbLY3iMJW AKnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=BpU1Y8VU; dkim=pass header.i=@codeaurora.org header.s=default header.b=BpU1Y8VU; spf=pass (google.com: domain of poza@codeaurora.org designates 198.145.29.96 as permitted sender) smtp.mailfrom=poza@codeaurora.org Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=BpU1Y8VU; dkim=pass header.i=@codeaurora.org header.s=default header.b=BpU1Y8VU; spf=pass (google.com: domain of poza@codeaurora.org designates 198.145.29.96 as permitted sender) smtp.mailfrom=poza@codeaurora.org DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org BD51C6083C 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 v7 7/7] PCI/DPC: Enumerate the devices after DPC trigger event Date: Sat, 20 Jan 2018 12:05:19 +0530 Message-Id: <1516430119-3825-8-git-send-email-poza@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1516430119-3825-1-git-send-email-poza@codeaurora.org> References: <1516430119-3825-1-git-send-email-poza@codeaurora.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590092269516801366?= X-GMAIL-MSGID: =?utf-8?q?1590092269516801366?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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 7838b02..352f7f0 100644 --- a/drivers/pci/pcie/pcie-dpc.c +++ b/drivers/pci/pcie/pcie-dpc.c @@ -146,16 +146,30 @@ static int dpc_wait_rp_inactive(struct dpc_dev *dpc) static void dpc_wait_link_inactive(struct dpc_dev *dpc) { - unsigned long timeout = jiffies + HZ; struct pci_dev *pdev = dpc->dev->port; - struct device *dev = &dpc->dev->device; - u16 lnk_status; bool active = false; pci_wait_for_link(pdev, active); } /** + * 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) +{ + bool active = true; + + if (pci_wait_for_link(pdev, active)) { + 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 * @@ -413,6 +427,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); -- Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc., a Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.