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 <graeme.gregory@linaro.org>
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
[Linux commit 8a1664be0b922dd6afd60eca96a992ef5ec22c40]
[Include <xen/kconfig.h> in osl.c so that it could use IS_ENABLED]
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Doug Goldstein <cardoe@cardoe.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 1fd72fab63c73ca54b7696d53d2f9117d3b3ae32..3a90f47f6b7d005259345c02024b3dde4a771dc4 100644 (file)
--- 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 11ab5e43724e8137f6367f25a52c1452b97780a3..82d73cad76370a69404a482d911923678a76de5e 100644 (file)
--- 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 ce154703894c9a6e5409961ae2300f02edcbfc20..2f1d723c348c98aaae5c1bda64ef789cc2f3e058 100644 (file)
--- a/xen/drivers/acpi/osl.c
+++ b/xen/drivers/acpi/osl.c
@@ -38,6 +38,7 @@
 #include <xen/domain_page.h>
 #include <xen/efi.h>
 #include <xen/vmap.h>
+#include <xen/kconfig.h>
 
 #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 *