From patchwork Fri Mar 25 13:48:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 8671581 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 5146CC0553 for ; Fri, 25 Mar 2016 13:51:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 615352035B for ; Fri, 25 Mar 2016 13:51:39 +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 5E06B20340 for ; Fri, 25 Mar 2016 13:51:38 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ajS7V-000195-Rd; Fri, 25 Mar 2016 13:49:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ajS7V-00017u-7W for xen-devel@lists.xen.org; Fri, 25 Mar 2016 13:49:45 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 8B/EB-17208-8F145F65; Fri, 25 Mar 2016 13:49:44 +0000 X-Env-Sender: shannon.zhao@linaro.org X-Msg-Ref: server-5.tower-206.messagelabs.com!1458913782!31351013!1 X-Originating-IP: [209.85.220.50] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 44812 invoked from network); 25 Mar 2016 13:49:43 -0000 Received: from mail-pa0-f50.google.com (HELO mail-pa0-f50.google.com) (209.85.220.50) by server-5.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 25 Mar 2016 13:49:43 -0000 Received: by mail-pa0-f50.google.com with SMTP id td3so46686619pab.2 for ; Fri, 25 Mar 2016 06:49:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9KGnUlOrzQsJVDvaw8k8CVDS0j4H4c9MNn2D3jPF7qA=; b=aHGpKub9ohou/h4cQHIK11Y/cTR85rNey+zTjijVDuyfyvh6O+pVDZPHosVJOjN6vX NsZNwvjfr6TKgFiZJeiSDyDCR8XLSSs8Vhe95pYd4rRSTAPM2xefgHveLSeKABAtT2Bs jhnLnc8PsuPifu0qq0eh0PO/hM6mloFluGpXg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9KGnUlOrzQsJVDvaw8k8CVDS0j4H4c9MNn2D3jPF7qA=; b=QQ5FJoCkPYCiWcn2dfGkSfaIgKDz6UdJQqVRxUinbzZ3gc77g3Kfe6jP2tRvXGEnPf PoZZLUwXMC6JY56wBYLVHH36cQn1gr91MtdfrzD0qcuKrJvK8j5rPFeXAeMGmyMykYf2 jKJuMHXkSSNy4nyFACrn6JY7oLevpkssknLDhZ7IF//glZ32ycvr9mBRqlxDt8a7dAP7 m534l6rTxbtzuGbS/B4ARHlJp2fh7P6iEkommC0bNkiiJszCeUrbO35QqfyTfGYvrS75 KP8/z+OIYTg4OibAd1C3UtuoyOSYMzUNtEct9fVY8nSyTvcIBTqLrSiHHIn4cbyMb4EV 0How== X-Gm-Message-State: AD7BkJKpA/KjNita83FhTkHkGlkHqKP7RXSG210iMx91MfKeXQ7JY5cjzu5+xyyDBubN+l3C X-Received: by 10.66.55.39 with SMTP id o7mr20939566pap.13.1458913782392; Fri, 25 Mar 2016 06:49:42 -0700 (PDT) Received: from localhost.localdomain ([45.56.152.2]) by smtp.gmail.com with ESMTPSA id w20sm16744178pfi.31.2016.03.25.06.49.38 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 25 Mar 2016 06:49:41 -0700 (PDT) From: Shannon Zhao To: xen-devel@lists.xen.org Date: Fri, 25 Mar 2016 21:48:40 +0800 Message-Id: <1458913735-2678-8-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458913735-2678-1-git-send-email-shannon.zhao@linaro.org> References: <1458913735-2678-1-git-send-email-shannon.zhao@linaro.org> Cc: julien.grall@arm.com, shannon.zhao@linaro.org, stefano.stabellini@citrix.com, peter.huangpeng@huawei.com, zhaoshenglong@huawei.com Subject: [Xen-devel] [PATCH v7 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, 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 Copy and modify XSDT table before passing it to Dom0. Replace 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 Acked-by: Julien Grall --- 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 c09fb26..cd501ff 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; @@ -1585,6 +1653,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