From 727323e6ce8226ed8bf19ad9d89abebe2d515cc7 Mon Sep 17 00:00:00 2001 From: HONG Yifan Date: Thu, 31 Oct 2024 15:15:39 -0700 Subject: [PATCH] ANDROID: Update crashdump defconfig. For arm64 the following change is made on the final .config. CONFIG_SUSPEND, CONFIG_KEXEC is enabled. HOTPLUG_CPU n -> y PM n -> y SUSPEND n -> y +ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION y +ARCH_HIBERNATION_POSSIBLE y +ARCH_SUPPORTS_KEXEC y +BLK_PM y +CPU_PM y +CRASH_DUMP y +CRASH_RESERVE y +FREEZER y +FSL_RCPM n +FW_CACHE y +GENERIC_IRQ_MIGRATION y +HOTPLUG_CORE_SYNC y +HOTPLUG_CORE_SYNC_DEAD y +KEXEC y +KEXEC_CORE y +PM_AUTOSLEEP n +PM_CLK y +PM_DEBUG n +PM_GENERIC_DOMAINS y +PM_GENERIC_DOMAINS_OF y +PM_GENERIC_DOMAINS_SLEEP y +PM_SLEEP y +PM_SLEEP_SMP y +PM_USERSPACE_AUTOSLEEP n +PM_WAKELOCKS n +PROC_VMCORE y +PROC_VMCORE_DEVICE_DUMP n +SUSPEND_FREEZER y +TRANS_TABLE y +VMCORE_INFO y +VT_CONSOLE_SLEEP y +WQ_POWER_EFFICIENT_DEFAULT n For x86_64 the following change is made on the final .config: CONFIG_KEXEC is enabled. CONFIG_MICROCODE is enabled by default and cannot be changed. KEXEC n -> y PHYSICAL_START 0x1000000 -> 0x100000 +ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION y +CRASH_DUMP y +CRASH_RESERVE y +KEXEC_CORE y +PROC_VMCORE y +PROC_VMCORE_DEVICE_DUMP n +VMCORE_INFO y Bug: 376527671 Change-Id: Ibb12f256bd5e2cc6c5915844b0d766f27592bcfe Signed-off-by: HONG Yifan --- arch/arm64/configs/crashdump_defconfig | 12 +++++------- arch/x86/configs/crashdump_defconfig | 12 ++++-------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/arch/arm64/configs/crashdump_defconfig b/arch/arm64/configs/crashdump_defconfig index 75866b00b403..d3c41dc8fd01 100644 --- a/arch/arm64/configs/crashdump_defconfig +++ b/arch/arm64/configs/crashdump_defconfig @@ -1,6 +1,5 @@ # CONFIG_WERROR is not set # CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set # CONFIG_CROSS_MEMORY_ATTACH is not set CONFIG_NO_HZ_IDLE=y CONFIG_PREEMPT=y @@ -18,17 +17,13 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_RD_LZ4 is not set # CONFIG_RD_ZSTD is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y -# CONFIG_COMPAT_BRK is not set -# CONFIG_SLAB_MERGE_DEFAULT is not set -# CONFIG_SLUB_CPU_PARTIAL is not set +CONFIG_KEXEC=y CONFIG_ARM64_VA_BITS_48=y CONFIG_NR_CPUS=2 -CONFIG_CRASH_DUMP=y # CONFIG_RODATA_FULL_DEFAULT_ENABLED is not set # CONFIG_ARM64_TAGGED_ADDR_ABI is not set # CONFIG_ARM64_SVE is not set # CONFIG_EFI is not set -# CONFIG_SUSPEND is not set CONFIG_JUMP_LABEL=y # CONFIG_SECCOMP is not set # CONFIG_STACKPROTECTOR is not set @@ -37,7 +32,10 @@ CONFIG_JUMP_LABEL=y # CONFIG_MQ_IOSCHED_KYBER is not set # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_BINFMT_SCRIPT is not set -# CONFIG_SPECULATIVE_PAGE_FAULT is not set +# CONFIG_SWAP is not set +# CONFIG_SLAB_MERGE_DEFAULT is not set +# CONFIG_SLUB_CPU_PARTIAL is not set +# CONFIG_COMPAT_BRK is not set CONFIG_PCI=y CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_ENDPOINT=y diff --git a/arch/x86/configs/crashdump_defconfig b/arch/x86/configs/crashdump_defconfig index 5177d6e4619b..f1212500c6f9 100644 --- a/arch/x86/configs/crashdump_defconfig +++ b/arch/x86/configs/crashdump_defconfig @@ -1,12 +1,10 @@ # CONFIG_WERROR is not set # CONFIG_LOCALVERSION_AUTO is not set CONFIG_KERNEL_LZ4=y -# CONFIG_SWAP is not set # CONFIG_CROSS_MEMORY_ATTACH is not set CONFIG_NO_HZ_IDLE=y CONFIG_PREEMPT=y CONFIG_LOG_BUF_SHIFT=12 -CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12 # CONFIG_UTS_NS is not set # CONFIG_TIME_NS is not set # CONFIG_PID_NS is not set @@ -19,19 +17,15 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_RD_LZ4 is not set # CONFIG_RD_ZSTD is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y -# CONFIG_COMPAT_BRK is not set -# CONFIG_SLAB_MERGE_DEFAULT is not set -# CONFIG_RETPOLINE is not set +CONFIG_KEXEC=y # CONFIG_X86_EXTENDED_PLATFORM is not set # CONFIG_SCHED_OMIT_FRAME_POINTER is not set # CONFIG_X86_MCE is not set # CONFIG_PERF_EVENTS_AMD_UNCORE is not set # CONFIG_X86_IOPL_IOPERM is not set -# CONFIG_MICROCODE is not set # CONFIG_X86_5LEVEL is not set # CONFIG_MTRR_SANITIZER is not set # CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is not set -CONFIG_CRASH_DUMP=y CONFIG_PHYSICAL_START=0x100000 # CONFIG_RANDOMIZE_BASE is not set CONFIG_LEGACY_VSYSCALL_NONE=y @@ -46,6 +40,9 @@ CONFIG_JUMP_LABEL=y # CONFIG_MQ_IOSCHED_KYBER is not set # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_BINFMT_SCRIPT is not set +# CONFIG_SWAP is not set +# CONFIG_SLAB_MERGE_DEFAULT is not set +# CONFIG_COMPAT_BRK is not set # CONFIG_SPARSEMEM_VMEMMAP is not set # CONFIG_COMPACTION is not set CONFIG_PCI=y @@ -81,7 +78,6 @@ CONFIG_VIRTIO_PCI=y # CONFIG_INOTIFY_USER is not set CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set -# CONFIG_PAGE_TABLE_ISOLATION is not set # CONFIG_SYMBOLIC_ERRNAME is not set # CONFIG_X86_VERBOSE_BOOTUP is not set # CONFIG_RUNTIME_TESTING_MENU is not set