From patchwork Mon Jan 4 23:02:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 11997705 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9D7AC43219 for ; Mon, 4 Jan 2021 23:03:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B484E207BC for ; Mon, 4 Jan 2021 23:03:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727209AbhADXDr (ORCPT ); Mon, 4 Jan 2021 18:03:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:52492 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727119AbhADXDr (ORCPT ); Mon, 4 Jan 2021 18:03:47 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 75EA72255F; Mon, 4 Jan 2021 23:03:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1609801386; bh=Rh2aHJURwBC2xknvbCANoE2Rg4qvZj7EUZ6MjeOJbe8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lcWt3mM5LkhWGoqGNXSbCvi4D7+qcTjyW2wPuvKPEEI+C24zqyBB+JSUKajDx6E+K eRpaIezYVLOEWrgn80MwBtfqK9YlobwbAmXlkfAxIOLiAtJ16IWU7k/quWvx0V+ETE iAgEPk6Qeu2hqGnZnKd+PzE8NyqNi5Hf1q56qjw2DI+wbm/Q5eqAmXEG/TCa5dgO95 NhPUozq9y1ZXPFdDIr4USaawMT38wIPvl3tmapj03xe3r/Zaairi0wRkB0ghEzgNjc DI13pjkmtmp9NuMZIQ6ghr2qyrh9mJZ0Qj29ocRkIDEhngbiB01eZVotWHfKwLDoai +5o17cxIrZkwA== From: Keith Busch To: linux-pci@vger.kernel.org, Bjorn Helgaas Cc: Keith Busch , Sean V Kelley Subject: [PATCHv2 1/5] PCI/ERR: Clear status of the reporting device Date: Mon, 4 Jan 2021 15:02:56 -0800 Message-Id: <20210104230300.1277180-2-kbusch@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20210104230300.1277180-1-kbusch@kernel.org> References: <20210104230300.1277180-1-kbusch@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Error handling operates on the first downstream port above the detected error, but the error may have been reported by a downstream device. Clear the AER status of the device that reported the error rather than the first downstream port. Acked-by: Sean V Kelley Signed-off-by: Keith Busch --- drivers/pci/pcie/err.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c index 510f31f0ef6d..a84f0bf4c1e2 100644 --- a/drivers/pci/pcie/err.c +++ b/drivers/pci/pcie/err.c @@ -231,15 +231,14 @@ pci_ers_result_t pcie_do_recovery(struct pci_dev *dev, pci_walk_bridge(bridge, report_resume, &status); /* - * If we have native control of AER, clear error status in the Root - * Port or Downstream Port that signaled the error. If the - * platform retained control of AER, it is responsible for clearing - * this status. In that case, the signaling device may not even be - * visible to the OS. + * If we have native control of AER, clear error status in the device + * that detected the error. If the platform retained control of AER, + * it is responsible for clearing this status. In that case, the + * signaling device may not even be visible to the OS. */ if (host->native_aer || pcie_ports_native) { - pcie_clear_device_status(bridge); - pci_aer_clear_nonfatal_status(bridge); + pcie_clear_device_status(dev); + pci_aer_clear_nonfatal_status(dev); } pci_info(bridge, "device recovery successful\n"); return status;