[PATCH][kinetic:linux-aws] UBUNTU: [Config] aws: CONFIG_IOMMU_DEFAULT_DMA_LAZY=y for arm64

[Tim Gardner]

BugLink: https://bugs.launchpad.net/bugs/1806488

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.aws/config/amd64/config.common.amd64 | 2 --
 debian.aws/config/annotations               | 5 +++++
 debian.aws/config/arm64/config.common.arm64 | 2 --
 debian.aws/config/config.common.ubuntu      | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian.aws/config/amd64/config.common.amd64 b/debian.aws/config/amd64/config.common.amd64
index c7df06f2d09a..492478bbd291 100644
--- a/debian.aws/config/amd64/config.common.amd64
+++ b/debian.aws/config/amd64/config.common.amd64
@@ -22,8 +22,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_HIBERNATION=y
 CONFIG_I2C_AMD_MP2=m
 # CONFIG_I2C_SLAVE is not set
-CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
-# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
 # CONFIG_KEYBOARD_CYPRESS_SF is not set
 CONFIG_KVM=m
 CONFIG_MII=m
diff --git a/debian.aws/config/annotations b/debian.aws/config/annotations
index b0de978d08cc..311e01b52965 100644
--- a/debian.aws/config/annotations
+++ b/debian.aws/config/annotations
@@ -4,6 +4,11 @@
 
 include ../../debian.master/config/annotations
 
+CONFIG_IOMMU_DEFAULT_DMA_STRICT                    policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_IOMMU_DEFAULT_DMA_STRICT                    note<LP: #1806488>
+CONFIG_IOMMU_DEFAULT_DMA_LAZY                      policy<{'amd64': 'y', 'arm64': 'y'}>
+CONFIG_IOMMU_DEFAULT_DMA_LAZY                      note<LP: #1806488>
+
 CONFIG_NITRO_ENCLAVES                              policy<{'amd64': 'm', 'arm64': 'm'}>
 CONFIG_ACCESSIBILITY                               policy<{'amd64': 'n', 'arm64': 'n'}> 
 CONFIG_SPEAKUP                                     policy<{'amd64': '-', 'arm64': '-'}> 
diff --git a/debian.aws/config/arm64/config.common.arm64 b/debian.aws/config/arm64/config.common.arm64
index 0548b8619350..74a532fe7ecd 100644
--- a/debian.aws/config/arm64/config.common.arm64
+++ b/debian.aws/config/arm64/config.common.arm64
@@ -22,8 +22,6 @@ CONFIG_DRM_ETNAVIV=m
 # CONFIG_HIBERNATION is not set
 # CONFIG_I2C_AMD_MP2 is not set
 CONFIG_I2C_SLAVE=y
-# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
-CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
 CONFIG_KEYBOARD_CYPRESS_SF=m
 CONFIG_KVM=y
 CONFIG_MII=y
diff --git a/debian.aws/config/config.common.ubuntu b/debian.aws/config/config.common.ubuntu
index aaa573b57e15..64f5141e60ae 100644
--- a/debian.aws/config/config.common.ubuntu
+++ b/debian.aws/config/config.common.ubuntu
@@ -4842,6 +4842,8 @@ CONFIG_IOASID=y
 CONFIG_IOMMU_API=y
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_IOMMU_DEBUGFS is not set
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_DMA=y
 CONFIG_IOMMU_HELPER=y
-- 
2.34.1