arm64: Add ACPI support

Add ACPI support on arm64 xen hypervisor. Enable EFI support on ARM.

Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Acked-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Julien Grall <julien.grall@arm.com>

diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index cb99df56556dd78ab130dd4dfa101bb7b0a2b275..6231cd5dee5c34d2164b1c49851e09fd1abb71d5 100644 (file)
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -33,6 +33,15 @@ menu "Architecture Features"
 
 source "arch/Kconfig"
 
+config ACPI
+       bool
+       prompt "ACPI (Advanced Configuration and Power Interface) Support" if EXPERT = "y"
+       depends on ARM_64
+       ---help---
+
+         Advanced Configuration and Power Interface (ACPI) support for Xen is
+         an alternative to device tree on ARM64.
+
 # Select HAS_GICV3 if GICv3 is supported
 config HAS_GICV3
        bool

diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c
index ae875570fbc1c4d104b7070df864c56aaa75b88e..c25681496721f753df29e258967b99a0c1129ffb 100644 (file)
--- a/xen/common/efi/runtime.c
+++ b/xen/common/efi/runtime.c
@@ -10,14 +10,16 @@ DEFINE_XEN_GUEST_HANDLE(CHAR16);
 
 #ifndef COMPAT
 
-#ifdef CONFIG_ARM  /* Disabled until runtime services implemented */
-const bool_t efi_enabled = 0;
-#else
+/*
+ * Currently runtime services are not implemented on ARM. To boot Xen with ACPI,
+ * set efi_enabled to 1, so that Xen can get the ACPI root pointer from EFI.
+ */
+const bool_t efi_enabled = 1;
+
+#ifndef CONFIG_ARM
 # include <asm/i387.h>
 # include <asm/xstate.h>
 # include <public/platform.h>
-
-const bool_t efi_enabled = 1;
 #endif
 
 unsigned int __read_mostly efi_num_ct;