[SRU][J][PATCH v2 3/3] Enable config option CONFIG_PCIE_EDR

[Tim Gardner]

On 5/17/22 15:08, Michael Reed wrote:
> From: Michael Reed <Michael.Reed at canonical.com>
> 
> 
> BugLink: https://bugs.launchpad.net/bugs/1965241
> 
> ---
>   debian.master/config/annotations          | 2 +-
>   debian.master/config/config.common.ubuntu | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> index 15759fa435bd..1a014729b79d 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -7091,7 +7091,7 @@ 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': 'n'}>

We generally note why a config change is made by adding a line like this:

CONFIG_PCIE_EDR mark<ENFORCED> note<LP: #1965241>

Granted, one could go back in git history to figure it out, but when 
you're as lazy as I am this is much quicker.

rtg

>   #
>   CONFIG_PCIEAER_INJECT                           flag<TESTING>
>   
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 0fffe06795c0..624831a93860 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -7603,7 +7603,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

-- 
-----------
Tim Gardner
Canonical, Inc