diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 17:27:55 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 17:28:50 +0200 |
commit | 01e1c5521b2c1c4074cd83cd4e4c4604309ce518 (patch) | |
tree | 785c395f42dcd8cb13db2a49263980b26e85ff8c /0001-acpi-prefer-booting-with-ACPI-over-DTS.patch | |
parent | c1ca5fbfa21dd0253db964da7bd89733fcf2bfe3 (diff) | |
parent | 0a70f564a052c491b12770d1218a2d8dd8b71924 (diff) | |
download | kernel-5.7.6-251.vanilla.knurd.1.fc32.tar.gz kernel-5.7.6-251.vanilla.knurd.1.fc32.tar.xz kernel-5.7.6-251.vanilla.knurd.1.fc32.zip |
merge origin, 5.7 rebasekernel-5.7.6-251.vanilla.knurd.1.fc32
Diffstat (limited to '0001-acpi-prefer-booting-with-ACPI-over-DTS.patch')
-rw-r--r-- | 0001-acpi-prefer-booting-with-ACPI-over-DTS.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch new file mode 100644 index 000000000..e188b5a2d --- /dev/null +++ b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch @@ -0,0 +1,56 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Mark Salter <msalter@redhat.com> +Date: Fri, 11 May 2018 21:01:17 -0400 +Subject: [PATCH] acpi: prefer booting with ACPI over DTS + +Message-id: <20180511210117.10457-1-msalter@redhat.com> +Patchwork-id: 214708 +O-Subject: [RHEL-8 BZ1576869] [RHEL only] acpi: prefer booting with ACPI over DTS +Bugzilla: 1576869 +RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com> +RH-Acked-by: Tony Camuso <tcamuso@redhat.com> +RH-Acked-by: Bhupesh Sharma <bhsharma@redhat.com> +RH-Acked-by: Dean Nelson <dnelson@redhat.com> + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1576869 +Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=16208479 +Testing: Verified kernel defaults to ACPI on Mustang + +From: Jonathan Toppins <jtoppins@redhat.com> + + This patch forces ACPI boot tables to be preferred over DTS. + + Currently for ACPI to be used a user either has to set acpi=on on the + kernel command line or make sure any device tree passed to the kernel + is empty. If the dtb passed to the kernel is non-empty then device-tree + will be chosen as the boot method of choice. + + RHEL does not wish to support this boot method so change table boot + preferences to use ACPI. In the event ACPI table checks fail the kernel + will fallback to using DTS to boot. + + Signed-off-by: Jonathan Toppins <jtoppins@redhat.com> + +Upstream Status: RHEL only +Signed-off-by: Mark Salter <msalter@redhat.com> +Signed-off-by: Herton R. Krzesinski <herton@redhat.com> +--- + arch/arm64/kernel/acpi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c +index a100483b47c4..29f693734edb 100644 +--- a/arch/arm64/kernel/acpi.c ++++ b/arch/arm64/kernel/acpi.c +@@ -39,7 +39,7 @@ int acpi_pci_disabled = 1; /* skip ACPI PCI scan and IRQ initialization */ + EXPORT_SYMBOL(acpi_pci_disabled); + + static bool param_acpi_off __initdata; +-static bool param_acpi_on __initdata; ++static bool param_acpi_on __initdata = true; + static bool param_acpi_force __initdata; + + static int __init parse_acpi(char *arg) +-- +2.26.2 + |