Commit 141da59f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Jialin Zhang
Browse files

Revert "PCI/portdrv: Don't disable AER reporting in get_port_device_capability()" 

stable inclusion
from stable-v5.10.141
commit 412b844143e351ea803c17ecc6675552f3ca771b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I685FC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=412b844143e351ea803c17ecc6675552f3ca771b

--------------------------------

This reverts commit ee70aa214a2d9fa74539b52f6c326ba2f7c0fb11 which is
commit 8795e182 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: default avatarBen 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 667ba256

drivers/pci/pcie/portdrv_core.c

+8 −1
Original line number Diff line number Diff line
@@ -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 */