From nobody Fri Apr 3 22:33:19 2026 Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ECC5938AC9A for ; Mon, 23 Mar 2026 10:09:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.118.77.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774260558; cv=none; b=JBwABuiZcrn8C4ct4BezSB7/T5VNb5VsOwjGq47XdAGlCUgtX+XqoKIGgY9dEmX4PBykvL0hqlfCZOVLdhSEM0QF04fv7eDFFKJENOipvZ3gDmaQcjR2ZiXNqUJRTM9Tgty5n96tTgBPV3Zhee2NOvLBCkGnKwy+NGV1Bvd253E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774260558; c=relaxed/simple; bh=JXWNJLqpuFrFJj+RYTjGPd9fc76RzcAEVUEprzX8JJE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:MIME-Version: Content-Type:References; b=MWiD3YiC9G62uLB3OT2P5TsVwr6PXZhIIIdeph6n/qT302lucU2QpFOwALll7cvm0GjhtWw3HyUn79HJfG7C3ZIiq44C9TshxF25RqRqqaJyCqCFODD3RHM4VlOFOfuLW5+9XVD0gQlTIVpI8pibP4IcDzdSLPcKTYBvEdPvcvI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=samsung.com; spf=pass smtp.mailfrom=samsung.com; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b=GPjTyDZU; arc=none smtp.client-ip=210.118.77.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=samsung.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=samsung.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="GPjTyDZU" Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20260323100909euoutp01a59efed37e0ecb570dd050a075e60fbd~fcJGlvbak1424614246euoutp01e for ; Mon, 23 Mar 2026 10:09:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20260323100909euoutp01a59efed37e0ecb570dd050a075e60fbd~fcJGlvbak1424614246euoutp01e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1774260549; bh=/6WjlAYerVq6d8qF1cWBAuX5UyfsvgD0ELY2Xcbrhso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GPjTyDZUrQmT+JdMPRVmruY292h+O0ZF60kzgPCqp7xy3DWnWdEmncqbbpSHSlcD4 GoLazrAKJ6pgERLEOSDboQs3H1Z91P0+Tbd58sqLDqHyNxMeeYs1JLMsTLzpqDNvdu Gr+MnzGcm+b8wZJU8KPPgAOffF7szmgP3wE7/G4U= Received: from eusmtip2.samsung.com (unknown [203.254.199.222]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20260323100908eucas1p1890b792406ac416bb4db0d78f3e71faf~fcJGThcM42576725767eucas1p1s; Mon, 23 Mar 2026 10:09:08 +0000 (GMT) Received: from AMDC4653.digital.local (unknown [106.120.51.32]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20260323100908eusmtip284c5268a0dd34d1bd6b67a1ecfa80e41~fcJFwBqAP0899908999eusmtip2g; Mon, 23 Mar 2026 10:09:08 +0000 (GMT) From: Marek Szyprowski To: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-mm@kvack.org, iommu@lists.linux.dev Cc: Marek Szyprowski , Rob Herring , Krzysztof Kozlowski , Oreoluwa Babatunde , Saravana Kannan , Andrew Morton , Robin Murphy Subject: [PATCH v2 1/7] of: reserved_mem: remove fdt node from the structure Date: Mon, 23 Mar 2026 11:08:55 +0100 Message-Id: <20260323100901.4079171-2-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260323100901.4079171-1-m.szyprowski@samsung.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CMS-MailID: 20260323100908eucas1p1890b792406ac416bb4db0d78f3e71faf X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20260323100908eucas1p1890b792406ac416bb4db0d78f3e71faf X-EPHeader: CA X-CMS-RootMailID: 20260323100908eucas1p1890b792406ac416bb4db0d78f3e71faf References: <20260323100901.4079171-1-m.szyprowski@samsung.com> FDT node is not needed for anything besides the initialization, so it can be simply passed as an argument to the reserved memory region init function. Signed-off-by: Marek Szyprowski --- drivers/memory/tegra/tegra210-emc-table.c | 3 ++- drivers/of/of_reserved_mem.c | 25 ++++++++++------------- include/linux/of_reserved_mem.h | 4 ++-- kernel/dma/coherent.c | 4 +--- kernel/dma/contiguous.c | 3 +-- kernel/dma/swiotlb.c | 5 ++--- 6 files changed, 19 insertions(+), 25 deletions(-) diff --git a/drivers/memory/tegra/tegra210-emc-table.c b/drivers/memory/teg= ra/tegra210-emc-table.c index 34a8785d2861..ac1d1e13482a 100644 --- a/drivers/memory/tegra/tegra210-emc-table.c +++ b/drivers/memory/tegra/tegra210-emc-table.c @@ -75,7 +75,8 @@ static const struct reserved_mem_ops tegra210_emc_table_o= ps =3D { .device_release =3D tegra210_emc_table_device_release, }; =20 -static int tegra210_emc_table_init(struct reserved_mem *rmem) +static int tegra210_emc_table_init(unsigned long node, + struct reserved_mem *rmem) { pr_debug("Tegra210 EMC table at %pa, size %lu bytes\n", &rmem->base, (unsigned long)rmem->size); diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 1fd28f805610..6705b7afebf0 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -104,7 +104,8 @@ static void __init alloc_reserved_mem_array(void) reserved_mem =3D new_array; } =20 -static void __init fdt_init_reserved_mem_node(struct reserved_mem *rmem); +static void __init fdt_init_reserved_mem_node(struct reserved_mem *rmem, + unsigned long node); /* * fdt_reserved_mem_save_node() - save fdt node for second pass initializa= tion */ @@ -118,13 +119,12 @@ static void __init fdt_reserved_mem_save_node(unsigne= d long node, const char *un return; } =20 - rmem->fdt_node =3D node; rmem->name =3D uname; rmem->base =3D base; rmem->size =3D size; =20 /* Call the region specific initialization function */ - fdt_init_reserved_mem_node(rmem); + fdt_init_reserved_mem_node(rmem, node); =20 reserved_mem_count++; } @@ -483,7 +483,8 @@ static const struct of_device_id __rmem_of_table_sentin= el /* * __reserved_mem_init_node() - call region specific reserved memory init = code */ -static int __init __reserved_mem_init_node(struct reserved_mem *rmem) +static int __init __reserved_mem_init_node(struct reserved_mem *rmem, + unsigned long node) { extern const struct of_device_id __reservedmem_of_table[]; const struct of_device_id *i; @@ -493,10 +494,10 @@ static int __init __reserved_mem_init_node(struct res= erved_mem *rmem) reservedmem_of_init_fn initfn =3D i->data; const char *compat =3D i->compatible; =20 - if (!of_flat_dt_is_compatible(rmem->fdt_node, compat)) + if (!of_flat_dt_is_compatible(node, compat)) continue; =20 - ret =3D initfn(rmem); + ret =3D initfn(node, rmem); if (ret =3D=3D 0) { pr_info("initialized node %s, compatible id %s\n", rmem->name, compat); @@ -526,11 +527,6 @@ static int __init __rmem_cmp(const void *a, const void= *b) if (ra->size > rb->size) return 1; =20 - if (ra->fdt_node < rb->fdt_node) - return -1; - if (ra->fdt_node > rb->fdt_node) - return 1; - return 0; } =20 @@ -564,19 +560,20 @@ static void __init __rmem_check_for_overlap(void) /** * fdt_init_reserved_mem_node() - Initialize a reserved memory region * @rmem: reserved_mem struct of the memory region to be initialized. + * @node: fdt node of the initialized region * * This function is used to call the region specific initialization * function for a reserved memory region. */ -static void __init fdt_init_reserved_mem_node(struct reserved_mem *rmem) +static void __init fdt_init_reserved_mem_node(struct reserved_mem *rmem, + unsigned long node) { - unsigned long node =3D rmem->fdt_node; int err =3D 0; bool nomap; =20 nomap =3D of_get_flat_dt_prop(node, "no-map", NULL) !=3D NULL; =20 - err =3D __reserved_mem_init_node(rmem); + err =3D __reserved_mem_init_node(rmem, node); if (err !=3D 0 && err !=3D -ENOENT) { pr_info("node %s compatible matching fail\n", rmem->name); if (nomap) diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_me= m.h index f573423359f4..5159938bfe03 100644 --- a/include/linux/of_reserved_mem.h +++ b/include/linux/of_reserved_mem.h @@ -11,7 +11,6 @@ struct resource; =20 struct reserved_mem { const char *name; - unsigned long fdt_node; const struct reserved_mem_ops *ops; phys_addr_t base; phys_addr_t size; @@ -25,7 +24,8 @@ struct reserved_mem_ops { struct device *dev); }; =20 -typedef int (*reservedmem_of_init_fn)(struct reserved_mem *rmem); +typedef int (*reservedmem_of_init_fn)(unsigned long node, + struct reserved_mem *rmem); =20 #ifdef CONFIG_OF_RESERVED_MEM =20 diff --git a/kernel/dma/coherent.c b/kernel/dma/coherent.c index 1147497bc512..34621acbd3c5 100644 --- a/kernel/dma/coherent.c +++ b/kernel/dma/coherent.c @@ -367,10 +367,8 @@ static const struct reserved_mem_ops rmem_dma_ops =3D { .device_release =3D rmem_dma_device_release, }; =20 -static int __init rmem_dma_setup(struct reserved_mem *rmem) +static int __init rmem_dma_setup(unsigned long node, struct reserved_mem *= rmem) { - unsigned long node =3D rmem->fdt_node; - if (of_get_flat_dt_prop(node, "reusable", NULL)) return -EINVAL; =20 diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c index c56004d314dc..81a2fa4971ee 100644 --- a/kernel/dma/contiguous.c +++ b/kernel/dma/contiguous.c @@ -475,9 +475,8 @@ static const struct reserved_mem_ops rmem_cma_ops =3D { .device_release =3D rmem_cma_device_release, }; =20 -static int __init rmem_cma_setup(struct reserved_mem *rmem) +static int __init rmem_cma_setup(unsigned long node, struct reserved_mem *= rmem) { - unsigned long node =3D rmem->fdt_node; bool default_cma =3D of_get_flat_dt_prop(node, "linux,cma-default", NULL); struct cma *cma; int err; diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index d8e6f1d889d5..f3a12e15a951 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -1860,10 +1860,9 @@ static const struct reserved_mem_ops rmem_swiotlb_op= s =3D { .device_release =3D rmem_swiotlb_device_release, }; =20 -static int __init rmem_swiotlb_setup(struct reserved_mem *rmem) +static int __init rmem_swiotlb_setup(unsigned long node, + struct reserved_mem *rmem) { - unsigned long node =3D rmem->fdt_node; - if (of_get_flat_dt_prop(node, "reusable", NULL) || of_get_flat_dt_prop(node, "linux,cma-default", NULL) || of_get_flat_dt_prop(node, "linux,dma-default", NULL) || --=20 2.34.1