From 123d8d1b9b18d6b036d37b3acfdc43434644cc87 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 1 Feb 2016 13:56:16 +0100 Subject: [PATCH] ACPI: add config for BIOS table scan With the addition of ARM64 that does not have a traditional BIOS to scan, add a config option which is selected on x86 (ia64 doesn't need it either, it is EFI/UEFI based system) to do the traditional BIOS scanning for tables. Signed-off-by: Graeme Gregory Signed-off-by: Hanjun Guo Signed-off-by: Rafael J. Wysocki [Linux commit 8a1664be0b922dd6afd60eca96a992ef5ec22c40] [Include in osl.c so that it could use IS_ENABLED] Signed-off-by: Shannon Zhao Reviewed-by: Doug Goldstein Acked-by: Jan Beulich --- xen/arch/x86/Kconfig | 1 + xen/drivers/acpi/Kconfig | 3 +++ xen/drivers/acpi/osl.c | 5 ++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 1fd72fab63..3a90f47f6b 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -3,6 +3,7 @@ config X86_64 config X86 def_bool y + select ACPI_LEGACY_TABLES_LOOKUP select COMPAT select HAS_ACPI select HAS_CPUFREQ diff --git a/xen/drivers/acpi/Kconfig b/xen/drivers/acpi/Kconfig index 11ab5e4372..82d73cad76 100644 --- a/xen/drivers/acpi/Kconfig +++ b/xen/drivers/acpi/Kconfig @@ -2,3 +2,6 @@ # Select HAS_ACPI if ACPI is supported config HAS_ACPI bool + +config ACPI_LEGACY_TABLES_LOOKUP + bool diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c index ce15470389..2f1d723c34 100644 --- a/xen/drivers/acpi/osl.c +++ b/xen/drivers/acpi/osl.c @@ -38,6 +38,7 @@ #include #include #include +#include #define _COMPONENT ACPI_OS_SERVICES ACPI_MODULE_NAME("osl") @@ -75,12 +76,14 @@ acpi_physical_address __init acpi_os_get_root_pointer(void) "System description tables not found\n"); return 0; } - } else { + } else if (IS_ENABLED(CONFIG_ACPI_LEGACY_TABLES_LOOKUP)) { acpi_physical_address pa = 0; acpi_find_root_pointer(&pa); return pa; } + + return 0; } void __iomem * -- 2.39.5