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 09/17] libxl/arm: Construct ACPI MADT table
Date: Thu, 23 Jun 2016 11:16:56 +0800 [thread overview]
Message-ID: <1466651824-6964-10-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>
According to the GIC version, construct the MADT table.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
tools/libxl/libxl_arm_acpi.c | 100 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 100 insertions(+)
diff --git a/tools/libxl/libxl_arm_acpi.c b/tools/libxl/libxl_arm_acpi.c
index de863f4..659dbfa 100644
--- a/tools/libxl/libxl_arm_acpi.c
+++ b/tools/libxl/libxl_arm_acpi.c
@@ -42,6 +42,8 @@ typedef uint64_t u64;
#define ACPI_LEVEL_SENSITIVE (u8) 0x00
#define ACPI_ACTIVE_LOW (u8) 0x01
+#define ACPI_GICC_ENABLED 1
+
enum {
RSDP,
XSDT,
@@ -137,6 +139,101 @@ static void make_acpi_gtdt(libxl__gc *gc, struct xc_dom_image *dom)
dom->acpitable_size += ROUNDUP(acpitables[GTDT].size, 3);
}
+static void make_acpi_madt_gicc(void *table, int nr_cpus, uint64_t gicc_base)
+{
+ uint32_t i;
+ struct acpi_madt_generic_interrupt *gicc = table;
+
+ for (i = 0; i < nr_cpus; i++) {
+ gicc->header.type = ACPI_MADT_TYPE_GENERIC_INTERRUPT;
+ gicc->header.length = sizeof(*gicc);
+ gicc->base_address = gicc_base;
+ gicc->cpu_interface_number = i;
+ gicc->arm_mpidr = libxl__compute_mpdir(i);
+ gicc->uid = i;
+ gicc->flags = ACPI_GICC_ENABLED;
+ gicc++;
+ }
+}
+
+static void make_acpi_madt_gicd(void *table, uint64_t gicd_base,
+ uint8_t gic_version)
+{
+ struct acpi_madt_generic_distributor *gicd = table;
+
+ gicd->header.type = ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR;
+ gicd->header.length = sizeof(*gicd);
+ gicd->base_address = gicd_base;
+ /* This version filed has no meaning before ACPI 5.1 errata. */
+ gicd->version = gic_version;
+}
+
+static void make_acpi_madt_gicr(void *table, uint64_t gicr_base,
+ uint64_t gicr_size)
+{
+ struct acpi_madt_generic_redistributor *gicr = table;
+
+ gicr->header.type = ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR;
+ gicr->header.length = sizeof(*gicr);
+ gicr->base_address = gicr_base;
+ gicr->length = gicr_size;
+}
+
+static int make_acpi_madt(libxl__gc *gc, struct xc_dom_image *dom, int nr_cpus,
+ xc_domain_configuration_t *xc_config)
+{
+ size_t size;
+ void *table;
+ struct acpi_table_madt *madt;
+
+ switch (xc_config->gic_version) {
+ case XEN_DOMCTL_CONFIG_GIC_V2:
+ size = sizeof(struct acpi_table_madt) +
+ sizeof(struct acpi_madt_generic_interrupt) * nr_cpus +
+ sizeof(struct acpi_madt_generic_distributor);
+ table = libxl__zalloc(gc, size);
+ madt = (struct acpi_table_madt *)table;
+
+ table += sizeof(struct acpi_table_madt);
+ make_acpi_madt_gicc(table, nr_cpus, GUEST_GICC_BASE);
+
+ table += sizeof(struct acpi_madt_generic_interrupt) * nr_cpus;
+ make_acpi_madt_gicd(table, GUEST_GICD_BASE, ACPI_MADT_GIC_VERSION_V2);
+ break;
+ case XEN_DOMCTL_CONFIG_GIC_V3:
+ size = sizeof(struct acpi_table_madt) +
+ sizeof(struct acpi_madt_generic_interrupt) * nr_cpus +
+ sizeof(struct acpi_madt_generic_distributor) +
+ sizeof(struct acpi_madt_generic_redistributor);
+ table = libxl__zalloc(gc, size);
+ madt = (struct acpi_table_madt *)table;
+
+ table += sizeof(struct acpi_table_madt);
+ make_acpi_madt_gicc(table, nr_cpus, 0);
+
+ table += sizeof(struct acpi_madt_generic_interrupt) * nr_cpus;
+ make_acpi_madt_gicd(table, GUEST_GICV3_GICD_BASE,
+ ACPI_MADT_GIC_VERSION_V3);
+
+ table += sizeof(struct acpi_madt_generic_distributor);
+ make_acpi_madt_gicr(table, GUEST_GICV3_GICR0_BASE,
+ GUEST_GICV3_GICR0_SIZE);
+ break;
+ default:
+ LOG(ERROR, "Unknown GIC version");
+ return ERROR_FAIL;
+ }
+
+ make_acpi_header(&madt->header, "APIC", size, 3);
+
+ acpitables[MADT].table = madt;
+ acpitables[MADT].size = size;
+ /* Align to 64bit. */
+ dom->acpitable_size += ROUNDUP(acpitables[MADT].size, 3);
+
+ return 0;
+}
+
int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info,
libxl__domain_build_state *state,
struct xc_dom_image *dom)
@@ -160,6 +257,9 @@ int libxl__prepare_acpi(libxl__gc *gc, libxl_domain_build_info *info,
make_acpi_rsdp(gc, dom);
make_acpi_xsdt(gc, dom);
make_acpi_gtdt(gc, dom);
+ rc = make_acpi_madt(gc, dom, info->max_vcpus, xc_config);
+ if (rc)
+ return rc;
return 0;
}
--
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 ` [PATCH v2 04/17] libxl/arm: prepare for constructing ACPI tables Shannon Zhao
2016-06-23 13:37 ` 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 ` Shannon Zhao [this message]
2016-06-23 16:36 ` [PATCH v2 09/17] libxl/arm: Construct ACPI MADT table 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-10-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).