From: Shannon Zhao <zhaoshenglong@huawei.com>
To: xen-devel@lists.xen.org
Cc: hangaohuai@huawei.com, stefano.stabellini@citrix.com,
shannon.zhao@linaro.org, zhaoshenglong@huawei.com
Subject: [PATCH v5 07/22] arm/acpi: Prepare XSDT table for Dom0
Date: Fri, 4 Mar 2016 14:15:37 +0800 [thread overview]
Message-ID: <1457072152-16128-8-git-send-email-zhaoshenglong@huawei.com> (raw)
In-Reply-To: <1457072152-16128-1-git-send-email-zhaoshenglong@huawei.com>
From: Shannon Zhao <shannon.zhao@linaro.org>
Copy and modify XSDT table before passing it to Dom0. Repalce the entry
value of the copied table. Add a new entry for STAO table as well. And
keep entry value of other reused tables unchanged.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
xen/arch/arm/domain_build.c | 72 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index b369f2e..f9fe289 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -1357,6 +1357,74 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo)
}
#ifdef CONFIG_ACPI
+static void acpi_xsdt_modify_entry(u64 entry[], unsigned long entry_count,
+ char *signature, u64 addr)
+{
+ int i;
+ struct acpi_table_header *table;
+ u64 size = sizeof(struct acpi_table_header);
+
+ for( i = 0; i < entry_count; i++ )
+ {
+ table = acpi_os_map_memory(entry[i], size);
+ if ( ACPI_COMPARE_NAME(table->signature, signature) )
+ {
+ entry[i] = addr;
+ acpi_os_unmap_memory(table, size);
+ break;
+ }
+ acpi_os_unmap_memory(table, size);
+ }
+}
+
+static int acpi_create_xsdt(struct domain *d, struct membank tbl_add[])
+{
+ struct acpi_table_header *table = NULL;
+ struct acpi_table_rsdp *rsdp_tbl;
+ struct acpi_table_xsdt *xsdt = NULL;
+ u64 table_size, addr;
+ unsigned long entry_count;
+ u8 *base_ptr;
+ u8 checksum;
+
+ addr = acpi_os_get_root_pointer();
+ if ( !addr )
+ {
+ printk("Unable to get acpi root pointer\n");
+ return -EINVAL;
+ }
+ rsdp_tbl = acpi_os_map_memory(addr, sizeof(struct acpi_table_rsdp));
+ table = acpi_os_map_memory(rsdp_tbl->xsdt_physical_address,
+ sizeof(struct acpi_table_header));
+
+ /* Add place for STAO table in XSDT table */
+ table_size = table->length + sizeof(u64);
+ entry_count = (table->length - sizeof(struct acpi_table_header))
+ / sizeof(u64);
+ base_ptr = d->arch.efi_acpi_table
+ + acpi_get_table_offset(tbl_add, TBL_XSDT);
+ ACPI_MEMCPY(base_ptr, table, table->length);
+ acpi_os_unmap_memory(table, sizeof(struct acpi_table_header));
+ acpi_os_unmap_memory(rsdp_tbl, sizeof(struct acpi_table_rsdp));
+
+ xsdt = (struct acpi_table_xsdt *)base_ptr;
+ acpi_xsdt_modify_entry(xsdt->table_offset_entry, entry_count,
+ ACPI_SIG_FADT, tbl_add[TBL_FADT].start);
+ acpi_xsdt_modify_entry(xsdt->table_offset_entry, entry_count,
+ ACPI_SIG_MADT, tbl_add[TBL_MADT].start);
+ xsdt->table_offset_entry[entry_count] = tbl_add[TBL_STAO].start;
+
+ xsdt->header.length = table_size;
+ checksum = acpi_tb_checksum(ACPI_CAST_PTR(u8, xsdt), table_size);
+ xsdt->header.checksum -= checksum;
+
+ tbl_add[TBL_XSDT].start = d->arch.efi_acpi_gpa
+ + acpi_get_table_offset(tbl_add, TBL_XSDT);
+ tbl_add[TBL_XSDT].size = table_size;
+
+ return 0;
+}
+
static int acpi_create_stao(struct domain *d, struct membank tbl_add[])
{
struct acpi_table_header *table = NULL;
@@ -1553,6 +1621,10 @@ static int prepare_acpi(struct domain *d, struct kernel_info *kinfo)
if ( rc != 0 )
return rc;
+ rc = acpi_create_xsdt(d, tbl_add);
+ if ( rc != 0 )
+ return rc;
+
return 0;
}
#else
--
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-03-04 6:15 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-04 6:15 [PATCH v5 00/22] Prepare UEFI and ACPI tables for Dom0 on ARM64 Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 01/22] arm/acpi: Estimate memory required for acpi/efi tables Shannon Zhao
2016-03-04 10:09 ` Jan Beulich
2016-03-04 10:55 ` Stefano Stabellini
2016-03-04 15:03 ` Shannon Zhao
2016-03-04 15:23 ` Stefano Stabellini
2016-03-04 15:52 ` Shannon Zhao
2016-03-04 15:59 ` Stefano Stabellini
2016-03-04 15:39 ` Jan Beulich
2016-03-04 6:15 ` [PATCH v5 02/22] arm/acpi: Add a helper function to get the acpi table offset Shannon Zhao
2016-03-04 10:59 ` Stefano Stabellini
2016-03-04 15:12 ` Shannon Zhao
2016-03-04 15:31 ` Stefano Stabellini
2016-03-04 15:53 ` Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 03/22] arm/acpi: Prepare FADT table for Dom0 Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 04/22] arm/gic: Add a new callback for creating MADT " Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 05/22] arm/acpi: Prepare " Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 06/22] arm/acpi: Prepare STAO " Shannon Zhao
2016-03-04 6:15 ` Shannon Zhao [this message]
2016-03-04 6:15 ` [PATCH v5 08/22] arm/acpi: Prepare RSDP " Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 09/22] arm/p2m: Add helper functions to map memory regions Shannon Zhao
2016-03-04 10:51 ` Stefano Stabellini
2016-03-04 6:15 ` [PATCH v5 10/22] arm/acpi: Map all other tables for Dom0 Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 11/22] arm/acpi: Prepare EFI system table " Shannon Zhao
2016-03-04 11:02 ` Stefano Stabellini
2016-03-04 6:15 ` [PATCH v5 12/22] arm/acpi: Prepare EFI memory descriptor " Shannon Zhao
2016-03-04 11:13 ` Stefano Stabellini
2016-03-16 8:59 ` Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 13/22] arm/acpi: Map the new created EFI and ACPI tables to Dom0 Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 14/22] arm/acpi: Create min DT stub for Dom0 Shannon Zhao
2016-03-04 11:17 ` Stefano Stabellini
2016-03-04 6:15 ` [PATCH v5 15/22] arm/acpi: Permit access all Xen unused SPIs " Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 16/22] arm/acpi: Configure SPI interrupt type and route to Dom0 dynamically Shannon Zhao
2016-03-04 11:26 ` Stefano Stabellini
2016-03-04 15:16 ` Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 17/22] arm/gic: Add a new callback to deny Dom0 access to GIC regions Shannon Zhao
2016-03-04 11:59 ` Stefano Stabellini
2016-03-04 6:15 ` [PATCH v5 18/22] arm/acpi: Permit MMIO access of Xen unused devices for Dom0 Shannon Zhao
2016-03-04 12:01 ` Stefano Stabellini
2016-03-04 6:15 ` [PATCH v5 19/22] hvm/params: Add a new delivery type for event-channel in HVM_PARAM_CALLBACK_IRQ Shannon Zhao
2016-03-04 10:16 ` Jan Beulich
2016-03-04 12:09 ` Stefano Stabellini
2016-03-04 12:20 ` Jan Beulich
2016-03-04 12:26 ` Stefano Stabellini
2016-03-16 15:03 ` Julien Grall
2016-03-16 15:10 ` Jan Beulich
2016-03-04 21:19 ` Konrad Rzeszutek Wilk
2016-03-16 16:34 ` Julien Grall
2016-03-16 17:49 ` Konrad Rzeszutek Wilk
2016-03-24 12:24 ` Stefano Stabellini
2016-03-04 6:15 ` [PATCH v5 20/22] xen/acpi: Fix event-channel interrupt when booting with ACPI Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 21/22] xen/arm: Add a hypercall for device mmio mapping Shannon Zhao
2016-03-04 10:29 ` Jan Beulich
2016-03-04 11:00 ` Roger Pau Monné
2016-03-04 11:11 ` Jan Beulich
2016-03-04 11:37 ` Stefano Stabellini
2016-03-16 9:48 ` Shannon Zhao
2016-03-16 10:04 ` Jan Beulich
2016-03-16 11:22 ` Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 22/22] xen/arm64: Add ACPI support Shannon Zhao
2016-03-04 10:33 ` Jan Beulich
2016-03-04 11:45 ` Stefano Stabellini
2016-03-04 11:45 ` Stefano Stabellini
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=1457072152-16128-8-git-send-email-zhaoshenglong@huawei.com \
--to=zhaoshenglong@huawei.com \
--cc=hangaohuai@huawei.com \
--cc=shannon.zhao@linaro.org \
--cc=stefano.stabellini@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).