From patchwork Fri Mar 25 13:48:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 8671771 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 D804E9F36E for ; Fri, 25 Mar 2016 13:52:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 679DE20395 for ; Fri, 25 Mar 2016 13:52:14 +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 D707020379 for ; Fri, 25 Mar 2016 13:52:12 +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 1ajS80-0001tq-OS; Fri, 25 Mar 2016 13:50:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ajS7z-0001sL-3R for xen-devel@lists.xen.org; Fri, 25 Mar 2016 13:50:15 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id A5/5D-16378-61245F65; Fri, 25 Mar 2016 13:50:14 +0000 X-Env-Sender: shannon.zhao@linaro.org X-Msg-Ref: server-16.tower-206.messagelabs.com!1458913812!16926280!1 X-Originating-IP: [209.85.220.52] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39189 invoked from network); 25 Mar 2016 13:50:13 -0000 Received: from mail-pa0-f52.google.com (HELO mail-pa0-f52.google.com) (209.85.220.52) by server-16.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 25 Mar 2016 13:50:13 -0000 Received: by mail-pa0-f52.google.com with SMTP id tt10so47131807pab.3 for ; Fri, 25 Mar 2016 06:50:13 -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=fqLo5j7t20JxzufwUvCBmkRQA0KJtAo1ikuiUiPRmqo=; b=YU5oYT+1qnAHRKwcZpQdOE7k0P5HTQ2cfh+4w3JshcjaqsNky30q7V+kYSS8jQctZK rHPzClOt+FdOquoriHI+oWFDrfBvVrnKO65gUgHDH4/p65Y/8pm/qlbZj+U8dcAM927j kt29k9x1dDOLMLiTwC9UFnhHtJWICzYsMccLw= 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=fqLo5j7t20JxzufwUvCBmkRQA0KJtAo1ikuiUiPRmqo=; b=C2V0FMmH0ieLRnl6wEK0t37Rspi2kySls7CZC5tPbnILjtbmuAY2B9NTUD6HZtGffF DtwHV3JYR6FrKWxCWhs4iK9d1ldripLeH84yS2iv70Um1R0oxDY4cvjILkhCwjx8+Z06 UZtuIFKY6WAW4sSo4nf0fxz3EBoH+bgJmdvaAS4tUVL5EK9S1jGJ0nJTqyK/qnioAL9Q /HIu132NSVnNRip+W6Ai+4oECXeQLjUen+jp6hNPKi09WJdfhjd8XDURAD4hqa+Aw3m0 rmP4uk+cXHl9KEipFbyLKRiyQBsUWWv8393QYca1/DCCNFLVW5322b1BlqwzynZx79Z8 HK9A== X-Gm-Message-State: AD7BkJJAKLw8o4Hfq04L7RFOQKUizamhjI2SHHxJEBLcoDQtVEJEt+Aa2LsLF33D/9YJctVf X-Received: by 10.66.90.163 with SMTP id bx3mr21223552pab.59.1458913812017; Fri, 25 Mar 2016 06:50:12 -0700 (PDT) Received: from localhost.localdomain ([45.56.152.2]) by smtp.gmail.com with ESMTPSA id w20sm16744178pfi.31.2016.03.25.06.50.08 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 25 Mar 2016 06:50:10 -0700 (PDT) From: Shannon Zhao To: xen-devel@lists.xen.org Date: Fri, 25 Mar 2016 21:48:47 +0800 Message-Id: <1458913735-2678-15-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 14/22] arm/acpi: Create min DT stub 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 a DT for Dom0 for ACPI-case only. DT contains minimal required informations such as Dom0 bootargs, initrd, efi description table and address of uefi memory table. Also document this device tree bindings of "hypervisor" and "hypervisor/uefi" node. Signed-off-by: Naresh Bhat Signed-off-by: Parth Dixit Signed-off-by: Shannon Zhao Reviewed-by: Stefano Stabellini Acked-by: Julien Grall --- v7: change the function name and address comments --- docs/misc/arm/device-tree/guest.txt | 60 +++++++++++++++ xen/arch/arm/domain_build.c | 142 ++++++++++++++++++++++++++++++++++++ xen/arch/arm/efi/efi-dom0.c | 39 ++++++++++ xen/include/asm-arm/setup.h | 2 + 4 files changed, 243 insertions(+) create mode 100644 docs/misc/arm/device-tree/guest.txt diff --git a/docs/misc/arm/device-tree/guest.txt b/docs/misc/arm/device-tree/guest.txt new file mode 100644 index 0000000..418f1e9 --- /dev/null +++ b/docs/misc/arm/device-tree/guest.txt @@ -0,0 +1,60 @@ +* Xen hypervisor device tree bindings + +Xen ARM virtual platforms shall have a top-level "hypervisor" node with +the following properties: + +- compatible: + compatible = "xen,xen-", "xen,xen"; + where is the version of the Xen ABI of the platform. + +- reg: specifies the base physical address and size of a region in + memory where the grant table should be mapped to, using an + HYPERVISOR_memory_op hypercall. The memory region is large enough to map + the whole grant table (it is larger or equal to gnttab_max_grant_frames()). + This property is unnecessary when booting Dom0 using ACPI. + +- interrupts: the interrupt used by Xen to inject event notifications. + A GIC node is also required. + This property is unnecessary when booting Dom0 using ACPI. + +To support UEFI on Xen ARM virtual platforms, Xen populates the FDT "uefi" node +under /hypervisor with following parameters: + +________________________________________________________________________________ +Name | Size | Description +================================================================================ +xen,uefi-system-table | 64-bit | Guest physical address of the UEFI System + | | Table. +-------------------------------------------------------------------------------- +xen,uefi-mmap-start | 64-bit | Guest physical address of the UEFI memory + | | map. +-------------------------------------------------------------------------------- +xen,uefi-mmap-size | 32-bit | Size in bytes of the UEFI memory map + | | pointed to in previous entry. +-------------------------------------------------------------------------------- +xen,uefi-mmap-desc-size | 32-bit | Size in bytes of each entry in the UEFI + | | memory map. +-------------------------------------------------------------------------------- +xen,uefi-mmap-desc-ver | 32-bit | Version of the mmap descriptor format. +-------------------------------------------------------------------------------- + +Example (assuming #address-cells = <2> and #size-cells = <2>): + +hypervisor { + compatible = "xen,xen-4.3", "xen,xen"; + reg = <0 0xb0000000 0 0x20000>; + interrupts = <1 15 0xf08>; + uefi { + xen,uefi-system-table = <0xXXXXXXXX>; + xen,uefi-mmap-start = <0xXXXXXXXX>; + xen,uefi-mmap-size = <0xXXXXXXXX>; + xen,uefi-mmap-desc-size = <0xXXXXXXXX>; + xen,uefi-mmap-desc-ver = <0xXXXXXXXX>; + }; +}; + +The format and meaning of the "xen,uefi-*" parameters are similar to those in +Documentation/arm/uefi.txt in Linux, which are provided by the regular Linux +UEFI stub. However they differ because they are provided by the Xen hypervisor, +together with a set of UEFI runtime services implemented via hypercalls, see +xen/include/public/platform.h. diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 70c8421..58a44ff 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1357,6 +1357,144 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) } #ifdef CONFIG_ACPI +#define ACPI_DOM0_FDT_MIN_SIZE 4096 + +static int acpi_make_chosen_node(const struct kernel_info *kinfo) +{ + int res; + const char *bootargs = NULL; + const struct bootmodule *mod = kinfo->kernel_bootmodule; + void *fdt = kinfo->fdt; + + DPRINT("Create chosen node\n"); + res = fdt_begin_node(fdt, "chosen"); + if ( res ) + return res; + + if ( mod && mod->cmdline[0] ) + { + bootargs = &mod->cmdline[0]; + res = fdt_property(fdt, "bootargs", bootargs, strlen(bootargs) + 1); + if ( res ) + return res; + } + + /* + * If the bootloader provides an initrd, we must create a placeholder + * for the initrd properties. The values will be replaced later. + */ + if ( mod && mod->size ) + { + u64 a = 0; + res = fdt_property(kinfo->fdt, "linux,initrd-start", &a, sizeof(a)); + if ( res ) + return res; + + res = fdt_property(kinfo->fdt, "linux,initrd-end", &a, sizeof(a)); + if ( res ) + return res; + } + + res = fdt_end_node(fdt); + + return res; +} + +static int acpi_make_hypervisor_node(const struct kernel_info *kinfo, + struct membank tbl_add[]) +{ + const char compat[] = + "xen,xen-"__stringify(XEN_VERSION)"."__stringify(XEN_SUBVERSION)"\0" + "xen,xen"; + int res; + /* Convenience alias */ + void *fdt = kinfo->fdt; + + DPRINT("Create hypervisor node\n"); + + /* See linux Documentation/devicetree/bindings/arm/xen.txt */ + res = fdt_begin_node(fdt, "hypervisor"); + if ( res ) + return res; + + /* Cannot use fdt_property_string due to embedded nulls */ + res = fdt_property(fdt, "compatible", compat, sizeof(compat)); + if ( res ) + return res; + + res = acpi_make_efi_nodes(fdt, tbl_add); + if ( res ) + return res; + + res = fdt_end_node(fdt); + + return res; +} + +/* + * Prepare a minimal DTB for Dom0 which contains bootargs, initrd, memory + * information, EFI table. + */ +static int create_acpi_dtb(struct kernel_info *kinfo, struct membank tbl_add[]) +{ + int new_size; + int ret; + + DPRINT("Prepare a min DTB for DOM0\n"); + + /* Allocate min size for DT */ + new_size = ACPI_DOM0_FDT_MIN_SIZE; + kinfo->fdt = xmalloc_bytes(new_size); + + if ( kinfo->fdt == NULL ) + return -ENOMEM; + + /* Create a new empty DT for DOM0 */ + ret = fdt_create(kinfo->fdt, new_size); + if ( ret < 0 ) + goto err; + + ret = fdt_finish_reservemap(kinfo->fdt); + if ( ret < 0 ) + goto err; + + ret = fdt_begin_node(kinfo->fdt, "/"); + if ( ret < 0 ) + goto err; + + ret = fdt_property_cell(kinfo->fdt, "#address-cells", 2); + if ( ret ) + return ret; + + ret = fdt_property_cell(kinfo->fdt, "#size-cells", 1); + if ( ret ) + return ret; + + /* Create a chosen node for DOM0 */ + ret = acpi_make_chosen_node(kinfo); + if ( ret ) + goto err; + + ret = acpi_make_hypervisor_node(kinfo, tbl_add); + if ( ret ) + goto err; + + ret = fdt_end_node(kinfo->fdt); + if ( ret < 0 ) + goto err; + + ret = fdt_finish(kinfo->fdt); + if ( ret < 0 ) + goto err; + + return 0; + + err: + printk("Device tree generation failed (%d).\n", ret); + xfree(kinfo->fdt); + return -EINVAL; +} + static void acpi_map_other_tables(struct domain *d) { int i; @@ -1742,6 +1880,10 @@ static int prepare_acpi(struct domain *d, struct kernel_info *kinfo) clean_and_invalidate_dcache_va_range(d->arch.efi_acpi_table, d->arch.efi_acpi_len); + rc = create_acpi_dtb(kinfo, tbl_add); + if ( rc != 0 ) + return rc; + return 0; } #else diff --git a/xen/arch/arm/efi/efi-dom0.c b/xen/arch/arm/efi/efi-dom0.c index cf71bf4..c40a7c5 100644 --- a/xen/arch/arm/efi/efi-dom0.c +++ b/xen/arch/arm/efi/efi-dom0.c @@ -25,6 +25,7 @@ #include "efi-dom0.h" #include #include +#include #include #include #include "../../../common/decompress.h" @@ -138,6 +139,44 @@ void __init acpi_create_efi_mmap_table(struct domain *d, * (mem->nr_banks + acpi_mem.nr_banks + 1); } +/* Create /hypervisor/uefi node for efi properties. */ +int __init acpi_make_efi_nodes(void *fdt, struct membank tbl_add[]) +{ + int res; + + res = fdt_begin_node(fdt, "uefi"); + if ( res ) + return res; + + res = fdt_property_u64(fdt, "xen,uefi-system-table", + tbl_add[TBL_EFIT].start); + if ( res ) + return res; + + res = fdt_property_u64(fdt, "xen,uefi-mmap-start", + tbl_add[TBL_MMAP].start); + if ( res ) + return res; + + res = fdt_property_u32(fdt, "xen,uefi-mmap-size", + tbl_add[TBL_MMAP].size); + if ( res ) + return res; + + res = fdt_property_u32(fdt, "xen,uefi-mmap-desc-size", + sizeof(EFI_MEMORY_DESCRIPTOR)); + if ( res ) + return res; + + res = fdt_property_u32(fdt, "xen,uefi-mmap-desc-ver", 1); + if ( res ) + return res; + + res = fdt_end_node(fdt); + + return res; +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index 9a71e90..3da7a49 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -60,6 +60,8 @@ void acpi_create_efi_mmap_table(struct domain *d, const struct meminfo *mem, struct membank tbl_add[]); +int acpi_make_efi_nodes(void *fdt, struct membank tbl_add[]); + int construct_dom0(struct domain *d); void discard_initial_modules(void);