Add ACPI support on arm64 xen hypervisor. Enable EFI support on ARM.
Cc: Jan Beulich <jbeul...@suse.com>
Signed-off-by: Shannon Zhao <shannon.z...@linaro.org>
Acked-by: Jan Beulich <jbeul...@suse.com>
Reviewed-by: Stefano Stabellini <stefano.stabell...@eu.citrix.com>
---
v7: Drop CONFIG_ACPI_BOOT
---
xen/arch/arm/Kconfig | 9 +++++++++
xen/common/efi/runtime.c | 12 +++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index cb99df5..6231cd5 100644
--- 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 ae87557..c256814 100644
--- 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;
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
