[PATCH v3 62/62] xen/arm64: Add ACPI support
From: shannon.zhao at linaro.org <hidden>
Date: 2015-11-17 09:41:01
Also in:
xen-devel
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Naresh Bhat <redacted> Add ACPI support on arm64 xen hypervisor. Enable EFI support on ARM. Signed-off-by: Naresh Bhat <redacted> Signed-off-by: Shannon Zhao <redacted> --- config/arm64.mk | 1 + xen/common/efi/runtime.c | 2 +- xen/include/asm-arm/config.h | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/config/arm64.mk b/config/arm64.mk
index c5deb4e..c6a040b 100644
--- a/config/arm64.mk
+++ b/config/arm64.mk@@ -11,6 +11,7 @@ HAS_CADENCE_UART := y HAS_NS16550 := y HAS_MEM_ACCESS := y HAS_GICV3 := y +HAS_ACPI := y # Use only if calling $(LD) directly. LDFLAGS_DIRECT += -EL
diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c
index ae87557..7748056 100644
--- a/xen/common/efi/runtime.c
+++ b/xen/common/efi/runtime.c@@ -11,7 +11,7 @@ DEFINE_XEN_GUEST_HANDLE(CHAR16); #ifndef COMPAT #ifdef CONFIG_ARM /* Disabled until runtime services implemented */ -const bool_t efi_enabled = 0; +const bool_t efi_enabled = 1; #else # include <asm/i387.h> # include <asm/xstate.h>
diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h
index 817c216..e87fd27 100644
--- a/xen/include/asm-arm/config.h
+++ b/xen/include/asm-arm/config.h@@ -33,6 +33,11 @@ #define CONFIG_ARM_L1_CACHE_SHIFT 7 /* XXX */ +#if defined(CONFIG_ARM_64) +#define CONFIG_ACPI 1 +#define CONFIG_ACPI_BOOT 1 +#endif + #define CONFIG_SMP 1 #define CONFIG_VIDEO 1
--
2.1.0