From nobody Fri May 17 04:59:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=arm.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1662629529793871.7793543536362; Thu, 8 Sep 2022 02:32:09 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.403034.644995 (Exim 4.92) (envelope-from ) id 1oWDss-0001e4-V3; Thu, 08 Sep 2022 09:31:42 +0000 Received: by outflank-mailman (output) from mailman id 403034.644995; Thu, 08 Sep 2022 09:31:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWDss-0001dx-S7; Thu, 08 Sep 2022 09:31:42 +0000 Received: by outflank-mailman (input) for mailman id 403034; Thu, 08 Sep 2022 09:31:40 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oWDsq-0001dr-OC for xen-devel@lists.xenproject.org; Thu, 08 Sep 2022 09:31:40 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-sth1.inumbo.com (Halon) with ESMTP id 0a1f2033-2f59-11ed-a31c-8f8a9ae3403f; Thu, 08 Sep 2022 11:31:39 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8CEB514BF; Thu, 8 Sep 2022 02:31:44 -0700 (PDT) Received: from entos-skylake.shanghai.arm.com (entos-skylake.shanghai.arm.com [10.169.212.207]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 32B2A3F73D; Thu, 8 Sep 2022 02:31:35 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 0a1f2033-2f59-11ed-a31c-8f8a9ae3403f From: Henry Wang To: xen-devel@lists.xenproject.org Cc: Henry Wang , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk Subject: [PATCH] xen/arm, device-tree: Make static-mem use #{address,size}-cells Date: Thu, 8 Sep 2022 09:31:29 +0000 Message-Id: <20220908093129.30124-1-Henry.Wang@arm.com> X-Mailer: git-send-email 2.17.1 X-ZM-MESSAGEID: 1662629531117100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In order to keep consistency in the device tree binding, there is no need for static memory allocation feature to define a specific set of address and size cells for "xen,static-mem" property. Therefore, this commit reuses the regular #{address,size}-cells for parsing the device tree "xen,static-mem" property. Update the documentation accordingly. Signed-off-by: Henry Wang Reviewed-by: Michal Orzel --- docs/misc/arm/device-tree/booting.txt | 13 ++++++------- docs/misc/arm/passthrough-noiommu.txt | 7 +++---- xen/arch/arm/bootfdt.c | 5 ----- xen/arch/arm/domain_build.c | 16 ++-------------- 4 files changed, 11 insertions(+), 30 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-t= ree/booting.txt index 98253414b8..12d77e3b26 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -339,15 +339,15 @@ kernel will be able to discover the device. =20 =20 Static Allocation -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 Static Allocation refers to system or sub-system(domains) for which memory areas are pre-defined by configuration using physical address ranges. =20 Memory can be statically allocated to a domain using the property "xen,sta= tic- mem" defined in the domain configuration. The number of cells for the addr= ess -and the size must be defined using respectively the properties -"#xen,static-mem-address-cells" and "#xen,static-mem-size-cells". +and the size must be defined respectively by the parent node properties +"#address-cells" and "#size-cells". =20 The property 'memory' is still needed and should match the amount of memory given to the guest. Currently, it either comes from static memory or lets = Xen @@ -362,14 +362,13 @@ device-tree: =20 / { chosen { + #address-cells =3D <0x1>; + #size-cells =3D <0x1>; + ... domU1 { compatible =3D "xen,domain"; - #address-cells =3D <0x2>; - #size-cells =3D <0x2>; cpus =3D <2>; memory =3D <0x0 0x80000>; - #xen,static-mem-address-cells =3D <0x1>; - #xen,static-mem-size-cells =3D <0x1>; xen,static-mem =3D <0x30000000 0x20000000>; ... }; diff --git a/docs/misc/arm/passthrough-noiommu.txt b/docs/misc/arm/passthro= ugh-noiommu.txt index 3e2ef21ad7..69b8de1975 100644 --- a/docs/misc/arm/passthrough-noiommu.txt +++ b/docs/misc/arm/passthrough-noiommu.txt @@ -33,14 +33,13 @@ on static allocation in the device-tree: =20 / { chosen { + #address-cells =3D <0x1>; + #size-cells =3D <0x1>; + ... domU1 { compatible =3D "xen,domain"; - #address-cells =3D <0x2>; - #size-cells =3D <0x2>; cpus =3D <2>; memory =3D <0x0 0x80000>; - #xen,static-mem-address-cells =3D <0x1>; - #xen,static-mem-size-cells =3D <0x1>; xen,static-mem =3D <0x30000000 0x20000000>; direct-map; ... diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index ec81a45de9..cd264793d5 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -352,11 +352,6 @@ static int __init process_domain_node(const void *fdt,= int node, /* No "xen,static-mem" present. */ return 0; =20 - address_cells =3D device_tree_get_u32(fdt, node, - "#xen,static-mem-address-cells", 0= ); - size_cells =3D device_tree_get_u32(fdt, node, - "#xen,static-mem-size-cells", 0); - return device_tree_get_meminfo(fdt, node, "xen,static-mem", address_ce= lls, size_cells, &bootinfo.reserved_mem, tru= e); } diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index b76a84e8f5..258d74699d 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -563,21 +563,9 @@ static int __init parse_static_mem_prop(const struct d= t_device_node *node, const struct dt_property *prop; =20 prop =3D dt_find_property(node, "xen,static-mem", NULL); - if ( !dt_property_read_u32(node, "#xen,static-mem-address-cells", - addr_cells) ) - { - printk(XENLOG_ERR - "failed to read \"#xen,static-mem-address-cells\".\n"); - return -EINVAL; - } =20 - if ( !dt_property_read_u32(node, "#xen,static-mem-size-cells", - size_cells) ) - { - printk(XENLOG_ERR - "failed to read \"#xen,static-mem-size-cells\".\n"); - return -EINVAL; - } + *addr_cells =3D dt_n_addr_cells(node); + *size_cells =3D dt_n_size_cells(node); =20 *cell =3D (const __be32 *)prop->value; *length =3D prop->length; --=20 2.17.1