From patchwork Wed Mar 30 10:07:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 64675 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2500955lbc; Wed, 30 Mar 2016 03:11:35 -0700 (PDT) X-Received: by 10.31.48.216 with SMTP id w207mr4521855vkw.36.1459332665302; Wed, 30 Mar 2016 03:11:05 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id 3si1011959uag.212.2016.03.30.03.11.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Mar 2016 03:11:05 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1alD3u-0002WC-Oo; Wed, 30 Mar 2016 10:09:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1alD3s-0002Va-S5 for xen-devel@lists.xen.org; Wed, 30 Mar 2016 10:09:16 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id D9/F7-03304-CC5ABF65; Wed, 30 Mar 2016 10:09:16 +0000 X-Env-Sender: zhaoshenglong@huawei.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1459332550!34501156!1 X-Originating-IP: [119.145.14.66] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTE5LjE0NS4xNC42NiA9PiA4NTI3\n X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12192 invoked from network); 30 Mar 2016 10:09:14 -0000 Received: from szxga03-in.huawei.com (HELO szxga03-in.huawei.com) (119.145.14.66) by server-7.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 30 Mar 2016 10:09:14 -0000 Received: from 172.24.1.49 (EHLO SZXEML423-HUB.china.huawei.com) ([172.24.1.49]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BYZ04440; Wed, 30 Mar 2016 18:08:59 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by SZXEML423-HUB.china.huawei.com (10.82.67.154) with Microsoft SMTP Server id 14.3.235.1; Wed, 30 Mar 2016 18:08:49 +0800 From: Shannon Zhao To: Date: Wed, 30 Mar 2016 18:07:54 +0800 Message-ID: <1459332494-18964-2-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1459332494-18964-1-git-send-email-zhaoshenglong@huawei.com> References: <1459332494-18964-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.0A020203.56FBA5BC.009C, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 4cf4a83c3a400d40841e4d841f9acff9 Cc: sstabellini@kernel.org, peter.huangpeng@huawei.com, julien.grall@arm.com, stefano.stabellini@citrix.com, shannon.zhao@linaro.org, zhaoshenglong@huawei.com Subject: [Xen-devel] [PATCH v8 01/21] arm/acpi: Estimate memory required for acpi/efi tables 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" From: Shannon Zhao Estimate the memory required for loading acpi/efi tables in Dom0. Make the length of each table aligned with 64bit. Alloc the pages to store the new created EFI and ACPI tables and free these pages when destroying domain. Signed-off-by: Shannon Zhao Reviewed-by: Stefano Stabellini Acked-by: Julien Grall --- v8: fix rsdp_tbl left mapped if map XSDT failed --- xen/arch/arm/domain.c | 4 ++ xen/arch/arm/domain_build.c | 103 +++++++++++++++++++++++++++++++++++++++++++- xen/arch/arm/efi/Makefile | 1 + xen/arch/arm/efi/efi-boot.h | 4 +- xen/arch/arm/efi/efi-dom0.c | 59 +++++++++++++++++++++++++ xen/arch/arm/efi/efi-dom0.h | 8 ++++ xen/include/asm-arm/setup.h | 2 + 7 files changed, 177 insertions(+), 4 deletions(-) create mode 100644 xen/arch/arm/efi/efi-dom0.c create mode 100644 xen/arch/arm/efi/efi-dom0.h diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 3d274ae..1365b4a 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -640,6 +640,10 @@ void arch_domain_destroy(struct domain *d) domain_vgic_free(d); domain_vuart_free(d); free_xenheap_page(d->shared_info); +#ifdef CONFIG_ACPI + free_xenheap_pages(d->arch.efi_acpi_table, + get_order_from_bytes(d->arch.efi_acpi_len)); +#endif } void arch_domain_shutdown(struct domain *d) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 83676e4..180cb1d2 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -12,6 +12,8 @@ #include #include #include +#include +#include #include #include #include @@ -1354,6 +1356,101 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) return -EINVAL; } +#ifdef CONFIG_ACPI +static int estimate_acpi_efi_size(struct domain *d, struct kernel_info *kinfo) +{ + size_t efi_size, acpi_size, madt_size; + u64 addr; + struct acpi_table_rsdp *rsdp_tbl; + struct acpi_table_header *table; + + efi_size = estimate_efi_size(kinfo->mem.nr_banks); + + acpi_size = ROUNDUP(sizeof(struct acpi_table_fadt), 8); + acpi_size += ROUNDUP(sizeof(struct acpi_table_stao), 8); + + madt_size = sizeof(struct acpi_table_madt) + + sizeof(struct acpi_madt_generic_interrupt) * d->max_vcpus + + sizeof(struct acpi_madt_generic_distributor); + if ( d->arch.vgic.version == GIC_V3 ) + madt_size += sizeof(struct acpi_madt_generic_redistributor) + * d->arch.vgic.nr_regions; + acpi_size += ROUNDUP(madt_size, 8); + + 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)); + if ( !rsdp_tbl ) + { + printk("Unable to map RSDP table\n"); + return -EINVAL; + } + + table = acpi_os_map_memory(rsdp_tbl->xsdt_physical_address, + sizeof(struct acpi_table_header)); + acpi_os_unmap_memory(rsdp_tbl, sizeof(struct acpi_table_rsdp)); + if ( !table ) + { + printk("Unable to map XSDT table\n"); + return -EINVAL; + } + + /* Add place for STAO table in XSDT table */ + acpi_size += ROUNDUP(table->length + sizeof(u64), 8); + acpi_os_unmap_memory(table, sizeof(struct acpi_table_header)); + + acpi_size += ROUNDUP(sizeof(struct acpi_table_rsdp), 8); + d->arch.efi_acpi_len = PAGE_ALIGN(ROUNDUP(efi_size, 8) + + ROUNDUP(acpi_size, 8)); + + return 0; +} + +static int prepare_acpi(struct domain *d, struct kernel_info *kinfo) +{ + int rc = 0; + int order; + + rc = estimate_acpi_efi_size(d, kinfo); + if ( rc != 0 ) + return rc; + + order = get_order_from_bytes(d->arch.efi_acpi_len); + d->arch.efi_acpi_table = alloc_xenheap_pages(order, 0); + if ( d->arch.efi_acpi_table == NULL ) + { + printk("unable to allocate memory!\n"); + return -ENOMEM; + } + memset(d->arch.efi_acpi_table, 0, d->arch.efi_acpi_len); + + /* + * For ACPI, Dom0 doesn't use kinfo->gnttab_start to get the grant table + * region. So we use it as the ACPI table mapped address. Also it needs to + * check if the size of grant table region is enough for those ACPI tables. + */ + d->arch.efi_acpi_gpa = kinfo->gnttab_start; + if ( kinfo->gnttab_size < d->arch.efi_acpi_len ) + { + printk("The grant table region is not enough to fit the ACPI tables!\n"); + return -EINVAL; + } + + return 0; +} +#else +static int prepare_acpi(struct domain *d, struct kernel_info *kinfo) +{ + /* Only booting with ACPI will hit here */ + BUG(); + return -EINVAL; +} +#endif static void dtb_load(struct kernel_info *kinfo) { void * __user dtb_virt = (void * __user)(register_t)kinfo->dtb_paddr; @@ -1540,7 +1637,11 @@ int construct_dom0(struct domain *d) allocate_memory(d, &kinfo); find_gnttab_region(d, &kinfo); - rc = prepare_dtb(d, &kinfo); + if ( acpi_disabled ) + rc = prepare_dtb(d, &kinfo); + else + rc = prepare_acpi(d, &kinfo); + if ( rc < 0 ) return rc; diff --git a/xen/arch/arm/efi/Makefile b/xen/arch/arm/efi/Makefile index 729e53e..d34c916 100644 --- a/xen/arch/arm/efi/Makefile +++ b/xen/arch/arm/efi/Makefile @@ -1,3 +1,4 @@ CFLAGS += -fshort-wchar obj-y += boot.init.o runtime.o +obj-$(CONFIG_ACPI) += efi-dom0.init.o diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index c58caca..045d6ce 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -7,6 +7,7 @@ #include #include #include +#include "efi-dom0.h" void noreturn efi_xen_start(void *fdt_ptr, uint32_t fdt_size); void __flush_dcache_area(const void *vaddr, unsigned long size); @@ -17,9 +18,6 @@ void __flush_dcache_area(const void *vaddr, unsigned long size); static struct file __initdata dtbfile; static void __initdata *fdt; static void __initdata *memmap; -#ifdef CONFIG_ACPI -static struct meminfo __initdata acpi_mem; -#endif static int __init setup_chosen_node(void *fdt, int *addr_cells, int *size_cells) { diff --git a/xen/arch/arm/efi/efi-dom0.c b/xen/arch/arm/efi/efi-dom0.c new file mode 100644 index 0000000..021aa02 --- /dev/null +++ b/xen/arch/arm/efi/efi-dom0.c @@ -0,0 +1,59 @@ +/* + * efi-dom0.c - Domain0 EFI Boot Support + * + * Copyright (C) 2016 Shannon Zhao + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; If not, see . + * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + */ + +#include "efi.h" +#include "efi-dom0.h" +#include +#include + +struct meminfo __initdata acpi_mem; +/* Constant to indicate "Xen" in unicode u16 format */ +static const CHAR16 xen_efi_fw_vendor[] = {0x0058, 0x0065, 0x006E, 0x0000}; + +size_t __init estimate_efi_size(int mem_nr_banks) +{ + size_t size; + size_t est_size = sizeof(EFI_SYSTEM_TABLE); + size_t ect_size = sizeof(EFI_CONFIGURATION_TABLE); + size_t emd_size = sizeof(EFI_MEMORY_DESCRIPTOR); + size_t fw_vendor_size = sizeof(xen_efi_fw_vendor); + int acpi_mem_nr_banks = 0; + + if ( !acpi_disabled ) + acpi_mem_nr_banks = acpi_mem.nr_banks; + + size = ROUNDUP(est_size + ect_size + fw_vendor_size, 8); + /* plus 1 for new created tables */ + size += ROUNDUP(emd_size * (mem_nr_banks + acpi_mem_nr_banks + 1), 8); + + return size; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/efi/efi-dom0.h b/xen/arch/arm/efi/efi-dom0.h new file mode 100644 index 0000000..3cd4caa --- /dev/null +++ b/xen/arch/arm/efi/efi-dom0.h @@ -0,0 +1,8 @@ +#ifndef __ARM_EFI_DOM0_H__ +#define __ARM_EFI_DOM0_H__ + +#include + +extern struct meminfo acpi_mem; + +#endif diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index 30ac53b..7f233a1 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -51,6 +51,8 @@ void arch_init_memory(void); void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len); +size_t estimate_efi_size(int mem_nr_banks); + int construct_dom0(struct domain *d); void discard_initial_modules(void);