Skip to content

Commit 561fa1a

Browse files
author
Baoquan He
committed
crash, powerpc: default to CRASH_DUMP=n on PPC_BOOK3S_32
JIRA: https://issues.redhat.com/browse/RHEL-114163 Upstream Status: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git Conflicts: There are conflicts in arch/s390/Kconfig and arch/powper/Kconfig due to context difference, need manually edit. commit 31daa34 Author: Dave Vasilevsky <dave@vasilevsky.ca> Date: Tue Sep 17 12:37:20 2024 -0400 crash, powerpc: default to CRASH_DUMP=n on PPC_BOOK3S_32 Fixes boot failures on 6.9 on PPC_BOOK3S_32 machines using Open Firmware. On these machines, the kernel refuses to boot from non-zero PHYSICAL_START, which occurs when CRASH_DUMP is on. Since most PPC_BOOK3S_32 machines boot via Open Firmware, it should default to off for them. Users booting via some other mechanism can still turn it on explicitly. Does not change the default on any other architectures for the time being. Link: https://lkml.kernel.org/r/20240917163720.1644584-1-dave@vasilevsky.ca Fixes: 75bc255 ("crash: clean up kdump related config items") Signed-off-by: Dave Vasilevsky <dave@vasilevsky.ca> Reported-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Closes: https://lists.debian.org/debian-powerpc/2024/07/msg00001.html Acked-by: Michael Ellerman <mpe@ellerman.id.au> [powerpc] Acked-by: Baoquan He <bhe@redhat.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Cc: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Baoquan He <bhe@redhat.com>
1 parent 29e8edf commit 561fa1a

File tree

6 files changed

+17
-1
lines changed

6 files changed

+17
-1
lines changed

arch/arm64/Kconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,6 +1565,9 @@ config ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG
15651565
config ARCH_SUPPORTS_CRASH_DUMP
15661566
def_bool y
15671567

1568+
config ARCH_DEFAULT_CRASH_DUMP
1569+
def_bool y
1570+
15681571
config ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
15691572
def_bool CRASH_RESERVE
15701573

arch/mips/Kconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3059,6 +3059,9 @@ config ARCH_SUPPORTS_KEXEC
30593059
config ARCH_SUPPORTS_CRASH_DUMP
30603060
def_bool y
30613061

3062+
config ARCH_DEFAULT_CRASH_DUMP
3063+
def_bool y
3064+
30623065
config PHYSICAL_START
30633066
hex "Physical address where the kernel is loaded"
30643067
default "0xffffffff84000000"

arch/powerpc/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,10 @@ config CRASH_DUMP
591591
config ARCH_SUPPORTS_CRASH_DUMP
592592
def_bool PPC64 || PPC_BOOK3S_32 || FSL_BOOKE || (44x && !SMP)
593593

594+
config ARCH_DEFAULT_CRASH_DUMP
595+
bool
596+
default y if !PPC_BOOK3S_32
597+
594598
config ARCH_SELECTS_CRASH_DUMP
595599
def_bool y
596600
depends on CRASH_DUMP

arch/s390/Kconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,9 @@ config ARCH_SUPPORTS_CRASH_DUMP
277277
This option also enables s390 zfcpdump.
278278
See also <file:Documentation/s390/zfcpdump.rst>
279279

280+
config ARCH_DEFAULT_CRASH_DUMP
281+
def_bool y
282+
280283
menu "Processor type and features"
281284

282285
config HAVE_MARCH_Z10_FEATURES

arch/x86/Kconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2098,6 +2098,9 @@ config ARCH_SUPPORTS_KEXEC_JUMP
20982098
config ARCH_SUPPORTS_CRASH_DUMP
20992099
def_bool X86_64 || (X86_32 && HIGHMEM)
21002100

2101+
config ARCH_DEFAULT_CRASH_DUMP
2102+
def_bool y
2103+
21012104
config ARCH_SUPPORTS_CRASH_HOTPLUG
21022105
def_bool y
21032106

kernel/Kconfig.kexec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ config KEXEC_JUMP
9797

9898
config CRASH_DUMP
9999
bool "kernel crash dumps"
100-
default y
100+
default ARCH_DEFAULT_CRASH_DUMP
101101
depends on ARCH_SUPPORTS_CRASH_DUMP
102102
depends on KEXEC_CORE
103103
select VMCORE_INFO

0 commit comments

Comments
 (0)