diff mbox series

[kinetic/linux-aws] UBUNTU: [Config] aws: Disable CONFIG_CMA for arm64

Message ID 20230104161855.72912-3-tim.gardner@canonical.com
State New
Headers show
Series [kinetic/linux-aws] UBUNTU: [Config] aws: Disable CONFIG_CMA for arm64 | expand

Commit Message

Tim Gardner Jan. 4, 2023, 4:18 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1990167

CONFIG_DRM_ETNAVIV must also be disabled since it selects
CONFIG_CMA. This is not a GPU supported on the AWS platforms.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 debian.aws/abi/arm64/aws.modules            |  1 -
 debian.aws/config/amd64/config.common.amd64 |  2 --
 debian.aws/config/annotations               | 17 +++++++++++++++++
 debian.aws/config/arm64/config.common.arm64 |  2 --
 debian.aws/config/config.common.ubuntu      | 16 ++--------------
 5 files changed, 19 insertions(+), 19 deletions(-)
diff mbox series

Patch

diff --git a/debian.aws/abi/arm64/aws.modules b/debian.aws/abi/arm64/aws.modules
index c1f4e94ef47c..f01a187da9d7 100644
--- a/debian.aws/abi/arm64/aws.modules
+++ b/debian.aws/abi/arm64/aws.modules
@@ -1440,7 +1440,6 @@  et131x
 et8ek8
 etas_es58x
 ethoc
-etnaviv
 evbug
 exc3000
 exfat
diff --git a/debian.aws/config/amd64/config.common.amd64 b/debian.aws/config/amd64/config.common.amd64
index dffdcceaa34c..e3898f7967dc 100644
--- a/debian.aws/config/amd64/config.common.amd64
+++ b/debian.aws/config/amd64/config.common.amd64
@@ -14,11 +14,9 @@  CONFIG_ATA_GENERIC=y
 CONFIG_ATA_PIIX=y
 # CONFIG_BCM_VK_TTY is not set
 CONFIG_CC_VERSION_TEXT="x86_64-linux-gnu-gcc-12 (Ubuntu 12.2.0-3ubuntu1) 12.2.0"
-# CONFIG_CMA is not set
 CONFIG_CRC8=m
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-# CONFIG_DRM_ETNAVIV is not set
 CONFIG_HIBERNATION=y
 CONFIG_I2C_AMD_MP2=m
 # CONFIG_I2C_SLAVE is not set
diff --git a/debian.aws/config/annotations b/debian.aws/config/annotations
index 311e01b52965..bad584511b94 100644
--- a/debian.aws/config/annotations
+++ b/debian.aws/config/annotations
@@ -4,6 +4,23 @@ 
 
 include ../../debian.master/config/annotations
 
+CONFIG_CMA                                         policy<{'amd64': 'n', 'arm64': 'n'}> note<LP: #1990167>
+CONFIG_CMA_SIZE_SEL_MBYTES                         policy<{'arm64': '-'}>
+CONFIG_CMA_SIZE_SEL_PERCENTAGE                     policy<{'arm64': '-'}>
+CONFIG_CMA_SIZE_SEL_MIN                            policy<{'arm64': '-'}>
+CONFIG_CMA_SIZE_SEL_MAX                            policy<{'arm64': '-'}>
+CONFIG_CMA_DEBUG                                   policy<{'arm64': '-'}>
+CONFIG_DMA_PERNUMA_CMA                             policy<{'arm64': '-'}>
+CONFIG_DMA_CMA                                     policy<{'arm64': '-'}>
+CONFIG_DMABUF_HEAPS_CMA                            policy<{'arm64': '-'}>
+CONFIG_CMA_AREAS                                   policy<{'arm64': '-'}>
+CONFIG_CMA_SYSFS                                   policy<{'arm64': '-'}>
+CONFIG_CMA_DEBUGFS                                 policy<{'arm64': '-'}>
+CONFIG_CMA_ALIGNMENT                               policy<{'arm64': '-'}>
+CONFIG_CMA_SIZE_MBYTES                             policy<{'arm64': '-'}>
+CONFIG_DRM_ETNAVIV                                 policy<{'amd64': 'n', 'arm64': 'n'}> note<LP: #1990167>
+CONFIG_DRM_ETNAVIV_THERMAL                         policy<{'arm64': '-'}> note<LP: #1990167>
+
 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'}>
diff --git a/debian.aws/config/arm64/config.common.arm64 b/debian.aws/config/arm64/config.common.arm64
index 61f9accef8cf..170d1cb01cf8 100644
--- a/debian.aws/config/arm64/config.common.arm64
+++ b/debian.aws/config/arm64/config.common.arm64
@@ -14,11 +14,9 @@  CONFIG_ATA_GENERIC=m
 CONFIG_ATA_PIIX=m
 CONFIG_BCM_VK_TTY=y
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc-12 (Ubuntu 12.2.0-3ubuntu1) 12.2.0"
-CONFIG_CMA=y
 CONFIG_CRC8=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
-CONFIG_DRM_ETNAVIV=m
 # CONFIG_HIBERNATION is not set
 # CONFIG_I2C_AMD_MP2 is not set
 CONFIG_I2C_SLAVE=y
diff --git a/debian.aws/config/config.common.ubuntu b/debian.aws/config/config.common.ubuntu
index a7bce644eedc..ca56d03e225c 100644
--- a/debian.aws/config/config.common.ubuntu
+++ b/debian.aws/config/config.common.ubuntu
@@ -1574,16 +1574,7 @@  CONFIG_CM3232=m
 CONFIG_CM3323=m
 CONFIG_CM3605=m
 CONFIG_CM36651=m
-CONFIG_CMA_ALIGNMENT=8
-CONFIG_CMA_AREAS=7
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_SIZE_MBYTES=32
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-CONFIG_CMA_SYSFS=y
+# CONFIG_CMA is not set
 CONFIG_CMDLINE="console=ttyAMA0"
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_FORCE is not set
@@ -2428,7 +2419,6 @@  CONFIG_DM9051=m
 CONFIG_DM9102=m
 # CONFIG_DMABUF_DEBUG is not set
 CONFIG_DMABUF_HEAPS=y
-CONFIG_DMABUF_HEAPS_CMA=y
 CONFIG_DMABUF_HEAPS_SYSTEM=y
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_SELFTESTS is not set
@@ -2443,7 +2433,6 @@  CONFIG_DMAR_TABLE=y
 CONFIG_DMA_ACPI=y
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_DMA_BCM2835=y
-CONFIG_DMA_CMA=y
 CONFIG_DMA_COHERENT_POOL=y
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_DMA_DIRECT_REMAP=y
@@ -2454,7 +2443,6 @@  CONFIG_DMA_ENGINE_RAID=y
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_DMA_OF=y
 CONFIG_DMA_OPS=y
-CONFIG_DMA_PERNUMA_CMA=y
 CONFIG_DMA_RESTRICTED_POOL=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMA_SUN6I=m
@@ -2562,7 +2550,7 @@  CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_CEC=m
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_DW_MIPI_DSI=m
-CONFIG_DRM_ETNAVIV_THERMAL=y
+# CONFIG_DRM_ETNAVIV is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
 CONFIG_DRM_FBDEV_OVERALLOC=100