[SRU v2][F/oracle][PATCH 1/1] UBUNTU: [config] Enable ARM_SMMU and ARM_SMMU_V3

[Tim Gardner]

On 1/10/23 12:48 AM, Khalid Elmously wrote:
> BugLink: https://bugs.launchpad.net/bugs/2002381
> 
> Signed-off-by: Khalid Elmously <khalid.elmously at canonical.com>
> ---
>   debian.oracle/config/annotations          | 23 +++++++++++++++--------
>   debian.oracle/config/config.common.ubuntu | 10 +++++++---
>   2 files changed, 22 insertions(+), 11 deletions(-)
> 
> diff --git a/debian.oracle/config/annotations b/debian.oracle/config/annotations
> index 6e9d80805fc30d..53de038fb3aea8 100644
> --- a/debian.oracle/config/annotations
> +++ b/debian.oracle/config/annotations
> @@ -4,12 +4,6 @@
> 
>   include "../../debian.master/config/annotations"
> 
> -CONFIG_FAILOVER                                   policy<{'amd64': 'm', 'arm64':'m'}>
> -CONFIG_FAILOVER                                   mark<ENFORCED> note<OCI requirement>
> -CONFIG_NET_FAILOVER                               policy<{'amd64': 'm', 'arm64':'m'}>
> -CONFIG_NET_FAILOVER                               mark<ENFORCED> note<OCI requirement>
> -CONFIG_PAGE_POOL                                  policy<{'amd64': 'y', 'arm64':'y'}>
> -CONFIG_PAGE_POOL                                  mark<ENFORCED> note<OCI requirement>
>   CONFIG_SOUNDWIRE                                  policy<{'amd64': 'n', 'arm64':'n'}>
>   CONFIG_SOUNDWIRE                                  mark<ENFORCED> note<not needed for cloud kernels>
>   CONFIG_SND_SOC_SOF_HDA_COMMON_HDMI_CODEC          policy<{'amd64': 'n'}>
> @@ -36,8 +30,6 @@ CONFIG_MTD_DOCG3                                  policy<{'amd64': 'm', 'arm64':
>   CONFIG_MTD_DOCG3                                  mark<ENFORCED> note<LP:1792205>
>   CONFIG_SAMPLE_TRACE_PRINTK                        policy<{'amd64': '-'}>
>   CONFIG_SAMPLE_TRACE_PRINTK                        mark<ENFORCED> note<Disabled for cloud kernel>
> -CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT         policy<{'arm64': '-'}>
> -CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT         mark<ENFORCED> note<not needed for cloud kernels>
>   CONFIG_REGULATOR_TPS65217                         policy<{'arm64': '-'}>
>   CONFIG_REGULATOR_TPS65217                         mark<ENFORCED> note<not needed for cloud kernels>
>   CONFIG_MFD_TPS65217                               policy<{'arm64': 'n'}>
> @@ -60,3 +52,18 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE                  mark<ENFORCED> note<needed for
>   # Menu: Processor type and features >> Architecture: arm64
>   CONFIG_ARM64_SW_TTBR0_PAN                       policy<{'arm64': 'y'}>
>   CONFIG_ARM64_SW_TTBR0_PAN                      mark<ENFORCED> note<LP: #1968902>
> +
> +
> +
> +
> +# Specifically requested or needed by Oracle:
> +CONFIG_FAILOVER                                   policy<{'amd64': 'm', 'arm64':'m'}>
> +CONFIG_FAILOVER                                   mark<ENFORCED> note<OCI requirement>
> +CONFIG_NET_FAILOVER                               policy<{'amd64': 'm', 'arm64':'m'}>
> +CONFIG_NET_FAILOVER                               mark<ENFORCED> note<OCI requirement>
> +CONFIG_PAGE_POOL                                  policy<{'amd64': 'y', 'arm64':'y'}>
> +CONFIG_PAGE_POOL                                  mark<ENFORCED> note<OCI requirement>
> +CONFIG_ARM_SMMU                                   policy<{'arm64':'y'}>
> +CONFIG_ARM_SMMU                                   mark<ENFORCED> note<Requested by Oracle after suspected related to some
> boot-issues, LP #2002381>
> +CONFIG_ARM_SMMU_V3                                policy<{'arm64':'y'}>
> +CONFIG_ARM_SMMU_V3                                mark<ENFORCED> note<Requested by Oracle after suspected related to some
> boot-issues, LP #2002381>
> diff --git a/debian.oracle/config/config.common.ubuntu b/debian.oracle/config/config.common.ubuntu
> index 55547ac2120021..d54157c2a45637 100644
> --- a/debian.oracle/config/config.common.ubuntu
> +++ b/debian.oracle/config/config.common.ubuntu
> @@ -518,8 +518,10 @@ CONFIG_ARM_PSCI_FW=y
>   # CONFIG_ARM_SCMI_PROTOCOL is not set
>   # CONFIG_ARM_SCPI_PROTOCOL is not set
>   # CONFIG_ARM_SDE_INTERFACE is not set
> -# CONFIG_ARM_SMMU is not set
> -# CONFIG_ARM_SMMU_V3 is not set
> +CONFIG_ARM_SMMU=y
> +# CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT is not set
> +CONFIG_ARM_SMMU_V3=y
> +CONFIG_ARM_SMMU_V3_PMU=m
>   # CONFIG_ARM_SP805_WATCHDOG is not set
>   # CONFIG_ARM_SPE_PMU is not set
>   CONFIG_AS3935=m
> @@ -3696,8 +3698,10 @@ CONFIG_IOMMU_API=y
>   CONFIG_IOMMU_DMA=y
>   CONFIG_IOMMU_HELPER=y
>   CONFIG_IOMMU_IOVA=y
> +CONFIG_IOMMU_IO_PGTABLE=y
>   # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
> -# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
> +CONFIG_IOMMU_IO_PGTABLE_LPAE=y
> +# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
>   CONFIG_IOMMU_SUPPORT=y
>   # CONFIG_ION is not set
>   CONFIG_IONIC=m
> 

Instead of 'note<OCI requirement>', how about 'note<LP: #2002381.' ? 
That links the chain of logic for why the config change was made.
-- 
-----------
Tim Gardner
Canonical, Inc