Unverified Commit 50444f81 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14195 [OLK-6.6]Hygon: Enable CONFIG_CMA by default on X86 architecture 

Merge Pull Request from: @hanliyang 
 
Enable CONFIG_CMA by default on X86 architecture

issue:
https://gitee.com/open_euler/dashboard?issue_id=IBBNJI

Enable CONFIG_CMA will change the kabi. 
 
Link:https://gitee.com/openeuler/kernel/pulls/14195
parents bfb670be 6199dbe5

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2075,6 +2075,7 @@ config HYGON_CSV 
	bool "Hygon secure virtualization CSV support"

	default y

	depends on CPU_SUP_HYGON && AMD_MEM_ENCRYPT

	select CONFIG_CMA

	help

	  Hygon CSV integrates secure processor, memory encryption and

	  memory isolation to provide the ability to protect guest's private

arch/x86/configs/openeuler_defconfig

+17 −1
Original line number Diff line number Diff line
@@ -1158,7 +1158,11 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y 
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y

CONFIG_USE_PERCPU_NUMA_NODE_ID=y

CONFIG_HAVE_SETUP_PER_CPU_AREA=y

# CONFIG_CMA is not set

CONFIG_CMA=y

# CONFIG_CMA_DEBUG is not set

# CONFIG_CMA_DEBUGFS is not set

# CONFIG_CMA_SYSFS is not set

CONFIG_CMA_AREAS=19

CONFIG_MEM_SOFT_DIRTY=y

CONFIG_GENERIC_EARLY_IOREMAP=y

CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
@@ -9018,6 +9022,18 @@ CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y 
CONFIG_SWIOTLB=y

# CONFIG_SWIOTLB_DYNAMIC is not set

CONFIG_DMA_COHERENT_POOL=y

CONFIG_DMA_CMA=y

# CONFIG_DMA_NUMA_CMA is not set



#

# Default contiguous memory area size:

#

CONFIG_CMA_SIZE_MBYTES=0

CONFIG_CMA_SIZE_SEL_MBYTES=y

# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set

# CONFIG_CMA_SIZE_SEL_MIN is not set

# CONFIG_CMA_SIZE_SEL_MAX is not set

CONFIG_CMA_ALIGNMENT=8

# CONFIG_DMA_API_DEBUG is not set

# CONFIG_DMA_MAP_BENCHMARK is not set

CONFIG_SGL_ALLOC=y