From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0F3F8C5AD49 for ; Tue, 3 Jun 2025 00:42:26 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.1003931.1383564 (Exim 4.92) (envelope-from ) id 1uMFjI-0006na-Pq; Tue, 03 Jun 2025 00:42:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1003931.1383564; Tue, 03 Jun 2025 00:42:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uMFjI-0006nT-N8; Tue, 03 Jun 2025 00:42:12 +0000 Received: by outflank-mailman (input) for mailman id 1003931; Tue, 03 Jun 2025 00:42:11 +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 1uMFjH-0006nN-7W for xen-devel@lists.xenproject.org; Tue, 03 Jun 2025 00:42:11 +0000 Received: from mail-4316.protonmail.ch (mail-4316.protonmail.ch [185.70.43.16]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 95331cc7-4013-11f0-a300-13f23c93f187; Tue, 03 Jun 2025 02:42:10 +0200 (CEST) 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: 95331cc7-4013-11f0-a300-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1748911329; x=1749170529; bh=FgKpQh5AdTMGBDKbYRmo26c2uRVxV1LJ2o+HuXBB+K0=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=UCMShHsiDSU0AHw5AgWLzLCH1qvD7Qe7PVrtRjNBE9K94nlTthOObU83XDcUhE7jS zPOaqo34Q7FiEL9k9I5LXOgI95P65O83E3u4bc13nMdVc+ROCPuCgTzem5aC0yvdEg hVN5OosngNDvBTxmp4os6L6Nl5t8kCtukC3vxsQvN0sVbcIIZCV1r3+G2yCbJIp15V JTOr5BMqwKxRxGslt2AfWfEz0jXzEZcn+vjp1HgrLd/E2GkM1k09tJyID+x9US6k6e H2b/Y2h+EVJOA2sF+GrLwOuYIOTdpsDtYQbRWTjIv4C9waMJMKSuThjhF9OeYPiAD8 UENBvDJnG71OQ== Date: Tue, 03 Jun 2025 00:42:04 +0000 To: Alejandro Vallejo From: dmkhn@proton.me Cc: xen-devel@lists.xenproject.org, Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , Volodymyr Babchuk , "Daniel P. Smith" Subject: Re: [PATCH 12/19] xen/dt: Move bootfdt functions to xen/bootfdt.h Message-ID: In-Reply-To: References: <20250530120242.39398-1-agarciav@amd.com> <20250530120242.39398-13-agarciav@amd.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: 636e15f7edcbc4454be038178d58dc897d0a91ae MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Mon, Jun 02, 2025 at 06:41:32PM +0200, Alejandro Vallejo wrote: > On Sat May 31, 2025 at 2:35 AM CEST, dmkhn wrote: > > On Fri, May 30, 2025 at 02:02:20PM +0200, Alejandro Vallejo wrote: > >> Part of an unpicking process to extract bootfdt contents independent o= f bootinfo > >> to a separate file for x86 to take. > >> > >> Move functions required for early FDT parsing from device_tree.h and a= rm's > >> setup.h onto bootfdt.h > >> > >> Declaration motion only. Not a functional change. > >> > >> Signed-off-by: Alejandro Vallejo > >> --- > >> xen/arch/arm/include/asm/setup.h | 6 ---- > >> xen/include/xen/bootfdt.h | 62 +++++++++++++++++++++++++++++++= + > >> xen/include/xen/device_tree.h | 34 +----------------- > >> 3 files changed, 63 insertions(+), 39 deletions(-) > >> > >> diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/a= sm/setup.h > >> index 0f9e531a34..32308837a9 100644 > >> --- a/xen/arch/arm/include/asm/setup.h > >> +++ b/xen/arch/arm/include/asm/setup.h > >> @@ -55,12 +55,6 @@ void setup_mm(void); > >> extern uint32_t hyp_traps_vector[]; > >> void init_traps(void); > >> > >> -void device_tree_get_reg(const __be32 **cell, uint32_t address_cells, > >> - uint32_t size_cells, paddr_t *start, paddr_t= *size); > >> - > >> -u32 device_tree_get_u32(const void *fdt, int node, > >> - const char *prop_name, u32 dflt); > >> - > >> int handle_device(struct domain *d, struct dt_device_node *dev, p2m_t= ype_t p2mt, > >> struct rangeset *iomem_ranges, struct rangeset *irq= _ranges); > >> > >> diff --git a/xen/include/xen/bootfdt.h b/xen/include/xen/bootfdt.h > >> index fa65e8fcf4..079259c719 100644 > >> --- a/xen/include/xen/bootfdt.h > >> +++ b/xen/include/xen/bootfdt.h > >> @@ -2,6 +2,7 @@ > >> #ifndef XEN_BOOTFDT_H > >> #define XEN_BOOTFDT_H > >> > >> +#include > >> #include > >> #include > >> #include > >> @@ -16,8 +17,53 @@ > >> #define NR_MEM_BANKS 256 > >> #define NR_SHMEM_BANKS 32 > >> > >> +/* Default #address and #size cells */ > >> +#define DT_ROOT_NODE_ADDR_CELLS_DEFAULT 2 > >> +#define DT_ROOT_NODE_SIZE_CELLS_DEFAULT 1 > >> + > >> #define MAX_MODULES 32 /* Current maximum useful modules */ > >> > >> +#define DEVICE_TREE_MAX_DEPTH 16 > >> + > >> +/* Helper to read a big number; size is in cells (not bytes) */ > >> +static inline u64 dt_read_number(const __be32 *cell, int size) > >> +{ > >> + u64 r =3D 0; > >> + > >> + while ( size-- ) > >> + r =3D (r << 32) | be32_to_cpu(*(cell++)); > >> + return r; > >> +} > >> + > >> +static inline u64 dt_next_cell(int s, const __be32 **cellp) > >> +{ > >> + const __be32 *p =3D *cellp; > >> + > >> + *cellp =3D p + s; > >> + return dt_read_number(p, s); > >> +} > >> + > >> +typedef int (*device_tree_node_func)(const void *fdt, > >> + int node, const char *name, int = depth, > >> + u32 address_cells, u32 size_cell= s, > >> + void *data); > >> + > >> +/** > >> + * device_tree_for_each_node - iterate over all device tree sub-nodes > >> + * @fdt: flat device tree. > >> + * @node: parent node to start the search from > >> + * @func: function to call for each sub-node. > >> + * @data: data to pass to @func. > >> + * > >> + * Any nodes nested at DEVICE_TREE_MAX_DEPTH or deeper are ignored. > >> + * > >> + * Returns 0 if all nodes were iterated over successfully. If @func > >> + * returns a value different from 0, that value is returned immediate= ly. > >> + */ > >> +int device_tree_for_each_node(const void *fdt, int node, > >> + device_tree_node_func func, > >> + void *data); > >> + > >> typedef enum { > >> BOOTMOD_XEN, > >> BOOTMOD_FDT, > >> @@ -246,4 +292,20 @@ static inline struct membanks *membanks_xzalloc(u= nsigned int nr, > >> return banks; > >> } > >> > >> +/* > >> + * Interpret the property `prop_name` of `node` as a u32. > >> + * > >> + * Returns the property value on success; otherwise returns `dflt`. > >> + */ > >> +uint32_t device_tree_get_u32(const void *fdt, int node, > >> + const char *prop_name, uint32_t dflt); > > > > Suggest using `dt_` prefix (or any other good prefix) for all functions > > in this header for consistency: e.g. there's dt_read_number() but also > > device_tree_get_u32(). >=20 > I'd be quite happy with an fdt_ prefix, to clearly show they relate to FD= Ts. +1 >=20 > But I didn't want to do that right away because it would obscure the stri= ct code > motion that's going on. Got it! >=20 > > > >> + > >> +/* > >> + * Interpret the property `prop_name` of `node` as a "reg". > >> + * > >> + * Returns outputs in `start` and `size`. > >> + */ > >> +void device_tree_get_reg(const __be32 **cell, uint32_t address_cells, > >> + uint32_t size_cells, paddr_t *start, paddr_t= *size); > >> + > >> #endif /* XEN_BOOTFDT_H */ > >> diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tr= ee.h > >> index 6dc1fb5159..0a22b1ba1d 100644 > >> --- a/xen/include/xen/device_tree.h > >> +++ b/xen/include/xen/device_tree.h > >> @@ -10,6 +10,7 @@ > >> #ifndef __XEN_DEVICE_TREE_H__ > >> #define __XEN_DEVICE_TREE_H__ > >> > >> +#include > >> #include > >> > >> #include > >> @@ -22,8 +23,6 @@ > >> #include > >> #include > >> > >> -#define DEVICE_TREE_MAX_DEPTH 16 > >> - > >> /* > >> * Struct used for matching a device > >> */ > >> @@ -164,17 +163,8 @@ struct dt_raw_irq { > >> u32 specifier[DT_MAX_IRQ_SPEC]; > >> }; > >> > >> -typedef int (*device_tree_node_func)(const void *fdt, > >> - int node, const char *name, int = depth, > >> - u32 address_cells, u32 size_cell= s, > >> - void *data); > >> - > >> extern const void *device_tree_flattened; > >> > >> -int device_tree_for_each_node(const void *fdt, int node, > >> - device_tree_node_func func, > >> - void *data); > >> - > >> /** > >> * dt_unflatten_host_device_tree - Unflatten the host device tree > >> * > >> @@ -245,10 +235,6 @@ void intc_dt_preinit(void); > >> #define dt_node_cmp(s1, s2) strcasecmp((s1), (s2)) > >> #define dt_compat_cmp(s1, s2) strcasecmp((s1), (s2)) > >> > >> -/* Default #address and #size cells */ > >> -#define DT_ROOT_NODE_ADDR_CELLS_DEFAULT 2 > >> -#define DT_ROOT_NODE_SIZE_CELLS_DEFAULT 1 > >> - > >> #define dt_for_each_property_node(dn, pp) \ > >> for ( pp =3D (dn)->properties; (pp) !=3D NULL; pp =3D (pp)->next = ) > >> > >> @@ -258,16 +244,6 @@ void intc_dt_preinit(void); > >> #define dt_for_each_child_node(dt, dn) \ > >> for ( dn =3D (dt)->child; (dn) !=3D NULL; dn =3D (dn)->sibling ) > >> > >> -/* Helper to read a big number; size is in cells (not bytes) */ > >> -static inline u64 dt_read_number(const __be32 *cell, int size) > >> -{ > >> - u64 r =3D 0; > >> - > >> - while ( size-- ) > >> - r =3D (r << 32) | be32_to_cpu(*(cell++)); > >> - return r; > >> -} > >> - > >> /* Wrapper for dt_read_number() to return paddr_t (instead of uint64_= t) */ > >> static inline paddr_t dt_read_paddr(const __be32 *cell, int size) > >> { > >> @@ -307,14 +283,6 @@ static inline int dt_size_to_cells(int bytes) > >> return (bytes / sizeof(u32)); > >> } > >> > >> -static inline u64 dt_next_cell(int s, const __be32 **cellp) > >> -{ > >> - const __be32 *p =3D *cellp; > >> - > >> - *cellp =3D p + s; > >> - return dt_read_number(p, s); > >> -} > >> - > >> static inline const char *dt_node_full_name(const struct dt_device_no= de *np) > >> { > >> return (np && np->full_name) ? np->full_name : ""; > >> -- > >> 2.43.0 > >> > >> >=20