From patchwork Fri Mar 4 06:15:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 8498741 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7988CC0553 for ; Fri, 4 Mar 2016 06:19:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 91997201CE for ; Fri, 4 Mar 2016 06:19:53 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 98E90201FE for ; Fri, 4 Mar 2016 06:19:52 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1abj3N-0005Yl-D8; Fri, 04 Mar 2016 06:17:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1abj3M-0005WC-OR for xen-devel@lists.xen.org; Fri, 04 Mar 2016 06:17:32 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 4D/D9-03294-B7829D65; Fri, 04 Mar 2016 06:17:31 +0000 X-Env-Sender: zhaoshenglong@huawei.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1457072246!4501742!1 X-Originating-IP: [58.251.152.64] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32825 invoked from network); 4 Mar 2016 06:17:30 -0000 Received: from szxga01-in.huawei.com (HELO szxga01-in.huawei.com) (58.251.152.64) by server-9.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 4 Mar 2016 06:17:30 -0000 Received: from 172.24.1.49 (EHLO szxeml428-hub.china.huawei.com) ([172.24.1.49]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DFX12087; Fri, 04 Mar 2016 14:16:55 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml428-hub.china.huawei.com (10.82.67.183) with Microsoft SMTP Server id 14.3.235.1; Fri, 4 Mar 2016 14:16:27 +0800 From: Shannon Zhao To: Date: Fri, 4 Mar 2016 14:15:37 +0800 Message-ID: <1457072152-16128-8-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1457072152-16128-1-git-send-email-zhaoshenglong@huawei.com> References: <1457072152-16128-1-git-send-email-zhaoshenglong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.16.142] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020201.56D92858.0127, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 24ab356084e293f5d8d0fd5ec5f441e8 Cc: hangaohuai@huawei.com, stefano.stabellini@citrix.com, shannon.zhao@linaro.org, zhaoshenglong@huawei.com Subject: [Xen-devel] [PATCH v5 07/22] arm/acpi: Prepare XSDT table for Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Shannon Zhao 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 Acked-by: Stefano Stabellini --- 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