Re: [PATCH v8 03/16] libxl/arm: Generate static ACPI DSDT table

[Wei Liu <wei.liu2@citrix.com>]

On Wed, Sep 28, 2016 at 06:18:49PM -0700, Shannon Zhao wrote:
> It uses static DSDT table like the way x86 uses. Currently the DSDT
> table only contains processor device objects and it generates the
> maximal objects which so far is 128.
> 
> While the GUEST_MAX_VCPUS is defined under __XEN__ or __XEN_TOOLS__, it
> needs to add -D__XEN_TOOLS__ to compile mk_dsdt.c.
> 
> Also only check iasl for aarch64 in configure since ACPI on ARM32 is not
> supported.
> 
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> Acked-by: Julien Grall <julien.grall@arm.com>
> Acked-by: Wei Liu <wei.liu2@citrix.com>
> ---
>  tools/configure.ac            |  2 +-

Please add a note in the future to ask committers to run autogen.sh.

>  tools/libacpi/Makefile        |  8 +++++++-
>  tools/libacpi/mk_dsdt.c       | 27 ++++++++++++++++++++++++++-
>  tools/libxl/Makefile          |  5 ++++-
>  tools/libxl/libxl_arm_acpi.c  |  5 +++++
>  xen/arch/arm/domain.c         |  1 +
>  xen/include/public/arch-arm.h |  3 +++
>  7 files changed, 47 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/configure.ac b/tools/configure.ac
> index 5724ace..794c615 100644
> --- a/tools/configure.ac
> +++ b/tools/configure.ac
> @@ -340,7 +340,7 @@ dnl "host" here means the platform on which the hypervisor and tools is
>  dnl going to run, not the platform on which we are building (known as
>  dnl "build" in gnu speak).
>  case "$host_cpu" in
> -i[[3456]]86|x86_64)
> +i[[3456]]86|x86_64|aarch64)
>      AX_PATH_PROG_OR_FAIL([IASL], [iasl])
>      ;;
>  esac
> diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile
> index 65a540e..2502d53 100644
> --- a/tools/libacpi/Makefile
> +++ b/tools/libacpi/Makefile
> @@ -19,6 +19,7 @@ MK_DSDT = $(ACPI_BUILD_DIR)/mk_dsdt
>  
>  C_SRC-$(GPL) = dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c
>  C_SRC = $(addprefix $(ACPI_BUILD_DIR)/, dsdt_pvh.c $(C_SRC-y))
> +C_SRC += $(ACPI_BUILD_DIR)/dsdt_anycpu_arm.c

This doesn't build on x86.

I wrote the following patch to fix that. Tested on both x86 and ARM.

From 63bd22a110730310deba5abf81e82ffb43182932 Mon Sep 17 00:00:00 2001
From: Wei Liu <wei.liu2@citrix.com>
Date: Fri, 30 Sep 2016 11:26:36 +0100
Subject: [PATCH] fixup! libxl/arm: Generate static ACPI DSDT table

---
 tools/libacpi/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile
index 2502d53..db7a3a9 100644
--- a/tools/libacpi/Makefile
+++ b/tools/libacpi/Makefile
@@ -18,8 +18,8 @@ include $(XEN_ROOT)/tools/firmware/Rules.mk
 MK_DSDT = $(ACPI_BUILD_DIR)/mk_dsdt
 
 C_SRC-$(GPL) = dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c
+C_SRC-$(CONFIG_ARM) = $(ACPI_BUILD_DIR)/dsdt_anycpu_arm.c
 C_SRC = $(addprefix $(ACPI_BUILD_DIR)/, dsdt_pvh.c $(C_SRC-y))
-C_SRC += $(ACPI_BUILD_DIR)/dsdt_anycpu_arm.c
 H_SRC = $(addprefix $(ACPI_BUILD_DIR)/, ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h)
 
 # Suffix for temporary files.
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel