diff options
Diffstat (limited to 'debian/patches/bugfix/arm64/arm64-acpi-Add-fixup-for-HPE-m400-quirks.patch')
| -rw-r--r-- | debian/patches/bugfix/arm64/arm64-acpi-Add-fixup-for-HPE-m400-quirks.patch | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/debian/patches/bugfix/arm64/arm64-acpi-Add-fixup-for-HPE-m400-quirks.patch b/debian/patches/bugfix/arm64/arm64-acpi-Add-fixup-for-HPE-m400-quirks.patch index 7a866fdc35..5ec1d51463 100644 --- a/debian/patches/bugfix/arm64/arm64-acpi-Add-fixup-for-HPE-m400-quirks.patch +++ b/debian/patches/bugfix/arm64/arm64-acpi-Add-fixup-for-HPE-m400-quirks.patch @@ -19,16 +19,14 @@ experience errors like these on startup: Kernel panic - not syncing: Fatal hardware error! Signed-off-by: Geoff Levand <geoff@infradead.org> -[bwh: Adjust context to apply to Linux 4.19] +[bwh: Adjust context and indentation to apply to Linux 6.10] --- - arch/arm64/kernel/acpi.c | 40 ++++++++++++++++++++++++++++++++++++---- + arch/arm64/kernel/acpi.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+), 4 deletions(-) -Index: linux/arch/arm64/kernel/acpi.c -=================================================================== ---- linux.orig/arch/arm64/kernel/acpi.c -+++ linux/arch/arm64/kernel/acpi.c -@@ -32,6 +32,8 @@ +--- a/arch/arm64/kernel/acpi.c ++++ b/arch/arm64/kernel/acpi.c +@@ -35,6 +35,8 @@ #include <asm/daifflags.h> #include <asm/smp_plat.h> @@ -37,7 +35,7 @@ Index: linux/arch/arm64/kernel/acpi.c int acpi_noirq = 1; /* skip ACPI IRQ initialization */ int acpi_disabled = 1; EXPORT_SYMBOL(acpi_disabled); -@@ -178,6 +180,33 @@ out: +@@ -174,6 +176,33 @@ out: } /* @@ -71,22 +69,12 @@ Index: linux/arch/arm64/kernel/acpi.c * acpi_boot_table_init() called from setup_arch(), always. * 1. find RSDP and get its address, and then find XSDT * 2. extract all tables and checksums them all -@@ -232,11 +261,14 @@ done: - if (acpi_disabled) { - if (earlycon_acpi_spcr_enable) - early_init_dt_scan_chosen_stdout(); -- } else { -- acpi_parse_spcr(earlycon_acpi_spcr_enable, true); -- if (IS_ENABLED(CONFIG_ACPI_BGRT)) -- acpi_table_parse(ACPI_SIG_BGRT, acpi_parse_bgrt); -+ return; +@@ -240,6 +269,8 @@ done: + acpi_parse_spcr(earlycon_acpi_spcr_enable, true); + if (IS_ENABLED(CONFIG_ACPI_BGRT)) + acpi_table_parse(ACPI_SIG_BGRT, acpi_parse_bgrt); ++ ++ acpi_fixup_m400_quirks(); } -+ -+ acpi_parse_spcr(earlycon_acpi_spcr_enable, true); -+ if (IS_ENABLED(CONFIG_ACPI_BGRT)) -+ acpi_table_parse(ACPI_SIG_BGRT, acpi_parse_bgrt); -+ -+ acpi_fixup_m400_quirks(); } - static pgprot_t __acpi_get_writethrough_mem_attribute(void) |