[PATCH][jammy/linux-aws] UBUNTU: [Config] aws: Disable CONFIG_CMA for arm64
Tim Gardner
tim.gardner at canonical.com
Wed Jan 4 16:18:54 UTC 2023
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 at 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 --git a/debian.aws/abi/arm64/aws.modules b/debian.aws/abi/arm64/aws.modules
index 197f1c33aaeb..ca880449dbf3 100644
--- a/debian.aws/abi/arm64/aws.modules
+++ b/debian.aws/abi/arm64/aws.modules
@@ -1393,7 +1393,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 9b0d888dbab6..bdad3c5c6b4e 100644
--- a/debian.aws/config/amd64/config.common.amd64
+++ b/debian.aws/config/amd64/config.common.amd64
@@ -13,11 +13,9 @@ CONFIG_ATA_GENERIC=y
CONFIG_ATA_PIIX=y
# CONFIG_BCM_VK_TTY is not set
CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.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_GPIO_GENERIC=m
CONFIG_GPIO_GENERIC_PLATFORM=m
CONFIG_HIBERNATION=y
diff --git a/debian.aws/config/annotations b/debian.aws/config/annotations
index e73e032f630d..484ecae7d14a 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 21412671362d..e73c5570f322 100644
--- a/debian.aws/config/arm64/config.common.arm64
+++ b/debian.aws/config/arm64/config.common.arm64
@@ -13,11 +13,9 @@ CONFIG_ATA_GENERIC=m
CONFIG_ATA_PIIX=m
CONFIG_BCM_VK_TTY=y
CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0"
-CONFIG_CMA=y
CONFIG_CRC8=y
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
-CONFIG_DRM_ETNAVIV=m
CONFIG_GPIO_GENERIC=y
CONFIG_GPIO_GENERIC_PLATFORM=y
# CONFIG_HIBERNATION is not set
diff --git a/debian.aws/config/config.common.ubuntu b/debian.aws/config/config.common.ubuntu
index 8aa815250c30..352fdc61df2d 100644
--- a/debian.aws/config/config.common.ubuntu
+++ b/debian.aws/config/config.common.ubuntu
@@ -1496,16 +1496,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
@@ -2329,7 +2320,6 @@ CONFIG_DLN2_ADC=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
@@ -2344,7 +2334,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
@@ -2355,7 +2344,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_REMAP=y
CONFIG_DMA_RESTRICTED_POOL=y
CONFIG_DMA_SHARED_BUFFER=y
@@ -2457,7 +2445,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
--
2.34.1
More information about the kernel-team
mailing list