This is a note to let you know that I've just added the patch titled
Revert "PCI/portdrv: Don't disable AER reporting in get_port_device_capability()"
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-pci-portdrv-don-t-disable-aer-reporting-in-get_port_device_capability.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Thu Sep 1 01:05:20 PM CEST 2022
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 1 Sep 2022 13:01:03 +0200
Subject: Revert "PCI/portdrv: Don't disable AER reporting in get_port_device_capability()"
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
This reverts commit ee70aa214a2d9fa74539b52f6c326ba2f7c0fb11 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@xxxxxxxxxxxxxxx
Reported-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Cc: Stefan Roese <sr@xxxxxxx>
Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
Cc: Pali Rohár <pali@xxxxxxxxxx>
Cc: Rafael J. Wysocki <rjw@xxxxxxxxxxxxx>
Cc: Bharat Kumar Gogada <bharat.kumar.gogada@xxxxxxxxxx>
Cc: Michal Simek <michal.simek@xxxxxxxxxx>
Cc: Yao Hongbo <yaohongbo@xxxxxxxxxxxxxxxxx>
Cc: Naveen Naidu <naveennaidu479@xxxxxxxxx>
Cc: Sasha Levin <sashal@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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
/*
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-5.10/x86-nospec-fix-i386-rsb-stuffing.patch
queue-5.10/kbuild-fix-include-path-in-scripts-makefile.modpost.patch
queue-5.10/x86-nospec-unwreck-the-rsb-stuffing.patch
queue-5.10/s390-mm-do-not-trigger-write-fault-when-vma-does-not-allow-vm_write.patch
queue-5.10/crypto-lib-remove-unneeded-selection-of-xor_blocks.patch
queue-5.10/bluetooth-l2cap-fix-build-errors-in-some-archs.patch
queue-5.10/mm-force-tlb-flush-for-pfnmap-mappings-before-unlink_file_vma.patch
queue-5.10/revert-pci-portdrv-don-t-disable-aer-reporting-in-get_port_device_capability.patch
queue-5.10/hid-steam-prevent-null-pointer-dereference-in-steam_-recv-send-_report.patch
