614b7d7
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
614b7d7
From: Mark Salter <msalter@redhat.com>
614b7d7
Date: Fri, 11 May 2018 21:01:17 -0400
614b7d7
Subject: [PATCH] acpi: prefer booting with ACPI over DTS
614b7d7
614b7d7
Message-id: <20180511210117.10457-1-msalter@redhat.com>
614b7d7
Patchwork-id: 214708
614b7d7
O-Subject: [RHEL-8 BZ1576869] [RHEL only] acpi: prefer booting with ACPI over DTS
614b7d7
Bugzilla: 1576869
614b7d7
RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
614b7d7
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
614b7d7
RH-Acked-by: Bhupesh Sharma <bhsharma@redhat.com>
614b7d7
RH-Acked-by: Dean Nelson <dnelson@redhat.com>
614b7d7
614b7d7
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1576869
614b7d7
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=16208479
614b7d7
Testing: Verified kernel defaults to ACPI on Mustang
614b7d7
614b7d7
From: Jonathan Toppins <jtoppins@redhat.com>
614b7d7
614b7d7
    This patch forces ACPI boot tables to be preferred over DTS.
614b7d7
614b7d7
    Currently for ACPI to be used a user either has to set acpi=on on the
614b7d7
    kernel command line or make sure any device tree passed to the kernel
614b7d7
    is empty. If the dtb passed to the kernel is non-empty then device-tree
614b7d7
    will be chosen as the boot method of choice.
614b7d7
614b7d7
    RHEL does not wish to support this boot method so change table boot
614b7d7
    preferences to use ACPI. In the event ACPI table checks fail the kernel
614b7d7
    will fallback to using DTS to boot.
614b7d7
614b7d7
    Signed-off-by: Jonathan Toppins <jtoppins@redhat.com>
614b7d7
614b7d7
Upstream Status: RHEL only
614b7d7
Signed-off-by: Mark Salter <msalter@redhat.com>
614b7d7
Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
614b7d7
---
614b7d7
 arch/arm64/kernel/acpi.c | 2 +-
614b7d7
 1 file changed, 1 insertion(+), 1 deletion(-)
614b7d7
614b7d7
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
614b7d7
index a100483b47c4..29f693734edb 100644
614b7d7
--- a/arch/arm64/kernel/acpi.c
614b7d7
+++ b/arch/arm64/kernel/acpi.c
614b7d7
@@ -39,7 +39,7 @@ int acpi_pci_disabled = 1;	/* skip ACPI PCI scan and IRQ initialization */
614b7d7
 EXPORT_SYMBOL(acpi_pci_disabled);
614b7d7
614b7d7
 static bool param_acpi_off __initdata;
614b7d7
-static bool param_acpi_on __initdata;
614b7d7
+static bool param_acpi_on __initdata = true;
614b7d7
 static bool param_acpi_force __initdata;
614b7d7
614b7d7
 static int __init parse_acpi(char *arg)
614b7d7
-- 
614b7d7
2.26.2
614b7d7