lakitu: Enable CONFIG_CMA and CONFIG_NUMA_EMU
Kubernetes has hugepage and numa test cases under topology manager.
To leverage those tests cases and make sure COS
works on baremetal when enabling topology manager in future, we need to
enable those options so the features are fully tested on COS.
BUG=b/157437819,b/171925688
TEST=Presbumit
RELEASE_NOTE=None
Change-Id: I86c430ff9b8858884dd12fddeac2a612ce2b6dfb
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/8420
Reviewed-by: Vaibhav Rustagi <vaibhavrustagi@google.com>
Tested-by: Roy Yang <royyang@google.com>
diff --git a/project-lakitu/sys-kernel/lakitu-kernel-5_4/files/base.config b/project-lakitu/sys-kernel/lakitu-kernel-5_4/files/base.config
index 8df0150..e13a9e1 100644
--- a/project-lakitu/sys-kernel/lakitu-kernel-5_4/files/base.config
+++ b/project-lakitu/sys-kernel/lakitu-kernel-5_4/files/base.config
@@ -365,7 +365,7 @@
# CONFIG_AMD_NUMA is not set
CONFIG_X86_64_ACPI_NUMA=y
CONFIG_NODES_SPAN_OTHER_NODES=y
-# CONFIG_NUMA_EMU is not set
+CONFIG_NUMA_EMU=y
CONFIG_NODES_SHIFT=6
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
@@ -832,10 +832,12 @@
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
CONFIG_HAVE_FAST_GUP=y
+CONFIG_MEMORY_ISOLATION=y
# CONFIG_MEMORY_HOTPLUG is not set
CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
CONFIG_PHYS_ADDR_T_64BIT=y
CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
@@ -849,7 +851,10 @@
CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
# CONFIG_CLEANCACHE is not set
# CONFIG_FRONTSWAP is not set
-# CONFIG_CMA is not set
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_AREAS=7
CONFIG_MEM_SOFT_DIRTY=y
# CONFIG_ZPOOL is not set
# CONFIG_ZBUD is not set
@@ -3345,6 +3350,7 @@
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
CONFIG_SWIOTLB=y
+# CONFIG_DMA_CMA is not set
# CONFIG_DMA_API_DEBUG is not set
CONFIG_SGL_ALLOC=y
CONFIG_IOMMU_HELPER=y
diff --git a/project-lakitu/sys-kernel/lakitu-kernel-5_4/lakitu-kernel-5_4-9999.ebuild b/project-lakitu/sys-kernel/lakitu-kernel-5_4/lakitu-kernel-5_4-9999.ebuild
index 0dd0102..74479f8 100644
--- a/project-lakitu/sys-kernel/lakitu-kernel-5_4/lakitu-kernel-5_4-9999.ebuild
+++ b/project-lakitu/sys-kernel/lakitu-kernel-5_4/lakitu-kernel-5_4-9999.ebuild
@@ -164,4 +164,4 @@
# NOTE: There's nothing magic keeping this number prime but you just need to
# make _any_ change to this file. ...so why not keep it prime?
#
-# The coolest prime number is: 7
+# The coolest prime number is: 11
