From c1916ee5d3cf2c10352e236cc13a77bd6411446a Mon Sep 17 00:00:00 2001 From: Jianxiong Pan Date: Thu, 15 Sep 2022 15:33:03 +0800 Subject: [PATCH] mm: move the config to meet the gki request. [3/3] PD#SWPL-94445 Problem: gki break. Solution: move the config to meet the gki request. Verify: build pass. Change-Id: I6b878a5d8fc10317634143b815a69b2206753033 Signed-off-by: Jianxiong Pan --- arch/arm64/configs/amlogic_gki.10 | 27 ++++++++++++++++++++++++++- arch/arm64/configs/amlogic_gki.debug | 24 +----------------------- drivers/memory_ext/Kconfig | 2 +- drivers/memory_ext/mem_debug.c | 3 +++ drivers/memory_ext/memory.c | 2 +- include/linux/amlogic/aml_cma.h | 3 --- 6 files changed, 32 insertions(+), 29 deletions(-) diff --git a/arch/arm64/configs/amlogic_gki.10 b/arch/arm64/configs/amlogic_gki.10 index 500f471ad..36843b3ff 100644 --- a/arch/arm64/configs/amlogic_gki.10 +++ b/arch/arm64/configs/amlogic_gki.10 @@ -7,4 +7,29 @@ CONFIG_AMLOGIC_SERIAL_EARLY_CONSOLE=y CONFIG_I2C_COMPAT=y # usb xxx ko -CONFIG_AMLOGIC_COMMON_USB=y \ No newline at end of file +CONFIG_AMLOGIC_COMMON_USB=y + +# build in for amlogic memory change +CONFIG_CMA_SIZE_MBYTES=8 +CONFIG_AMLOGIC_MEMORY_EXTEND=y +CONFIG_AMLOGIC_MEM_DEBUG=y +CONFIG_AMLOGIC_CMA=y +CONFIG_AMLOGIC_PAGE_TRACE=y +CONFIG_AMLOGIC_SLAB_TRACE=y +CONFIG_AMLOGIC_FILE_CACHE=y +CONFIG_AMLOGIC_STACKPROTECTOR=y +CONFIG_AMLOGIC_USER_FAULT=y +CONFIG_AMLOGIC_WATCHPOINT=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_DMABUF_HEAPS_SYSTEM=m +CONFIG_AMLOGIC_ZSTD=y + +# amlogic-ddr-tool.ko +CONFIG_AMLOGIC_DDR_TOOL=y +CONFIG_AMLOGIC_DDR_BANDWIDTH=y +CONFIG_AMLOGIC_DDR_BANDWIDTH_S4=y +CONFIG_AMLOGIC_DDR_BANDWIDTH_G12=y +CONFIG_AMLOGIC_DMC_MONITOR=y +CONFIG_AMLOGIC_DMC_MONITOR_S4=y +CONFIG_AMLOGIC_DMC_MONITOR_TM2=y +CONFIG_AMLOGIC_DMC_MONITOR_G12=y diff --git a/arch/arm64/configs/amlogic_gki.debug b/arch/arm64/configs/amlogic_gki.debug index 72aaca35e..f54333bc1 100644 --- a/arch/arm64/configs/amlogic_gki.debug +++ b/arch/arm64/configs/amlogic_gki.debug @@ -8,20 +8,8 @@ CONFIG_AMLOGIC_DEBUG_FILE=y # ONFIG_AMLOGIC_SAMPLES_DEBUG_FILE_TEST=m # build in for amlogic memory change -CONFIG_CMA_SIZE_MBYTES=8 -CONFIG_AMLOGIC_MEMORY_EXTEND=y -CONFIG_AMLOGIC_PAGE_TRACE=y -CONFIG_AMLOGIC_SLAB_TRACE=y -CONFIG_AMLOGIC_CMA=y CONFIG_AMLOGIC_VMAP=y -CONFIG_AMLOGIC_MEM_DEBUG=y -CONFIG_AMLOGIC_FILE_CACHE=y -CONFIG_AMLOGIC_STACKPROTECTOR=y -CONFIG_AMLOGIC_USER_FAULT=y -CONFIG_AMLOGIC_WATCHPOINT=y -CONFIG_HAVE_HW_BREAKPOINT=y -CONFIG_AMLOGIC_ZSTD=y -CONFIG_DMA_RESTRICTED_POOL=n +CONIFG_AMLOGIC_MEMORY_STAT=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=n CONFIG_SPECULATIVE_PAGE_FAULT=n @@ -40,13 +28,3 @@ CONFIG_AMLOGIC_DEBUG_RELABEL_GKI=n #cfg80211.ko CONFIG_NL80211_TESTMODE=y CONFIG_CFG80211_WEXT=y - -# amlogic-ddr-tool.ko -CONFIG_AMLOGIC_DDR_TOOL=y -CONFIG_AMLOGIC_DDR_BANDWIDTH=y -CONFIG_AMLOGIC_DDR_BANDWIDTH_S4=y -CONFIG_AMLOGIC_DDR_BANDWIDTH_G12=y -CONFIG_AMLOGIC_DMC_MONITOR=y -CONFIG_AMLOGIC_DMC_MONITOR_S4=y -CONFIG_AMLOGIC_DMC_MONITOR_TM2=y -CONFIG_AMLOGIC_DMC_MONITOR_G12=y diff --git a/drivers/memory_ext/Kconfig b/drivers/memory_ext/Kconfig index 0b5cc7bfb..5a151295b 100644 --- a/drivers/memory_ext/Kconfig +++ b/drivers/memory_ext/Kconfig @@ -27,7 +27,7 @@ config AMLOGIC_PAGE_TRACE_INLINE depends on AMLOGIC_PAGE_TRACE depends on 64BIT depends on !KASAN_HW_TAGS && !KASAN_SW_TAGS - default y + default n help This feature enable to inline page trace into high 32bits of page->flags on 64 bit kernel. Because other total page flags diff --git a/drivers/memory_ext/mem_debug.c b/drivers/memory_ext/mem_debug.c index 0a3f8b3b1..3425cbc00 100644 --- a/drivers/memory_ext/mem_debug.c +++ b/drivers/memory_ext/mem_debug.c @@ -24,6 +24,9 @@ #include #include #include +#ifdef CONFIG_HIGHMEM +#include +#endif #ifdef CONFIG_AMLOGIC_CMA #include #endif diff --git a/drivers/memory_ext/memory.c b/drivers/memory_ext/memory.c index 6f890ea78..714e908d2 100644 --- a/drivers/memory_ext/memory.c +++ b/drivers/memory_ext/memory.c @@ -21,9 +21,9 @@ #include #include #include <../../../mm/internal.h> +#include #ifdef CONFIG_AMLOGIC_PAGE_TRACE #include -#include #include #endif diff --git a/include/linux/amlogic/aml_cma.h b/include/linux/amlogic/aml_cma.h index 79da5b038..f60b26ba8 100644 --- a/include/linux/amlogic/aml_cma.h +++ b/include/linux/amlogic/aml_cma.h @@ -6,9 +6,6 @@ #ifndef __AMLOGIC_CMA_H__ #define __AMLOGIC_CMA_H__ -#include -#include - #ifdef CONFIG_AMLOGIC_CMA #define GFP_NO_CMA (__GFP_NO_CMA | __GFP_WRITE) static inline bool cma_forbidden_mask(gfp_t gfp_flags)