From patchwork Fri Mar 25 13:48:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 8671671 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0B10C9F36E for ; Fri, 25 Mar 2016 13:51:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1F19220357 for ; Fri, 25 Mar 2016 13:51:54 +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 3335420340 for ; Fri, 25 Mar 2016 13:51:53 +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 1ajS7s-0001ZN-8L; Fri, 25 Mar 2016 13:50:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ajS7r-0001YH-8Y for xen-devel@lists.xen.org; Fri, 25 Mar 2016 13:50:07 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 53/7B-03497-E0245F65; Fri, 25 Mar 2016 13:50:06 +0000 X-Env-Sender: shannon.zhao@linaro.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1458913804!33774389!1 X-Originating-IP: [209.85.192.173] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4616 invoked from network); 25 Mar 2016 13:50:05 -0000 Received: from mail-pf0-f173.google.com (HELO mail-pf0-f173.google.com) (209.85.192.173) by server-7.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 25 Mar 2016 13:50:05 -0000 Received: by mail-pf0-f173.google.com with SMTP id x3so83280167pfb.1 for ; Fri, 25 Mar 2016 06:50:05 -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=4DX8p46NTzNWfB4gZJBLXAfXGv2dV19nzWsLpSHQpEQ=; b=GS9Pl9yhQgi7arJv59BNq4bLjBCEBBZcSUfeMOQllpEoRGIQ3lu9ZemmuXzNF2yp9U QRaaCK8YUQqZNElS+5cImasBoEmMSTerNU1LX/e3hWKsifg1Jghi7bwhRQxXK1ALPIRh 95wa8aXz+byJPWF2PEfGCQ+RzXYvkE1imGWy8= 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=4DX8p46NTzNWfB4gZJBLXAfXGv2dV19nzWsLpSHQpEQ=; b=BSx7JkA6Vdb4XEPsiVupbhvzQONPNcYeAObuexY5pnjXxjSdmZPDmfzxf5JPUwBpaJ u2GOiV3R/7sVjFfM2pwKvEqp3m2rT1GIWzNUPyxQiFu3HZMf059VGfgLvvyS/K0NYcTp lVoj2RvQ7fXdHi3ktS3BAEYbeZUb+KRNEKX32tiVRLOOtzDYQzDIp3TY8jMIbsTplKWh ZDuHYEGfRjjb1avFdc9UxprOLkTaDXGQasaCK/xMslJ1fkXFqE3Co1WJqML8wbmg0dHG T4LVnEnA1e8H46hj35nJ1BnZx3nUs91ypXN3Bx2Pmc8FIB3WtDDcV/0P6T6hKqrZ8iSA JRBg== X-Gm-Message-State: AD7BkJKZvmAKeRQHU1dJipVKK8RP+jXeu/hn5GUwDFdSb6wecU4Bfv6NLy0jLezkTQTlelDq X-Received: by 10.98.15.145 with SMTP id 17mr20938841pfp.19.1458913803875; Fri, 25 Mar 2016 06:50:03 -0700 (PDT) Received: from localhost.localdomain ([45.56.152.2]) by smtp.gmail.com with ESMTPSA id w20sm16744178pfi.31.2016.03.25.06.49.59 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 25 Mar 2016 06:50:02 -0700 (PDT) From: Shannon Zhao To: xen-devel@lists.xen.org Date: Fri, 25 Mar 2016 21:48:45 +0800 Message-Id: <1458913735-2678-13-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 12/22] arm/acpi: Prepare EFI memory descriptor 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 Create EFI memory descriptors to tell Dom0 the RAM region information, ACPI table regions and EFI tables reserved regions. Signed-off-by: Parth Dixit Signed-off-by: Shannon Zhao Reviewed-by: Stefano Stabellini Acked-by: Julien Grall --- v7: check the size --- xen/arch/arm/domain_build.c | 1 + xen/arch/arm/efi/efi-dom0.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/setup.h | 4 ++++ 3 files changed, 49 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index f14bc5b..954e0e3 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1721,6 +1721,7 @@ static int prepare_acpi(struct domain *d, struct kernel_info *kinfo) acpi_map_other_tables(d); acpi_create_efi_system_table(d, tbl_add); + acpi_create_efi_mmap_table(d, &kinfo->mem, tbl_add); return 0; } diff --git a/xen/arch/arm/efi/efi-dom0.c b/xen/arch/arm/efi/efi-dom0.c index f4f84b6..cf71bf4 100644 --- a/xen/arch/arm/efi/efi-dom0.c +++ b/xen/arch/arm/efi/efi-dom0.c @@ -24,6 +24,7 @@ #include "efi.h" #include "efi-dom0.h" #include +#include #include #include #include "../../../common/decompress.h" @@ -94,6 +95,49 @@ void __init acpi_create_efi_system_table(struct domain *d, tbl_add[TBL_EFIT].size = table_size; } +void __init acpi_create_efi_mmap_table(struct domain *d, + const struct meminfo *mem, + struct membank tbl_add[]) +{ + EFI_MEMORY_DESCRIPTOR *memory_map; + unsigned int i, offset; + u8 *base_ptr; + + base_ptr = d->arch.efi_acpi_table + + acpi_get_table_offset(tbl_add, TBL_MMAP); + memory_map = (EFI_MEMORY_DESCRIPTOR *)base_ptr; + + offset = 0; + for( i = 0; i < mem->nr_banks; i++, offset++ ) + { + memory_map[offset].Type = EfiConventionalMemory; + memory_map[offset].PhysicalStart = mem->bank[i].start; + BUG_ON(mem->bank[i].size & EFI_PAGE_MASK); + memory_map[offset].NumberOfPages = EFI_SIZE_TO_PAGES(mem->bank[i].size); + memory_map[offset].Attribute = EFI_MEMORY_WB; + } + + for( i = 0; i < acpi_mem.nr_banks; i++, offset++ ) + { + memory_map[offset].Type = EfiACPIReclaimMemory; + memory_map[offset].PhysicalStart = acpi_mem.bank[i].start; + BUG_ON(acpi_mem.bank[i].size & EFI_PAGE_MASK); + memory_map[offset].NumberOfPages = EFI_SIZE_TO_PAGES(acpi_mem.bank[i].size); + memory_map[offset].Attribute = EFI_MEMORY_WB; + } + + memory_map[offset].Type = EfiACPIReclaimMemory; + memory_map[offset].PhysicalStart = d->arch.efi_acpi_gpa; + BUG_ON(d->arch.efi_acpi_len & EFI_PAGE_MASK); + memory_map[offset].NumberOfPages = EFI_SIZE_TO_PAGES(d->arch.efi_acpi_len); + memory_map[offset].Attribute = EFI_MEMORY_WB; + + tbl_add[TBL_MMAP].start = d->arch.efi_acpi_gpa + + acpi_get_table_offset(tbl_add, TBL_MMAP); + tbl_add[TBL_MMAP].size = sizeof(EFI_MEMORY_DESCRIPTOR) + * (mem->nr_banks + acpi_mem.nr_banks + 1); +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index fc9fd7c..9a71e90 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -56,6 +56,10 @@ size_t estimate_efi_size(int mem_nr_banks); void acpi_create_efi_system_table(struct domain *d, struct membank tbl_add[]); +void acpi_create_efi_mmap_table(struct domain *d, + const struct meminfo *mem, + struct membank tbl_add[]); + int construct_dom0(struct domain *d); void discard_initial_modules(void);