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
Subject: [PATCH RESEND 13/14] libxl/arm: initialize memory information of ACPI blob
Date: Tue, 31 May 2016 13:03:05 +0800 [thread overview]
Message-ID: <1464670986-10256-14-git-send-email-zhaoshenglong@huawei.com> (raw)
In-Reply-To: <1464670986-10256-1-git-send-email-zhaoshenglong@huawei.com>
From: Shannon Zhao <shannon.zhao@linaro.org>
Assign the guest memory space for ACPI tables and replace the reg in DT
with real values.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
tools/libxc/xc_dom_arm.c | 16 +++++++++++++++-
tools/libxl/libxl_arm.c | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c
index 64a8b67..e21e3e9 100644
--- a/tools/libxc/xc_dom_arm.c
+++ b/tools/libxc/xc_dom_arm.c
@@ -383,9 +383,11 @@ static int meminit(struct xc_dom_image *dom)
const uint64_t kernsize = kernend - kernbase;
const uint64_t dtb_size = dom->devicetree_blob ?
ROUNDUP(dom->devicetree_size, XC_PAGE_SHIFT) : 0;
+ const uint64_t acpi_size = dom->acpitable_blob ?
+ ROUNDUP(dom->acpitable_size, XC_PAGE_SHIFT) : 0;
const uint64_t ramdisk_size = dom->ramdisk_blob ?
ROUNDUP(dom->ramdisk_size, XC_PAGE_SHIFT) : 0;
- const uint64_t modsize = dtb_size + ramdisk_size;
+ const uint64_t modsize = dtb_size + acpi_size + ramdisk_size;
const uint64_t ram128mb = bankbase[0] + (128<<20);
xen_pfn_t p2m_size;
@@ -500,6 +502,18 @@ static int meminit(struct xc_dom_image *dom)
modbase += dtb_size;
}
+ if ( acpi_size )
+ {
+ dom->acpi_seg.vstart = modbase;
+ dom->acpi_seg.vend = modbase + acpi_size;
+
+ DOMPRINTF("%s: acpi: 0x%" PRIx64 " -> 0x%" PRIx64 "",
+ __FUNCTION__,
+ dom->acpi_seg.vstart, dom->acpi_seg.vend);
+
+ modbase += dtb_size;
+ }
+
return 0;
}
diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c
index e7cb578..bf1eeea 100644
--- a/tools/libxl/libxl_arm.c
+++ b/tools/libxl/libxl_arm.c
@@ -230,6 +230,27 @@ static int fdt_property_regs(libxl__gc *gc, void *fdt,
return fdt_property(fdt, "reg", regs, sizeof(regs));
}
+static int fdt_property_inplace_regs(void *fdt, int nodeoffset,
+ unsigned addr_cells, unsigned size_cells,
+ unsigned num_regs, ...)
+{
+ uint32_t regs[num_regs*(addr_cells+size_cells)];
+ be32 *cells = ®s[0];
+ int i;
+ va_list ap;
+ uint64_t base, size;
+
+ va_start(ap, num_regs);
+ for (i = 0 ; i < num_regs; i++) {
+ base = addr_cells ? va_arg(ap, uint64_t) : 0;
+ size = size_cells ? va_arg(ap, uint64_t) : 0;
+ set_range(&cells, addr_cells, size_cells, base, size);
+ }
+ va_end(ap);
+
+ return fdt_setprop_inplace(fdt, nodeoffset, "reg", regs, sizeof(regs));
+}
+
static int make_root_properties(libxl__gc *gc,
const libxl_version_info *vers,
void *fdt)
@@ -1209,6 +1230,8 @@ int libxl__arch_domain_finalise_hw_description(libxl__gc *gc,
const struct xc_dom_seg *ramdisk = dom->ramdisk_blob ?
&dom->ramdisk_seg : NULL;
+ const struct xc_dom_seg *acpi = dom->acpitable_blob ?
+ &dom->acpi_seg : NULL;
if (ramdisk) {
int chosen, res;
@@ -1238,6 +1261,23 @@ int libxl__arch_domain_finalise_hw_description(libxl__gc *gc,
}
+ if (acpi)
+ {
+ int module, res;
+
+ module = fdt_path_offset(fdt, "/chosen/modules/module@0");
+ assert(module > 0);
+
+ LOG(DEBUG, "/chosen/modules/module@0 updating acpi properties to cover "
+ "%"PRIx64"-%"PRIx64,
+ acpi->vstart, acpi->vend);
+
+ res = fdt_property_inplace_regs(fdt, module, ROOT_ADDRESS_CELLS,
+ ROOT_SIZE_CELLS, 1, acpi->vstart,
+ acpi->vend - acpi->vstart + 1);
+ assert(!res);
+ }
+
for (i = 0; i < GUEST_RAM_BANKS; i++) {
const uint64_t size = (uint64_t)dom->rambank_size[i] << XC_PAGE_SHIFT;
--
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-05-31 5:03 UTC|newest]
Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-31 5:02 [PATCH RESEND 00/14] Xen ARM DomU ACPI support Shannon Zhao
2016-05-31 5:02 ` [PATCH RESEND 01/14] libxl/arm: Fix the function name in error log Shannon Zhao
2016-06-03 19:25 ` Wei Liu
2016-06-17 10:46 ` Wei Liu
2016-06-20 1:12 ` Shannon Zhao
2016-05-31 5:02 ` [PATCH RESEND 02/14] libxl/arm: Factor out codes for generating DTB Shannon Zhao
2016-06-03 19:25 ` Wei Liu
2016-05-31 5:02 ` [PATCH RESEND 03/14] libxc: Add placeholders for ACPI tables blob and size Shannon Zhao
2016-06-06 10:00 ` Stefano Stabellini
2016-06-06 12:16 ` Wei Liu
2016-06-06 14:20 ` Shannon Zhao
2016-06-07 11:05 ` Julien Grall
2016-06-07 11:13 ` Shannon Zhao
2016-06-07 11:27 ` Julien Grall
2016-06-07 11:35 ` Shannon Zhao
2016-06-07 11:42 ` Julien Grall
2016-06-07 11:59 ` Shannon Zhao
2016-06-07 12:06 ` Julien Grall
2016-06-07 12:32 ` Shannon Zhao
2016-06-07 13:06 ` Julien Grall
2016-06-16 6:53 ` Shannon Zhao
2016-06-16 10:21 ` Julien Grall
2016-06-16 10:45 ` Shannon Zhao
2016-06-16 11:04 ` Julien Grall
2016-06-16 10:49 ` Wei Liu
2016-06-16 10:53 ` Shannon Zhao
2016-06-16 11:04 ` Wei Liu
2016-06-07 12:02 ` Julien Grall
2016-06-07 12:27 ` Shannon Zhao
2016-05-31 5:02 ` [PATCH RESEND 04/14] tools: add ACPI tables relevant definitions Shannon Zhao
2016-06-06 10:04 ` Stefano Stabellini
2016-06-06 10:11 ` Julien Grall
2016-06-06 10:27 ` Shannon Zhao
2016-06-06 12:16 ` Wei Liu
2016-06-06 14:19 ` Shannon Zhao
2016-06-22 3:24 ` Shannon Zhao
2016-06-22 8:35 ` Julien Grall
2016-06-22 8:50 ` Shannon Zhao
2016-06-22 8:55 ` Julien Grall
2016-06-22 9:38 ` [PATCH RESEND 04/14] tools: add ACPI tables relevant definitions (and more) Wei Liu
2016-06-22 10:06 ` Shannon Zhao
2016-05-31 5:02 ` [PATCH RESEND 05/14] libxl/arm: Construct ACPI GTDT table Shannon Zhao
2016-06-06 11:40 ` Stefano Stabellini
2016-06-06 11:52 ` Julien Grall
2016-06-06 12:04 ` Stefano Stabellini
2016-06-06 14:31 ` Shannon Zhao
2016-06-06 14:50 ` Stefano Stabellini
2016-06-06 15:42 ` Julien Grall
2016-06-07 9:41 ` Stefano Stabellini
2016-06-06 15:35 ` Julien Grall
2016-06-07 9:48 ` Stefano Stabellini
2016-06-07 11:55 ` Wei Liu
2016-06-17 3:29 ` Shannon Zhao
2016-06-17 8:17 ` Julien Grall
2016-06-17 9:15 ` Stefano Stabellini
2016-06-17 13:27 ` Julien Grall
2016-06-06 12:18 ` Wei Liu
2016-06-07 11:02 ` Julien Grall
2016-06-07 11:19 ` Julien Grall
2016-06-07 11:30 ` Shannon Zhao
2016-06-07 11:36 ` Julien Grall
2016-06-07 11:39 ` Shannon Zhao
2016-06-07 11:43 ` Julien Grall
2016-05-31 5:02 ` [PATCH RESEND 06/14] libxl/arm: Construct ACPI FADT table Shannon Zhao
2016-06-07 13:17 ` Julien Grall
2016-06-07 14:13 ` Shannon Zhao
2016-06-07 14:14 ` Julien Grall
2016-05-31 5:02 ` [PATCH RESEND 07/14] libxl/arm: Construct ACPI DSDT table Shannon Zhao
2016-06-07 13:42 ` Julien Grall
2016-06-16 6:25 ` Shannon Zhao
2016-06-16 9:44 ` Julien Grall
2016-06-16 10:01 ` Stefano Stabellini
2016-05-31 5:03 ` [PATCH RESEND 08/14] libxl/arm: Construct ACPI MADT table Shannon Zhao
2016-06-07 13:40 ` Julien Grall
2016-05-31 5:03 ` [PATCH RESEND 09/14] libxl/arm: Construct ACPI XSDT table Shannon Zhao
2016-05-31 5:03 ` [PATCH RESEND 10/14] libxl/arm: Construct ACPI RSDP table Shannon Zhao
2016-05-31 5:03 ` [PATCH RESEND 11/14] libxl/arm: Initialize domain param HVM_PARAM_CALLBACK_IRQ Shannon Zhao
2016-05-31 5:03 ` [PATCH RESEND 12/14] libxl/arm: Add ACPI module Shannon Zhao
2016-06-07 13:47 ` Julien Grall
2016-05-31 5:03 ` Shannon Zhao [this message]
2016-06-06 11:40 ` [PATCH RESEND 13/14] libxl/arm: initialize memory information of ACPI blob Stefano Stabellini
2016-06-06 14:35 ` Shannon Zhao
2016-05-31 5:03 ` [PATCH RESEND 14/14] libxc/xc_dom_core: Copy ACPI tables to guest memory space Shannon Zhao
2016-05-31 10:47 ` [PATCH RESEND 00/14] Xen ARM DomU ACPI support Julien Grall
2016-05-31 14:19 ` Shannon Zhao
2016-06-03 19:24 ` Wei Liu
2016-06-03 20:02 ` Konrad Rzeszutek Wilk
2016-06-03 20:20 ` Boris Ostrovsky
2016-06-03 20:27 ` Wei Liu
2016-06-03 20:36 ` Boris Ostrovsky
2016-06-06 11:41 ` Stefano Stabellini
2016-06-06 12:26 ` Wei Liu
2016-06-06 15:37 ` Boris Ostrovsky
2016-06-06 16:50 ` Boris Ostrovsky
2016-06-07 10:54 ` Julien Grall
2016-06-07 14:24 ` Boris Ostrovsky
2016-06-06 15:48 ` Julien Grall
2016-06-07 1:07 ` Shannon Zhao
2016-06-07 11:00 ` Julien Grall
2016-06-16 11:20 ` Wei Liu
2016-06-16 13:25 ` Boris Ostrovsky
2016-06-17 10:14 ` Wei Liu
2016-06-17 2:03 ` Shannon Zhao
2016-06-17 8:18 ` 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=1464670986-10256-14-git-send-email-zhaoshenglong@huawei.com \
--to=zhaoshenglong@huawei.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).