From patchwork Thu Sep 10 08:41:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 7152751 Return-Path: X-Original-To: patchwork-linux-arm@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 C98639F326 for ; Thu, 10 Sep 2015 08:53:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BC670207C2 for ; Thu, 10 Sep 2015 08:53:25 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 98864207BD for ; Thu, 10 Sep 2015 08:53:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZZxZh-0006Yq-RT; Thu, 10 Sep 2015 08:51:21 +0000 Received: from szxga02-in.huawei.com ([119.145.14.65]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZZxZc-00063v-HD for linux-arm-kernel@lists.infradead.org; Thu, 10 Sep 2015 08:51:19 +0000 Received: from 172.24.1.47 (EHLO SZXEML424-HUB.china.huawei.com) ([172.24.1.47]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CSC71314; Thu, 10 Sep 2015 16:42:50 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by SZXEML424-HUB.china.huawei.com (10.82.67.153) with Microsoft SMTP Server id 14.3.235.1; Thu, 10 Sep 2015 16:42:33 +0800 From: Shannon Zhao To: , Subject: [PATCH] efi/libstub/fdt: Standardize the names of EFI stub parameters Date: Thu, 10 Sep 2015 16:41:56 +0800 Message-ID: <1441874516-11364-1-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 MIME-Version: 1.0 X-Originating-IP: [10.177.16.142] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150910_015117_363349_27709463 X-CRM114-Status: GOOD ( 13.51 ) X-Spam-Score: -4.2 (----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-efi@vger.kernel.org, ian.campbell@citrix.com, linux-doc@vger.kernel.org, ard.biesheuvel@linaro.org, linux-kernel@vger.kernel.org, leif.lindholm@linaro.org, xen-devel@lists.xen.org, julien.grall@citrix.com, freebsd-arm@freebsd.org, matt.fleming@intel.com, christoffer.dall@linaro.org, jbeulich@suse.com, zhaoshenglong@huawei.com, peter.huangpeng@huawei.com, stefano.stabellini@eu.citrix.com, shannon.zhao@linaro.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, 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 These EFI stub parameters are used to internal communication between EFI stub and Linux kernel and EFI stub creates these parameters. But for Xen on ARM when booting with UEFI, Xen will create a minimal DT providing these parameters for Dom0 and Dom0 is not only Linux kernel, but also other OS (such as FreeBSD) which will be used in the future. So here we plan to standardize the names by dropping the prefix "linux," and make them common to other OS. Also this will not break the compatibility since these parameters are used to internal communication between EFI stub and kernel. Signed-off-by: Shannon Zhao --- Look at [1] for the discussion about this in Xen ML. The purpose of this patch is to standardize the names to make Linux ARM kernel work on Xen with UEFI. Also it hopes other OS(e.g. FreeBSD), which will be used as Dom0 on Xen, could support this mechanism as well. [1]http://lists.xenproject.org/archives/html/xen-devel/2015-08/msg02250.html Documentation/arm/uefi.txt | 10 +++++----- drivers/firmware/efi/efi.c | 10 +++++----- drivers/firmware/efi/libstub/fdt.c | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Documentation/arm/uefi.txt b/Documentation/arm/uefi.txt index d60030a..8c83243 100644 --- a/Documentation/arm/uefi.txt +++ b/Documentation/arm/uefi.txt @@ -45,18 +45,18 @@ following parameters: ________________________________________________________________________________ Name | Size | Description ================================================================================ -linux,uefi-system-table | 64-bit | Physical address of the UEFI System Table. +uefi-system-table | 64-bit | Physical address of the UEFI System Table. -------------------------------------------------------------------------------- -linux,uefi-mmap-start | 64-bit | Physical address of the UEFI memory map, +uefi-mmap-start | 64-bit | Physical address of the UEFI memory map, | | populated by the UEFI GetMemoryMap() call. -------------------------------------------------------------------------------- -linux,uefi-mmap-size | 32-bit | Size in bytes of the UEFI memory map +uefi-mmap-size | 32-bit | Size in bytes of the UEFI memory map | | pointed to in previous entry. -------------------------------------------------------------------------------- -linux,uefi-mmap-desc-size | 32-bit | Size in bytes of each entry in the UEFI +uefi-mmap-desc-size | 32-bit | Size in bytes of each entry in the UEFI | | memory map. -------------------------------------------------------------------------------- -linux,uefi-mmap-desc-ver | 32-bit | Version of the mmap descriptor format. +uefi-mmap-desc-ver | 32-bit | Version of the mmap descriptor format. -------------------------------------------------------------------------------- linux,uefi-stub-kern-ver | string | Copy of linux_banner from build. -------------------------------------------------------------------------------- diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index d6144e3..3878715 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -481,11 +481,11 @@ static __initdata struct { int offset; int size; } dt_params[] = { - UEFI_PARAM("System Table", "linux,uefi-system-table", system_table), - UEFI_PARAM("MemMap Address", "linux,uefi-mmap-start", mmap), - UEFI_PARAM("MemMap Size", "linux,uefi-mmap-size", mmap_size), - UEFI_PARAM("MemMap Desc. Size", "linux,uefi-mmap-desc-size", desc_size), - UEFI_PARAM("MemMap Desc. Version", "linux,uefi-mmap-desc-ver", desc_ver) + UEFI_PARAM("System Table", "uefi-system-table", system_table), + UEFI_PARAM("MemMap Address", "uefi-mmap-start", mmap), + UEFI_PARAM("MemMap Size", "uefi-mmap-size", mmap_size), + UEFI_PARAM("MemMap Desc. Size", "uefi-mmap-desc-size", desc_size), + UEFI_PARAM("MemMap Desc. Version", "uefi-mmap-desc-ver", desc_ver) }; struct param_info { diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c index ef5d764..e94589a 100644 --- a/drivers/firmware/efi/libstub/fdt.c +++ b/drivers/firmware/efi/libstub/fdt.c @@ -118,31 +118,31 @@ efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt, /* Add FDT entries for EFI runtime services in chosen node. */ node = fdt_subnode_offset(fdt, 0, "chosen"); fdt_val64 = cpu_to_fdt64((u64)(unsigned long)sys_table); - status = fdt_setprop(fdt, node, "linux,uefi-system-table", + status = fdt_setprop(fdt, node, "uefi-system-table", &fdt_val64, sizeof(fdt_val64)); if (status) goto fdt_set_fail; fdt_val64 = cpu_to_fdt64((u64)(unsigned long)memory_map); - status = fdt_setprop(fdt, node, "linux,uefi-mmap-start", + status = fdt_setprop(fdt, node, "uefi-mmap-start", &fdt_val64, sizeof(fdt_val64)); if (status) goto fdt_set_fail; fdt_val32 = cpu_to_fdt32(map_size); - status = fdt_setprop(fdt, node, "linux,uefi-mmap-size", + status = fdt_setprop(fdt, node, "uefi-mmap-size", &fdt_val32, sizeof(fdt_val32)); if (status) goto fdt_set_fail; fdt_val32 = cpu_to_fdt32(desc_size); - status = fdt_setprop(fdt, node, "linux,uefi-mmap-desc-size", + status = fdt_setprop(fdt, node, "uefi-mmap-desc-size", &fdt_val32, sizeof(fdt_val32)); if (status) goto fdt_set_fail; fdt_val32 = cpu_to_fdt32(desc_ver); - status = fdt_setprop(fdt, node, "linux,uefi-mmap-desc-ver", + status = fdt_setprop(fdt, node, "uefi-mmap-desc-ver", &fdt_val32, sizeof(fdt_val32)); if (status) goto fdt_set_fail;