[PATCH v3 3/6] PCI/EDR: Build EDR whenever DPC is enabled on ACPI

From: Kuppuswamy Sathyanarayanan

Date: Wed Nov 18 2026 - 13:18:22 EST


Error Disconnect Recover (EDR) is the ACPI half of the hybrid DPC model,
where firmware owns DPC and notifies the OS of containment events.

CONFIG_PCIE_EDR made EDR optional on top of CONFIG_PCIE_DPC. This adds
another knob to the decision to request DPC control in _OSC. The OS
requests DPC control only if it also supports EDR, so with
CONFIG_PCIE_EDR=n it never requests DPC control. There is little reason
to build DPC without EDR on ACPI systems.

Make CONFIG_PCIE_EDR a hidden option that is enabled whenever
CONFIG_PCIE_DPC and CONFIG_ACPI are both enabled, like CONFIG_PCIE_PME.

pci_dpc_recovered() gave up if firmware owned DPC and EDR was not
enabled. EDR is now always enabled with DPC on ACPI, and native_dpc is
only cleared by the _OSC negotiation, so remove that check.

Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@xxxxxxxxxxxxxxx>
---
Changes since v2:
- Keep CONFIG_PCIE_EDR as a hidden option instead of removing it (Yazen)
- Remove the pci_dpc_recovered() check that becomes dead (Yazen)
- New subject, was "PCI/EDR: Remove CONFIG_PCIE_EDR"

drivers/pci/pcie/Kconfig | 8 +-------
drivers/pci/pcie/dpc.c | 10 ----------
2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
index 207c2deae35f..4d097c53f140 100644
--- a/drivers/pci/pcie/Kconfig
+++ b/drivers/pci/pcie/Kconfig
@@ -138,11 +138,5 @@ config PCIE_PTM
is safe to enable even if you don't.

config PCIE_EDR
- bool "PCI Express Error Disconnect Recover support"
+ def_bool y
depends on PCIE_DPC && ACPI
- help
- This option adds Error Disconnect Recover support as specified
- in the Downstream Port Containment Related Enhancements ECN to
- the PCI Firmware Specification r3.2. Enable this if you want to
- support hybrid DPC model which uses both firmware and OS to
- implement DPC.
diff --git a/drivers/pci/pcie/dpc.c b/drivers/pci/pcie/dpc.c
index a0880e3cd68c..1e917febcbf3 100644
--- a/drivers/pci/pcie/dpc.c
+++ b/drivers/pci/pcie/dpc.c
@@ -102,19 +102,9 @@ static bool dpc_completed(struct pci_dev *pdev)
*/
bool pci_dpc_recovered(struct pci_dev *pdev)
{
- struct pci_host_bridge *host;
-
if (!pdev->dpc_cap)
return false;

- /*
- * Synchronization between hotplug and DPC is not supported
- * if DPC is owned by firmware and EDR is not enabled.
- */
- host = pci_find_host_bridge(pdev->bus);
- if (!host->native_dpc && !IS_ENABLED(CONFIG_PCIE_EDR))
- return false;
-
/*
* Need a timeout in case DPC never completes due to failure of
* dpc_wait_rp_inactive(). The spec doesn't mandate a time limit,
--
2.43.0