diff --git a/kdump-remove-noefi-and-acpi_rsdp-for-efi-firmware.patch b/kdump-remove-noefi-and-acpi_rsdp-for-efi-firmware.patch new file mode 100644 index 0000000..1e3ee8c --- /dev/null +++ b/kdump-remove-noefi-and-acpi_rsdp-for-efi-firmware.patch @@ -0,0 +1,53 @@ +From 3ea13723f93cc22d163f1f1c8e64ccef3fa32471 Mon Sep 17 00:00:00 2001 +From: "Lee, Chun-Yi" +Date: Tue, 5 Mar 2019 15:06:10 +0800 +Subject: Remove noefi and acpi_rsdp for EFI firmware +References: bsc#1123940 +Upstream: merged +Git-commit: 3ea13723f93cc22d163f1f1c8e64ccef3fa32471 + +The noefi and acpi_rsdp can be removed because kernel passes necessary +EFI data for kexec via setup_data since 1fec05336 patch be introduced +in v3.14 kernel. (bsc#1098210) + +On the other hand, the MOK (machine owner key) doesn't work with noefi. +It causes that third-party signed kernel modules can not be loaded by +crash kernel. Crash kernel can provide EFI runtime services for loading +MOK after noefi be removed. (bsc#1123940) + +The kdump without noefi has been tested on Huawei Kunlun, Intel +minnowboard and KVM-OVMF. + +Signed-off-by: Lee, Chun-Yi +Acked-by: Petr Tesarik +--- + init/load.sh | 11 ----------- + 1 file changed, 11 deletions(-) + +--- a/init/load.sh ++++ b/init/load.sh +@@ -5,7 +5,6 @@ + + KDUMPTOOL=/usr/sbin/kdumptool + KEXEC=/sbin/kexec +-EFI_SYSTAB=/sys/firmware/efi/systab + FADUMP_ENABLED=/sys/kernel/fadump_enabled + FADUMP_REGISTERED=/sys/kernel/fadump_registered + +@@ -97,16 +96,6 @@ function build_kdump_commandline() + kernelrelease=$(uname -r) + commandline="$commandline kernelversion=$kernelrelease" + fi +- +- if [ -f /sys/firmware/efi/systab ] ; then +- local acpi_addr +- if grep -q '^ACPI20=' /sys/firmware/efi/systab ; then +- acpi_addr=$(awk -F'=' '/^ACPI20=/ {print $2}' "$EFI_SYSTAB") +- else +- acpi_addr=$(awk -F'=' '/^ACPI=/ {print $2}' "$EFI_SYSTAB") +- fi +- commandline="$commandline noefi acpi_rsdp=$acpi_addr" +- fi + fi + + commandline="$commandline $KDUMP_COMMANDLINE_APPEND" diff --git a/kdump.changes b/kdump.changes index cbdd0db..b330da9 100644 --- a/kdump.changes +++ b/kdump.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 7 20:40:39 UTC 2019 - ptesarik@suse.com + +- kdump-remove-noefi-and-acpi_rsdp-for-efi-firmware.patch: Remove + noefi and acpi_rsdp for EFI firmware (bsc#1123940). + ------------------------------------------------------------------- Fri Oct 5 14:31:49 UTC 2018 - ptesarik@suse.com diff --git a/kdump.spec b/kdump.spec index cabca6d..676742c 100644 --- a/kdump.spec +++ b/kdump.spec @@ -1,7 +1,7 @@ # # spec file for package kdump # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -53,6 +53,7 @@ Patch4: %{name}-split-cmdline-purpose-wise.patch Patch5: %{name}-fadump-fix-network-bring-up.patch Patch6: %{name}-fadump-add-udev-support.patch Patch7: %{name}-turn-off-NUMA-in-kdump-kernel.patch +Patch8: %{name}-remove-noefi-and-acpi_rsdp-for-efi-firmware.patch BuildRequires: asciidoc BuildRequires: cmake BuildRequires: gcc-c++ @@ -117,6 +118,7 @@ after a crash dump has occured. %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build export CFLAGS="%{optflags}"