Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp2915148rwb; Mon, 15 Aug 2022 13:59:53 -0700 (PDT) X-Google-Smtp-Source: AA6agR6Ghu72TYbmyI2XV8aBaHHH4e2dhm3EJmcgh6VlLQ1uIwFZmpT3ynCooJ3qieB71xx2kqtT X-Received: by 2002:a63:81c7:0:b0:422:c166:b53a with SMTP id t190-20020a6381c7000000b00422c166b53amr12439002pgd.86.1660597192815; Mon, 15 Aug 2022 13:59:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660597192; cv=none; d=google.com; s=arc-20160816; b=Q6EdTnf+7atpFLyq3gXwqMI4qNsKMgYAce8NcaI1fQXWAMg/UhrXspowg9EDKLarsP /zmsIlU3kvsZ5+66W5Zuw6oJa7LCQetgLRb8V+wNHyOK8kwJvKveNMt98zVW5PpIEeQ8 fYVLkGr4lTiFz9IzP2Dq+CkA23BRhytIFXponZIqneCPj/kNsIp7rynRSBthK1sT79GU mRF2qf17tY8BPxAc4jd8ei8m732BG1ntVS/Ywlv+mtT6l9ZyzbDx+gEJ1wnQYuLyEdEx 4OtB/Bn0nFx0hiiMdXiCDymgv2drMnfWwCddkzvoBIO4sefTdJDjzPFtM9ZmJiQqDETR 3Yug== 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=nvfIsebtIhFKpcTQ2/rsvmhyzpxKc2onlCWGVU9JXH4=; b=VAn4rmSkbSmgWVWvfC0ImDLoaSbQUR4t4rUVQx9neEhDG0Mja6eG6iMlAfje6sfIvE MqKIYIjI6S4p/WtuDrw6zizAgAoUP8ULLD2Jw7I9Wd60nbeflqlzrCBmZX1urywfaJvb O9i6r6x/IhsPp+ORJjNqvLVL41uLbChuz0X33Y4x5aZCZ++sSQoNeMxPzxn8Ewl2D2Y0 FwdMpYwbdzVO6wfA4DC1yeMlqCk4EDF6BFShVi+wBeaXPZWOQteOhZpy1cx49s58loBX 8KL5gosFz6cjRrPuN9LQaIlP7Q3gs/b/RlAkY/vmbwJH+7/IqonR4971KmngDbcn7mjj +tqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ImZRJ3G5; 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 a63-20020a639042000000b0041b698ead1asi11582610pge.794.2022.08.15.13.59.41; Mon, 15 Aug 2022 13:59:52 -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=ImZRJ3G5; 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 S1344119AbiHOTTe (ORCPT + 99 others); Mon, 15 Aug 2022 15:19:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344504AbiHOTQu (ORCPT ); Mon, 15 Aug 2022 15:16:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2B6B2DAAE; Mon, 15 Aug 2022 11:38:19 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 8842060FB8; Mon, 15 Aug 2022 18:38:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D66DC433C1; Mon, 15 Aug 2022 18:38:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660588697; bh=TSsNCgelctt+58xqKftZUVvkb58cH3/mqhqsM63/6wk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ImZRJ3G5vhtua67goD7jj1CBoVJna/WDec7uV68lAIN8pVYf4pOQIXLGRXI6IEs62 FrcXZarGpoQ5mFzIWjJr0pEOG3u6kqyMGWqBqiuovoy82xFzRKSH6E5IgTpxu7Dras I3L2coBYEGkHgv0NXQFQ6ebMhwiwkbXPzRq2FNUo= 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.15 485/779] PCI/portdrv: Dont disable AER reporting in get_port_device_capability() Date: Mon, 15 Aug 2022 20:02:09 +0200 Message-Id: <20220815180357.995081206@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180337.130757997@linuxfoundation.org> References: <20220815180337.130757997@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 604feeb84ee4..1ac7fec47d6f 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 /* Root Ports and Root Complex Event Collectors may generate PMEs */ -- 2.35.1