[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220902121405.308996274@linuxfoundation.org>
Date: Fri, 2 Sep 2022 14:18:50 +0200
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, Ben Greear <greearb@...delatech.com>,
Stefan Roese <sr@...x.de>, Bjorn Helgaas <bhelgaas@...gle.com>,
Pali Rohár <pali@...nel.org>,
"Rafael J. Wysocki" <rjw@...ysocki.net>,
Bharat Kumar Gogada <bharat.kumar.gogada@...inx.com>,
Michal Simek <michal.simek@...inx.com>,
Yao Hongbo <yaohongbo@...ux.alibaba.com>,
Naveen Naidu <naveennaidu479@...il.com>,
Sasha Levin <sashal@...nel.org>
Subject: [PATCH 5.15 26/73] Revert "PCI/portdrv: Dont disable AER reporting in get_port_device_capability()"
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
This reverts commit c968af565ca6c18b2f2af60fc1493c8db15abb3c which is
commit 8795e182b02dc87e343c79e73af6b8b7f9c5e635 upstream.
It is reported to cause problems, so drop it from the stable trees for
now until it gets sorted out.
Link: https://lore.kernel.org/r/47b775c5-57fa-5edf-b59e-8a9041ffbee7@candelatech.com
Reported-by: Ben Greear <greearb@...delatech.com>
Cc: Stefan Roese <sr@...x.de>
Cc: Bjorn Helgaas <bhelgaas@...gle.com>
Cc: Pali Rohár <pali@...nel.org>
Cc: Rafael J. Wysocki <rjw@...ysocki.net>
Cc: Bharat Kumar Gogada <bharat.kumar.gogada@...inx.com>
Cc: Michal Simek <michal.simek@...inx.com>
Cc: Yao Hongbo <yaohongbo@...ux.alibaba.com>
Cc: Naveen Naidu <naveennaidu479@...il.com>
Cc: Sasha Levin <sashal@...nel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
drivers/pci/pcie/portdrv_core.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -222,8 +222,15 @@ static int get_port_device_capability(st
#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 */
Powered by blists - more mailing lists