Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3419245rwa; Tue, 23 Aug 2022 04:35:29 -0700 (PDT) X-Google-Smtp-Source: AA6agR7UfZBIg7Dt8asBi8FeKg08/Zh5NWlk2hs/rbpFJaDf7N6GQapZuw5I81PS5FF0foSDx5My X-Received: by 2002:a17:907:a059:b0:73d:62cf:cbc9 with SMTP id gz25-20020a170907a05900b0073d62cfcbc9mr10638982ejc.394.1661254529172; Tue, 23 Aug 2022 04:35:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661254529; cv=none; d=google.com; s=arc-20160816; b=Fpr1sKdf6AhJCfucGDrCzVBbLH9CgjbC67gykl4O4H+Fa7ITM7DCMGbVe59r87sCaE sFBA4Bh81ftjl08sbCD1lHVut1BIJkfVx4rYbHn3jWVUZDCsDngaJVbjh3qfRh7TCWjC C1/WoDo+046AT8thEtukS/F5RSKBaV7yKUxq35OT94rqaGkNGFN2cPIVw73zMD4dHXMo 477keDHfl6mySMsv8Hg+axkICWozQMDTb4dHNvU2ICBuM8QQh2aPPdxAAxpkMQTT+gmc YTmLvMu2qXH1Oew/OvF100dcjJ62lLjsQHPHrKJHS5pcD2F9t+YjrqgBqhqsEVULGdAr 9EVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tRgdchgQ2SSIO4Klfx1WD9H6x2CBr+LHl7nDEpi3W7s=; b=Oxw9VvfLIeppiDu1jLHwhMNUQ2Hd3EG8BgMtyxyGpU8IpwhYh6A6kU3So+48fQ/shn SeEd+xMS1atx34J8uZYQEJEk4zryBBPogiXCzM4cbdesew5ZPB7ke3OclLWJA8/K8LYd PkQcRoOwGoyihvN1NqquNXpkJUkZIeKTQcY9XOZngOo8wMiTT7sekMMUOedeZP3VIzLG hTFj/FQj5VrFL8FSWccIWPjLNBtYAPRNmcEnFKJEhf7pzOfXL2OkZcimO1rsFZPOI7xC 7ZgU0hIghEcfaTWo3Cztdenu9v1kV1whv2LOzeTVyiIyKJCRFqwYmvwGyWpe/jwQr/WM S0fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Y+R9DJKS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q20-20020a056402519400b00443cce19cb8si1962118edd.466.2022.08.23.04.35.03; Tue, 23 Aug 2022 04:35:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Y+R9DJKS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357349AbiHWLbh (ORCPT + 99 others); Tue, 23 Aug 2022 07:31:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357859AbiHWL0y (ORCPT ); Tue, 23 Aug 2022 07:26:54 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DE6FC0E5B; Tue, 23 Aug 2022 02:24:33 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7605EB81C89; Tue, 23 Aug 2022 09:24:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84D0AC4314B; Tue, 23 Aug 2022 09:24:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661246670; bh=2tU/kM5H2cvuoqxSUPxpQ9SiENVxFijCjzjdIv813eA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y+R9DJKSo1p6oV/YqDLFewfWUa0B0EOZs0cac4dUo9l7qH/SBO3i0L4su208puTVA 2W3k/mGUHn4CWEP2ZDwTnRVx4BobdMh2isTICLnFEabkd/SIFxVkUjc1vHItAZneAA qv9SmylUudsXt9O5X2VY9yccy6/Wf6J1hqjI0BXg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Roese , Bjorn Helgaas , =?UTF-8?q?Pali=20Roh=C3=A1r?= , "Rafael J. Wysocki" , Bharat Kumar Gogada , Michal Simek , Yao Hongbo , Naveen Naidu , Sasha Levin Subject: [PATCH 5.4 182/389] PCI/portdrv: Dont disable AER reporting in get_port_device_capability() Date: Tue, 23 Aug 2022 10:24:20 +0200 Message-Id: <20220823080123.228828362@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080115.331990024@linuxfoundation.org> References: <20220823080115.331990024@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefan Roese [ Upstream commit 8795e182b02dc87e343c79e73af6b8b7f9c5e635 ] AER reporting is currently disabled in the DevCtl registers of all non Root Port PCIe devices on systems using pcie_ports_native || host->native_aer, disabling AER completely in such systems. This is because 2bd50dd800b5 ("PCI: PCIe: Disable PCIe port services during port initialization"), added a call to pci_disable_pcie_error_reporting() *after* the AER setup was completed for the PCIe device tree. Here a longer analysis about the current status of AER enabling / disabling upon bootup provided by Bjorn: pcie_portdrv_probe pcie_port_device_register get_port_device_capability pci_disable_pcie_error_reporting clear CERE NFERE FERE URRE # <-- disable for RP USP DSP pcie_device_init device_register # new AER service device aer_probe aer_enable_rootport # RP only set_downstream_devices_error_reporting set_device_error_reporting # self (RP) if (RP || USP || DSP) pci_enable_pcie_error_reporting set CERE NFERE FERE URRE # <-- enable for RP pci_walk_bus set_device_error_reporting if (RP || USP || DSP) pci_enable_pcie_error_reporting set CERE NFERE FERE URRE # <-- enable for USP DSP In a typical Root Port -> Endpoint hierarchy, the above: - Disables Error Reporting for the Root Port, - Enables Error Reporting for the Root Port, - Does NOT enable Error Reporting for the Endpoint because it is not a Root Port or Switch Port. In a deeper Root Port -> Upstream Switch Port -> Downstream Switch Port -> Endpoint hierarchy: - Disables Error Reporting for the Root Port, - Enables Error Reporting for the Root Port, - Enables Error Reporting for both Switch Ports, - Does NOT enable Error Reporting for the Endpoint because it is not a Root Port or Switch Port, - Disables Error Reporting for the Switch Ports when pcie_portdrv_probe() claims them. AER does not re-enable it because these are not Root Ports. Remove this call to pci_disable_pcie_error_reporting() from get_port_device_capability(), leaving the already enabled AER configuration intact. With this change, AER is enabled in the Root Port and the PCIe switch upstream and downstream ports. Only the PCIe Endpoints don't have AER enabled yet. A follow-up patch will take care of this Endpoint enabling. Fixes: 2bd50dd800b5 ("PCI: PCIe: Disable PCIe port services during port initialization") Link: https://lore.kernel.org/r/20220125071820.2247260-3-sr@denx.de Signed-off-by: Stefan Roese Signed-off-by: Bjorn Helgaas Reviewed-by: Pali Rohár Cc: Rafael J. Wysocki Cc: Bharat Kumar Gogada Cc: Michal Simek Cc: Yao Hongbo Cc: Naveen Naidu Signed-off-by: Sasha Levin --- drivers/pci/pcie/portdrv_core.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c index 8637f6068f9c..066406d6d0ee 100644 --- a/drivers/pci/pcie/portdrv_core.c +++ b/drivers/pci/pcie/portdrv_core.c @@ -222,15 +222,8 @@ static int get_port_device_capability(struct pci_dev *dev) #ifdef CONFIG_PCIEAER if (dev->aer_cap && pci_aer_available() && - (pcie_ports_native || host->native_aer)) { + (pcie_ports_native || host->native_aer)) services |= PCIE_PORT_SERVICE_AER; - - /* - * Disable AER on this port in case it's been enabled by the - * BIOS (the AER service driver will enable it when necessary). - */ - pci_disable_pcie_error_reporting(dev); - } #endif /* -- 2.35.1