Skip to content

Commit 31daa34

Browse files
vasiakpm00
vasi
authored and
akpm00
committed
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/[email protected] Fixes: 75bc255 ("crash: clean up kdump related config items") Signed-off-by: Dave Vasilevsky <[email protected]> Reported-by: Reimar Döffinger <[email protected]> Closes: https://lists.debian.org/debian-powerpc/2024/07/msg00001.html Acked-by: Michael Ellerman <[email protected]> [powerpc] Acked-by: Baoquan He <[email protected]> Cc: "Eric W. Biederman" <[email protected]> Cc: John Paul Adrian Glaubitz <[email protected]> Cc: Reimar Döffinger <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent a4a282d commit 31daa34

File tree

10 files changed

+29
-1
lines changed

10 files changed

+29
-1
lines changed

‎arch/arm/Kconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1598,6 +1598,9 @@ config ATAGS_PROC
15981598
config ARCH_SUPPORTS_CRASH_DUMP
15991599
def_bool y
16001600

1601+
config ARCH_DEFAULT_CRASH_DUMP
1602+
def_bool y
1603+
16011604
config AUTO_ZRELADDR
16021605
bool "Auto calculation of the decompressed kernel image address" if !ARCH_MULTIPLATFORM
16031606
default !(ARCH_FOOTBRIDGE || ARCH_RPC || ARCH_SA1100)

‎arch/arm64/Kconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,6 +1576,9 @@ config ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG
15761576
config ARCH_SUPPORTS_CRASH_DUMP
15771577
def_bool y
15781578

1579+
config ARCH_DEFAULT_CRASH_DUMP
1580+
def_bool y
1581+
15791582
config ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
15801583
def_bool CRASH_RESERVE
15811584

‎arch/loongarch/Kconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,9 @@ config ARCH_SUPPORTS_KEXEC
604604
config ARCH_SUPPORTS_CRASH_DUMP
605605
def_bool y
606606

607+
config ARCH_DEFAULT_CRASH_DUMP
608+
def_bool y
609+
607610
config ARCH_SELECTS_CRASH_DUMP
608611
def_bool y
609612
depends on CRASH_DUMP

‎arch/mips/Kconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2876,6 +2876,9 @@ config ARCH_SUPPORTS_KEXEC
28762876
config ARCH_SUPPORTS_CRASH_DUMP
28772877
def_bool y
28782878

2879+
config ARCH_DEFAULT_CRASH_DUMP
2880+
def_bool y
2881+
28792882
config PHYSICAL_START
28802883
hex "Physical address where the kernel is loaded"
28812884
default "0xffffffff84000000"

‎arch/powerpc/Kconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,10 @@ config RELOCATABLE_TEST
684684
config ARCH_SUPPORTS_CRASH_DUMP
685685
def_bool PPC64 || PPC_BOOK3S_32 || PPC_85xx || (44x && !SMP)
686686

687+
config ARCH_DEFAULT_CRASH_DUMP
688+
bool
689+
default y if !PPC_BOOK3S_32
690+
687691
config ARCH_SELECTS_CRASH_DUMP
688692
def_bool y
689693
depends on CRASH_DUMP

‎arch/riscv/Kconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -898,6 +898,9 @@ config ARCH_SUPPORTS_KEXEC_PURGATORY
898898
config ARCH_SUPPORTS_CRASH_DUMP
899899
def_bool y
900900

901+
config ARCH_DEFAULT_CRASH_DUMP
902+
def_bool y
903+
901904
config ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
902905
def_bool CRASH_RESERVE
903906

‎arch/s390/Kconfig‎

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

279+
config ARCH_DEFAULT_CRASH_DUMP
280+
def_bool y
281+
279282
menu "Processor type and features"
280283

281284
config HAVE_MARCH_Z10_FEATURES

‎arch/sh/Kconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,9 @@ config ARCH_SUPPORTS_KEXEC
550550
config ARCH_SUPPORTS_CRASH_DUMP
551551
def_bool BROKEN_ON_SMP
552552

553+
config ARCH_DEFAULT_CRASH_DUMP
554+
def_bool y
555+
553556
config ARCH_SUPPORTS_KEXEC_JUMP
554557
def_bool y
555558

‎arch/x86/Kconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2084,6 +2084,9 @@ config ARCH_SUPPORTS_KEXEC_JUMP
20842084
config ARCH_SUPPORTS_CRASH_DUMP
20852085
def_bool X86_64 || (X86_32 && HIGHMEM)
20862086

2087+
config ARCH_DEFAULT_CRASH_DUMP
2088+
def_bool y
2089+
20872090
config ARCH_SUPPORTS_CRASH_HOTPLUG
20882091
def_bool y
20892092

‎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)