diff options
Diffstat (limited to '0008-Revert-PCI-portdrv-Don-t-disable-AER-reporting-in-ge.patch')
| -rw-r--r-- | 0008-Revert-PCI-portdrv-Don-t-disable-AER-reporting-in-ge.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/0008-Revert-PCI-portdrv-Don-t-disable-AER-reporting-in-ge.patch b/0008-Revert-PCI-portdrv-Don-t-disable-AER-reporting-in-ge.patch new file mode 100644 index 000000000000..6d735d532707 --- /dev/null +++ b/0008-Revert-PCI-portdrv-Don-t-disable-AER-reporting-in-ge.patch @@ -0,0 +1,55 @@ +From adb9caabcd16a4a7535f3fcce79d98eab185d434 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Thu, 1 Sep 2022 13:01:03 +0200 +Subject: [PATCH 08/73] Revert "PCI/portdrv: Don't disable AER reporting in + get_port_device_capability()" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit 65e393fddc5379b2c41ca7e73cd4bb9572c4d90e 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@candelatech.com> +Cc: Stefan Roese <sr@denx.de> +Cc: Bjorn Helgaas <bhelgaas@google.com> +Cc: Pali Rohár <pali@kernel.org> +Cc: Rafael J. Wysocki <rjw@rjwysocki.net> +Cc: Bharat Kumar Gogada <bharat.kumar.gogada@xilinx.com> +Cc: Michal Simek <michal.simek@xilinx.com> +Cc: Yao Hongbo <yaohongbo@linux.alibaba.com> +Cc: Naveen Naidu <naveennaidu479@gmail.com> +Cc: Sasha Levin <sashal@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/pci/pcie/portdrv_core.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c +index 1ac7fec47d6f..604feeb84ee4 100644 +--- a/drivers/pci/pcie/portdrv_core.c ++++ b/drivers/pci/pcie/portdrv_core.c +@@ -222,8 +222,15 @@ 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.37.3 + |