From: Shannon Zhao <zhaoshenglong@huawei.com>
To: xen-devel@lists.xen.org
Cc: sstabellini@kernel.org, wei.liu2@citrix.com,
ian.jackson@eu.citrix.com, peter.huangpeng@huawei.com,
julien.grall@arm.com, shannon.zhao@linaro.org,
boris.ostrovsky@oracle.com
Subject: [PATCH v2 04/17] libxl/arm: prepare for constructing ACPI tables
Date: Thu, 23 Jun 2016 11:16:51 +0800 [thread overview]
Message-ID: <1466651824-6964-5-git-send-email-zhaoshenglong@huawei.com> (raw)
In-Reply-To: <1466651824-6964-1-git-send-email-zhaoshenglong@huawei.com>
From: Shannon Zhao <shannon.zhao@linaro.org>
It only constructs the ACPI tables for 64-bit ARM DomU when user enables
acpi because 32-bit DomU doesn't support ACPI.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
tools/libxl/Makefile | 4 +++
tools/libxl/libxl_arm.c | 19 +++++++++-
tools/libxl/libxl_arm_acpi.c | 85 ++++++++++++++++++++++++++++++++++++++++++++
tools/libxl/libxl_arm_acpi.h | 32 +++++++++++++++++
4 files changed, 139 insertions(+), 1 deletion(-)
create mode 100644 tools/libxl/libxl_arm_acpi.c
create mode 100644 tools/libxl/libxl_arm_acpi.h
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index 9fee752..264b6ef 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -77,6 +77,10 @@ endif
LIBXL_OBJS-$(CONFIG_X86) += libxl_cpuid.o libxl_x86.o libxl_psr.o
LIBXL_OBJS-$(CONFIG_ARM) += libxl_nocpuid.o libxl_arm.o libxl_libfdt_compat.o
+LIBXL_OBJS-$(CONFIG_ARM) += libxl_arm_acpi.o
+
+libxl_arm_acpi.o: libxl_arm_acpi.c
+ $(CC) -c $(CFLAGS) -I../../xen/include/ -o $@ libxl_arm_acpi.c
ifeq ($(CONFIG_NetBSD),y)
LIBXL_OBJS-y += libxl_netbsd.o
diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c
index cc5a717..f5db74b 100644
--- a/tools/libxl/libxl_arm.c
+++ b/tools/libxl/libxl_arm.c
@@ -1,6 +1,7 @@
#include "libxl_internal.h"
#include "libxl_arch.h"
#include "libxl_libfdt_compat.h"
+#include "libxl_arm_acpi.h"
#include <xc_dom.h>
#include <stdbool.h>
@@ -888,8 +889,24 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc,
libxl__domain_build_state *state,
struct xc_dom_image *dom)
{
+ int rc;
+
assert(info->type == LIBXL_DOMAIN_TYPE_PV);
- return libxl__prepare_dtb(gc, info, state, dom);
+ rc = libxl__prepare_dtb(gc, info, state, dom);
+ if (rc)
+ return rc;
+
+ if (!state->config.acpi) {
+ LOG(DEBUG, "Generating ACPI tables is disabled by user.");
+ return 0;
+ }
+
+ if (strcmp(dom->guest_type, "xen-3.0-aarch64")) {
+ LOG(DEBUG, "Do not generate ACPI tables for %s", dom->guest_type);
+ state->config.acpi = false;
+ }
+
+ return libxl__prepare_acpi(gc, info, state, dom);
}
static void finalise_one_memory_node(libxl__gc *gc, void *fdt,
diff --git a/tools/libxl/libxl_arm_acpi.c b/tools/libxl/libxl_arm_acpi.c
new file mode 100644
index 0000000..60c31f9
--- /dev/null
+++ b/tools/libxl/libxl_arm_acpi.c
@@ -0,0 +1,85 @@
+/*
+ * ARM DmoU ACPI generation
+ *
+ * Copyright (C) 2008-2010 Kevin O'Connor <kevin@koconnor.net>
+ * Copyright (C) 2006 Fabrice Bellard
+ * Copyright (C) 2013 Red Hat Inc
+ *
+ * Author: Michael S. Tsirkin <mst@redhat.com>
+ *
+ * Copyright (c) 2015 HUAWEI TECHNOLOGIES CO.,LTD.
+ *
+ * Author: Shannon Zhao <zhaoshenglong@huawei.com>
+ *
+ * Copyright (C) 2016 Linaro Ltd.
+ *
+ * Author: Shannon Zhao <shannon.zhao@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ */
+
+#include "libxl_arm_acpi.h"
+
+#include <stdint.h>
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+#include <acpi/acconfig.h>
+#include <acpi/actbl.h>
+
+enum {
+ RSDP,
+ XSDT,
+ GTDT,
+ MADT,
+ FADT,
+ DSDT,
+ NUMS,
+};
+
+struct acpitable {
+ void *table;
+ size_t size;
+};
+
+static struct acpitable acpitables[NUMS];
+
+int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info,
+ libxl__domain_build_state *state,
+ struct xc_dom_image *dom)
+{
+ const libxl_version_info *vers;
+ int rc;
+
+ /* convenience aliases */
+ xc_domain_configuration_t *xc_config = &state->config;
+
+ vers = libxl_get_version_info(CTX);
+ if (vers == NULL)
+ return ERROR_FAIL;
+
+ LOG(DEBUG, "constructing ACPI tables for Xen version %d.%d guest",
+ vers->xen_version_major, vers->xen_version_minor);
+
+ dom->acpitable_blob = NULL;
+ dom->acpitable_size = 0;
+
+ return 0;
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/tools/libxl/libxl_arm_acpi.h b/tools/libxl/libxl_arm_acpi.h
new file mode 100644
index 0000000..5899210
--- /dev/null
+++ b/tools/libxl/libxl_arm_acpi.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2016 Linaro Ltd.
+ *
+ * Author: Shannon Zhao <shannon.zhao@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ */
+
+#include "libxl_internal.h"
+#include "libxl_arch.h"
+
+#include <xc_dom.h>
+
+int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info,
+ libxl__domain_build_state *state,
+ struct xc_dom_image *dom);
+
+/*
+ * Local variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
--
2.0.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-06-23 3:16 UTC|newest]
Thread overview: 130+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-23 3:16 [PATCH v2 00/17] Xen ARM DomU ACPI support Shannon Zhao
2016-06-23 3:16 ` [PATCH v2 01/17] libxl/arm: Factor out codes for generating DTB Shannon Zhao
2016-06-23 3:16 ` [PATCH v2 02/17] libxc: Add placeholders for ACPI tables blob and size Shannon Zhao
2016-06-23 3:16 ` [PATCH v2 03/17] libxl/arm: Add a configuration option for ARM DomU ACPI Shannon Zhao
2016-06-23 13:39 ` Stefano Stabellini
2016-06-23 14:34 ` Shannon Zhao
2016-06-27 10:40 ` Julien Grall
2016-07-07 15:30 ` Wei Liu
2016-07-12 3:40 ` Shannon Zhao
2016-07-12 9:22 ` Julien Grall
2016-07-12 11:33 ` Wei Liu
2016-07-12 14:17 ` Shannon Zhao
2016-07-12 14:33 ` Wei Liu
2016-07-12 14:45 ` Shannon Zhao
2016-07-13 7:54 ` Shannon Zhao
2016-07-13 9:20 ` Julien Grall
2016-07-13 9:48 ` Shannon Zhao
2016-07-13 10:03 ` Julien Grall
2016-07-15 8:00 ` Shannon Zhao
2016-07-15 8:07 ` Shannon Zhao
2016-07-18 19:40 ` Stefano Stabellini
2016-07-19 10:40 ` Wei Liu
2016-07-19 10:44 ` Ian Jackson
2016-06-23 15:53 ` Julien Grall
2016-06-23 3:16 ` Shannon Zhao [this message]
2016-06-23 13:37 ` [PATCH v2 04/17] libxl/arm: prepare for constructing ACPI tables Stefano Stabellini
2016-06-23 14:23 ` Shannon Zhao
2016-06-23 14:27 ` Stefano Stabellini
2016-06-23 16:18 ` Julien Grall
2016-06-23 3:16 ` [PATCH v2 05/17] libxl/arm: Construct ACPI RSDP table Shannon Zhao
2016-06-23 3:16 ` [PATCH v2 06/17] libxl/arm: Construct ACPI XSDT table Shannon Zhao
2016-06-23 3:16 ` [PATCH v2 07/17] libxl/arm: Construct ACPI GTDT table Shannon Zhao
2016-06-23 15:00 ` Stefano Stabellini
2016-06-23 16:19 ` Julien Grall
2016-06-23 16:26 ` Julien Grall
2016-06-23 16:58 ` Julien Grall
2016-06-27 1:44 ` Shannon Zhao
2016-06-27 10:17 ` Julien Grall
2016-06-29 9:29 ` Shannon Zhao
2016-06-29 9:42 ` Julien Grall
2016-06-29 13:41 ` Shannon Zhao
2016-07-05 16:42 ` Stefano Stabellini
2016-07-06 9:50 ` Julien Grall
2016-07-06 10:16 ` Stefano Stabellini
2016-06-23 3:16 ` [PATCH v2 08/17] libxl/arm: Factor MPIDR computing codes out as a helper Shannon Zhao
2016-06-23 16:29 ` Julien Grall
2016-06-23 3:16 ` [PATCH v2 09/17] libxl/arm: Construct ACPI MADT table Shannon Zhao
2016-06-23 16:36 ` Julien Grall
2016-06-23 3:16 ` [PATCH v2 10/17] libxl/arm: Construct ACPI FADT table Shannon Zhao
2016-06-23 3:16 ` [PATCH v2 11/17] libxl/arm: Construct ACPI DSDT table Shannon Zhao
2016-06-23 14:50 ` Stefano Stabellini
2016-06-23 16:42 ` Julien Grall
2016-06-27 1:50 ` Shannon Zhao
2016-06-23 17:03 ` Julien Grall
2016-06-27 6:01 ` Shannon Zhao
2016-06-27 10:29 ` Julien Grall
2016-06-27 12:05 ` Boris Ostrovsky
2016-06-28 11:03 ` Shannon Zhao
2016-06-28 13:41 ` Boris Ostrovsky
2016-06-29 18:58 ` Boris Ostrovsky
2016-07-01 7:58 ` Shannon Zhao
2016-07-01 10:18 ` Julien Grall
2016-07-01 14:42 ` Boris Ostrovsky
2016-07-01 15:14 ` Julien Grall
2016-06-23 3:16 ` [PATCH v2 12/17] libxl/arm: Add a helper to calculate the ACPI table checksum Shannon Zhao
2016-06-23 17:05 ` Julien Grall
2016-06-23 3:17 ` [PATCH v2 13/17] libxl/arm: Link all ACPI tables into one buffer Shannon Zhao
2016-06-23 17:10 ` Julien Grall
2016-06-23 3:17 ` [PATCH v2 14/17] libxl/arm: Factor finalise_one_memory_node as a gerneric function Shannon Zhao
2016-06-23 3:17 ` [PATCH v2 15/17] libxl/arm: Add ACPI module Shannon Zhao
2016-06-23 18:35 ` Julien Grall
2016-06-25 3:22 ` Shannon Zhao
2016-06-27 9:48 ` Julien Grall
2016-06-23 3:17 ` [PATCH v2 16/17] libxc/xc_dom_arm: Copy ACPI tables to guest space Shannon Zhao
2016-06-23 18:46 ` Julien Grall
2016-06-27 6:25 ` Shannon Zhao
2016-06-27 10:49 ` Julien Grall
2016-06-27 12:11 ` Boris Ostrovsky
2016-07-05 17:13 ` Stefano Stabellini
2016-07-06 9:46 ` Julien Grall
2016-07-06 10:12 ` Stefano Stabellini
2016-07-12 3:47 ` Shannon Zhao
2016-07-12 9:25 ` Julien Grall
2016-07-12 11:35 ` Wei Liu
2016-07-12 14:42 ` Shannon Zhao
2016-07-12 14:50 ` Wei Liu
2016-07-12 14:57 ` Shannon Zhao
2016-07-12 15:08 ` Boris Ostrovsky
2016-07-12 15:13 ` Wei Liu
2016-07-12 15:21 ` Boris Ostrovsky
2016-07-12 16:05 ` Wei Liu
2016-07-12 16:10 ` Julien Grall
2016-07-12 16:58 ` Boris Ostrovsky
2016-07-13 15:22 ` Julien Grall
2016-07-13 17:08 ` Boris Ostrovsky
2016-07-14 11:15 ` Wei Liu
2016-07-15 9:39 ` Shannon Zhao
2016-07-19 10:38 ` Wei Liu
2016-07-20 6:52 ` Shannon Zhao
2016-07-20 9:32 ` Wei Liu
2016-07-25 7:56 ` Shannon Zhao
2016-07-28 11:10 ` Julien Grall
2016-07-14 11:29 ` Julien Grall
2016-07-14 13:37 ` Stefano Stabellini
2016-07-20 12:33 ` Julien Grall
2016-07-20 13:33 ` Boris Ostrovsky
2016-07-20 13:41 ` Julien Grall
2016-07-20 14:09 ` Boris Ostrovsky
2016-07-20 17:28 ` Stefano Stabellini
2016-07-20 19:51 ` Boris Ostrovsky
2016-07-21 17:53 ` Stefano Stabellini
2016-07-21 18:23 ` Julien Grall
2016-07-21 18:54 ` Stefano Stabellini
2016-07-21 19:14 ` Julien Grall
2016-07-21 21:15 ` Stefano Stabellini
2016-07-25 8:38 ` George Dunlap
2016-07-25 9:46 ` Julien Grall
2016-07-25 22:06 ` Stefano Stabellini
2016-07-25 22:46 ` Boris Ostrovsky
2016-07-25 23:40 ` Stefano Stabellini
2016-07-26 1:17 ` Boris Ostrovsky
2016-07-28 11:06 ` Julien Grall
2016-07-28 12:42 ` Shannon Zhao
2016-08-02 11:01 ` Wei Liu
2016-08-03 19:20 ` Julien Grall
2016-08-04 10:17 ` Wei Liu
2016-08-02 11:01 ` Wei Liu
2016-07-07 15:35 ` Wei Liu
2016-06-23 3:17 ` [PATCH v2 17/17] libxl/arm: Initialize domain param HVM_PARAM_CALLBACK_IRQ Shannon Zhao
2016-06-23 18:48 ` Julien Grall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1466651824-6964-5-git-send-email-zhaoshenglong@huawei.com \
--to=zhaoshenglong@huawei.com \
--cc=boris.ostrovsky@oracle.com \
--cc=ian.jackson@eu.citrix.com \
--cc=julien.grall@arm.com \
--cc=peter.huangpeng@huawei.com \
--cc=shannon.zhao@linaro.org \
--cc=sstabellini@kernel.org \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).