UBUNTU: [Config] Enable config option CONFIG_PCIE_EDR

BugLink: https://bugs.launchpad.net/bugs/1965241
PCIE_EDR is enabling support to handle events generated when a PCIE port
disconnects to handle errors. From the comments given in the commit which
adds this option and its help, it sounds like if the OS enables DPC (down-
stream port control) which allows to control PCIE ports in parallel to the
firmware, it should also enable EDR.

Signed-off-by: Michael Reed <Michael.Reed@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
[Added annotation enforcement and bug reference, and adjust annotation
 to force arm64 to the same setting as it was before]
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 897eb2b3622d6a3eac6bd429afb25dc1dde39219..1d35cb971e3fd38ded3ce90b5dfb73461894fc32 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -7122,9 +7122,10 @@ CONFIG_PCIEAER                                  policy<{'amd64': 'y', 'arm64': '
 CONFIG_PCIEAER_INJECT                           policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 's390x': 'n'}>
 CONFIG_PCIE_ECRC                                policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 's390x': 'n'}>
 CONFIG_PCIE_DPC                                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 's390x': 'y'}>
-CONFIG_PCIE_EDR                                 policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_PCIE_EDR                                 policy<{'amd64': 'y', 'arm64': 'y'}>
 #
 CONFIG_PCIEAER_INJECT                           flag<TESTING>
+CONFIG_PCIE_EDR                                 mark<ENFORCED> note<LP: #1965241>
 
 # Menu: Device Drivers >> PCI support >> PCI Express hierarchy optimization setting
 CONFIG_PCIE_BUS_TUNE_OFF                        policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index a76b657778bb9b03c8a23e6f0c7362238c7742c9..81c6ac40d2cee8865045529f55db23777ceaebc6 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -7609,7 +7609,7 @@ CONFIG_PCIE_DW_PLAT=y
 CONFIG_PCIE_DW_PLAT_EP=y
 CONFIG_PCIE_DW_PLAT_HOST=y
 # CONFIG_PCIE_ECRC is not set
-# CONFIG_PCIE_EDR is not set
+CONFIG_PCIE_EDR=y
 CONFIG_PCIE_HISI_ERR=y
 CONFIG_PCIE_HISI_STB=y
 CONFIG_PCIE_IPROC=m