From: David Hildenbrand on
gitlab.com
Merge Request:
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1592
Bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=2043141
Upstream: RHEL only
The above bugzilla is for RHEL9/CS9 and I'll send a MR soon that performs
the same changes to CS9.
Enable CONFIG_CMA on aarch64 in ARK as we already have in fedora. We did
the same change for x86-64 just recently. Move the relevant configs from
redhat/configs/fedora to redhat/configs/common.
While in tech-preview, we'll require a manual configuration of cma on
the kernel command line -- we will default to "cma=0". Once e.g.,
"cma=64M"
has been specified, cma_activate_area() will call mark_tech_preview("CMA"),
essentially tainting the kernel. Once no longer in tech-preview, we can
enable CMA as default by e.g., similarly defaulting to "cma=64M".
The real change is preceded by some cleanups around CMA configs.
Signed-off-by: David Hildenbrand <david(a)redhat.com>
---
redhat/configs/ark/generic/arm/CONFIG_CMA_SIZE_MBYTES
| 1 +
redhat/configs/fedora/generic/arm/CONFIG_CMA =>
redhat/configs/common/generic/arm/CONFIG_CMA | 0
redhat/configs/fedora/generic/arm/CONFIG_CMA_ALIGNMENT =>
redhat/configs/common/generic/arm/CONFIG_CMA_ALIGNMENT | 0
redhat/configs/fedora/generic/arm/CONFIG_CMA_SIZE_SEL_MAX =>
redhat/configs/common/generic/arm/CONFIG_CMA_SIZE_SEL_MAX | 0
redhat/configs/fedora/generic/arm/CONFIG_CMA_SIZE_SEL_MBYTES =>
redhat/configs/common/generic/arm/CONFIG_CMA_SIZE_SEL_MBYTES | 0
redhat/configs/fedora/generic/arm/CONFIG_CMA_SIZE_SEL_MIN =>
redhat/configs/common/generic/arm/CONFIG_CMA_SIZE_SEL_MIN | 0
redhat/configs/fedora/generic/arm/CONFIG_CMA_SIZE_SEL_PERCENTAGE =>
redhat/configs/common/generic/arm/CONFIG_CMA_SIZE_SEL_PERCENTAGE | 0
redhat/configs/fedora/generic/arm/CONFIG_DMA_CMA =>
redhat/configs/common/generic/arm/CONFIG_DMA_CMA | 0
redhat/configs/common/generic/powerpc/CONFIG_CMA_AREAS
| 1 -
redhat/configs/common/generic/powerpc/CONFIG_CMA_DEBUG
| 1 -
redhat/configs/common/generic/powerpc/CONFIG_CMA_DEBUGFS
| 1 -
redhat/configs/common/generic/s390x/CONFIG_CMA_AREAS
| 1 -
redhat/configs/common/generic/s390x/CONFIG_CMA_DEBUG
| 1 -
redhat/configs/common/generic/s390x/CONFIG_CMA_DEBUGFS
| 1 -
redhat/configs/common/generic/x86/x86_64/CONFIG_CMA_AREAS
| 1 -
redhat/configs/common/generic/x86/x86_64/CONFIG_CMA_DEBUG
| 1 -
redhat/configs/common/generic/x86/x86_64/CONFIG_CMA_DEBUGFS
| 1 -
redhat/configs/ark/generic/CONFIG_CMA_AREAS =>
redhat/configs/common/generic/CONFIG_CMA_AREAS | 0
redhat/configs/ark/generic/CONFIG_CMA_DEBUG =>
redhat/configs/common/generic/CONFIG_CMA_DEBUG | 0
redhat/configs/ark/generic/CONFIG_CMA_DEBUGFS =>
redhat/configs/common/generic/CONFIG_CMA_DEBUGFS | 0
redhat/configs/fedora/generic/arm/CONFIG_CMA_AREAS
| 1 -
redhat/configs/fedora/generic/arm/CONFIG_CMA_DEBUG
| 1 -
redhat/configs/fedora/generic/CONFIG_CMA_SYSFS
| 1 -
23 files changed, 1 insertions(+), 12 deletions(-)