From 8516d819a3b3b7e74c7822b29d8f5df290e77ecb Mon Sep 17 00:00:00 2001 From: Simon1511 Date: Sun, 23 Jun 2024 13:19:56 +0200 Subject: [PATCH] sm7125: merge A525FXXU6EWL3 sources Change-Id: I5c3f62afd4d8e770e66f84b49af51f28e7fbe959 Signed-off-by: Ruchit --- Documentation/admin-guide/kernel-parameters.txt | 9 +++++++-- arch/arm64/Kconfig.projects | 6 ++++++ arch/arm64/configs/vendor/a52q_eur_open_defconfig | 3 ++- arch/arm64/configs/vendor/a72q_eur_open_defconfig | 3 ++- arch/arm64/configs/vendor/stock_a72q_eur_open_defconfig | 8 ++++++-- 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 26a29f7723fe..79de22b080e2 100755 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -477,16 +477,21 @@ ccw_timeout_log [S390] See Documentation/s390/CommonIO for details. - cgroup_disable= [KNL] Disable a particular controller - Format: {name of the controller(s) to disable} + cgroup_disable= [KNL] Disable a particular controller or optional feature + Format: {name of the controller(s) or feature(s) to disable} The effects of cgroup_disable=foo are: - foo isn't auto-mounted if you mount all cgroups in a single hierarchy - foo isn't visible as an individually mountable subsystem + - if foo is an optional feature then the feature is + disabled and corresponding cgroup files are not + created {Currently only "memory" controller deal with this and cut the overhead, others just disable the usage. So only cgroup_disable=memory is actually worthy} + Specifying "pressure" disables per-cgroup pressure + stall information accounting feature cgroup_no_v1= [KNL] Disable one, multiple, all cgroup controllers in v1 Format: { controller[,controller...] | "all" } diff --git a/arch/arm64/Kconfig.projects b/arch/arm64/Kconfig.projects index 478e60882e03..4868b79c2bcd 100755 --- a/arch/arm64/Kconfig.projects +++ b/arch/arm64/Kconfig.projects @@ -22,3 +22,9 @@ config SEC_A72Q_EUR_OPEN help Support for Samsung A72Q EUR OPEN device. +config SEC_A72Q_LTN_OPEN + depends on SEC_A72Q_PROJECT + default n + bool "Samsung A72Q LTN OPEN" + help + Support for Samsung A72Q LTN OPEN device. diff --git a/arch/arm64/configs/vendor/a52q_eur_open_defconfig b/arch/arm64/configs/vendor/a52q_eur_open_defconfig index 09b992e53ca6..43f505af8efc 100755 --- a/arch/arm64/configs/vendor/a52q_eur_open_defconfig +++ b/arch/arm64/configs/vendor/a52q_eur_open_defconfig @@ -670,8 +670,9 @@ CONFIG_RANDOMIZE_MODULE_REGION_FULL=y # # Boot options # +CONFIG_CMDLINE="cgroup_disable=pressure" # CONFIG_CMDLINE_FROM_BOOTLOADER is not set -# CONFIG_CMDLINE_FORCE is not set +CONFIG_CMDLINE_EXTEND=y # CONFIG_EFI is not set # CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE is not set CONFIG_BUILD_ARM64_KERNEL_COMPRESSION_GZIP=y diff --git a/arch/arm64/configs/vendor/a72q_eur_open_defconfig b/arch/arm64/configs/vendor/a72q_eur_open_defconfig index 14d8feedb565..649c0c795583 100755 --- a/arch/arm64/configs/vendor/a72q_eur_open_defconfig +++ b/arch/arm64/configs/vendor/a72q_eur_open_defconfig @@ -670,8 +670,9 @@ CONFIG_RANDOMIZE_MODULE_REGION_FULL=y # # Boot options # +CONFIG_CMDLINE="cgroup_disable=pressure" # CONFIG_CMDLINE_FROM_BOOTLOADER is not set -# CONFIG_CMDLINE_FORCE is not set +CONFIG_CMDLINE_EXTEND=y # CONFIG_EFI is not set # CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE is not set CONFIG_BUILD_ARM64_KERNEL_COMPRESSION_GZIP=y diff --git a/arch/arm64/configs/vendor/stock_a72q_eur_open_defconfig b/arch/arm64/configs/vendor/stock_a72q_eur_open_defconfig index 5837777553fd..505c254ee9ea 100644 --- a/arch/arm64/configs/vendor/stock_a72q_eur_open_defconfig +++ b/arch/arm64/configs/vendor/stock_a72q_eur_open_defconfig @@ -179,6 +179,7 @@ CONFIG_DEFAULT_USE_ENERGY_AWARE=y # CONFIG_RELAY is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" +# CONFIG_INITRAMFS_FORCE is not set CONFIG_RD_GZIP=y CONFIG_RD_BZIP2=y CONFIG_RD_LZMA=y @@ -677,7 +678,10 @@ CONFIG_RANDOMIZE_MODULE_REGION_FULL=y # # Boot options # -CONFIG_CMDLINE="" +CONFIG_CMDLINE="cgroup_disable=pressure" +# CONFIG_CMDLINE_FROM_BOOTLOADER is not set +CONFIG_CMDLINE_EXTEND=y +# CONFIG_CMDLINE_FORCE is not set # CONFIG_EFI is not set # CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE is not set CONFIG_BUILD_ARM64_KERNEL_COMPRESSION_GZIP=y @@ -1195,7 +1199,7 @@ CONFIG_NET_EMATCH_U32=y CONFIG_NET_EMATCH_META=y CONFIG_NET_EMATCH_TEXT=y CONFIG_NET_CLS_ACT=y -# CONFIG_NET_ACT_POLICE is not set +CONFIG_NET_ACT_POLICE=y CONFIG_NET_ACT_GACT=y # CONFIG_GACT_PROB is not set CONFIG_NET_ACT_MIRRED=y