From nobody Fri Apr 3 20:53:41 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 From nobody Fri Apr 3 20:53:41 2026 Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) (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 F213738A707 for ; Mon, 23 Mar 2026 10:09:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.118.77.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774260552; cv=none; b=fpqwe4czK1kz7EFdO5CvR2k9BTNZpl/qAjIY/GAGfGE5mj5HCjcTGmkXAvzaj2UWI26D0Wx12NOgWxiSkIYGnCVn5VFEDVJkkODc36qOo/fnZua1bjrPI7szuey8bcpOeWyoXgV0WQh0NBU10kJ7ObNFeCO+TdziWQD1TMUk31s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774260552; c=relaxed/simple; bh=CPcTlIJgIyK5T1j0XTj81N/5/UyvrLhYjXjqTIrrO1s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:MIME-Version: Content-Type:References; b=oCWuACMpCmHQ5o+dJGyODn3/xbpqbGpFoZnE895csRRykNx6FMKT236CkvpKIZl6RChhnJ8DD5aYt1K3lk1iBs80KROsr/23pCtqXGy1COdmvmf6RfynqxHbwIboHDyJMlRQKr1w0THGV+drXCLaSGJUxV1QvtmxB6pOhPNuHnA= 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=HXS3Oey5; arc=none smtp.client-ip=210.118.77.12 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="HXS3Oey5" Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20260323100909euoutp021c6f5e0bb9df0e08eba58ca994aaac0d~fcJHMda6f2329223292euoutp02a for ; Mon, 23 Mar 2026 10:09:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20260323100909euoutp021c6f5e0bb9df0e08eba58ca994aaac0d~fcJHMda6f2329223292euoutp02a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1774260549; bh=qDkZBH8D9QGZmacGWO/wLlPET8ve8kNAHImwlz5MpvM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HXS3Oey5TnA5+rQRTdN/cvH6JSjyqwrxn7HA6CSMVtlsIh67qFvs6orY9mc7fvpLg CINXsR5iNEkk+42ywSN77jcAcfdlaHeN+Rh+1uKmH7jShM11Ssq9esrNEu+/eRDFtc oaKNcsLiM1Sd8G6f20Z0SRRFsRFEHJugn5hUcseQ= Received: from eusmtip2.samsung.com (unknown [203.254.199.222]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20260323100909eucas1p20e3bae57f851ea402506f7dbee7ffe3f~fcJG7ohgB3050530505eucas1p2V; Mon, 23 Mar 2026 10:09:09 +0000 (GMT) Received: from AMDC4653.digital.local (unknown [106.120.51.32]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20260323100908eusmtip2f7188445ed61b2d39d08c30101273f88~fcJGZFtr60953009530eusmtip2t; 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 2/7] of: reserved_mem: use -ENODEV instead of -ENOENT Date: Mon, 23 Mar 2026 11:08:56 +0100 Message-Id: <20260323100901.4079171-3-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: 20260323100909eucas1p20e3bae57f851ea402506f7dbee7ffe3f X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20260323100909eucas1p20e3bae57f851ea402506f7dbee7ffe3f X-EPHeader: CA X-CMS-RootMailID: 20260323100909eucas1p20e3bae57f851ea402506f7dbee7ffe3f References: <20260323100901.4079171-1-m.szyprowski@samsung.com> When given reserved memory region doesn't really support given node, return -ENODEV instead of -ENOENT. Then fix __reserved_mem_init_node() function to properly propagate error code different from -ENODEV instead of silently ignoring it. Signed-off-by: Marek Szyprowski --- drivers/of/of_reserved_mem.c | 7 ++++--- kernel/dma/coherent.c | 2 +- kernel/dma/contiguous.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 6705b7afebf0..9aff460a0420 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -488,9 +488,10 @@ static int __init __reserved_mem_init_node(struct rese= rved_mem *rmem, { extern const struct of_device_id __reservedmem_of_table[]; const struct of_device_id *i; - int ret =3D -ENOENT; + int ret =3D -ENODEV; =20 - for (i =3D __reservedmem_of_table; i < &__rmem_of_table_sentinel; i++) { + for (i =3D __reservedmem_of_table; ret =3D=3D -ENODEV && + i < &__rmem_of_table_sentinel; i++) { reservedmem_of_init_fn initfn =3D i->data; const char *compat =3D i->compatible; =20 @@ -574,7 +575,7 @@ static void __init fdt_init_reserved_mem_node(struct re= served_mem *rmem, nomap =3D of_get_flat_dt_prop(node, "no-map", NULL) !=3D NULL; =20 err =3D __reserved_mem_init_node(rmem, node); - if (err !=3D 0 && err !=3D -ENOENT) { + if (err !=3D 0 && err !=3D -ENODEV) { pr_info("node %s compatible matching fail\n", rmem->name); if (nomap) memblock_clear_nomap(rmem->base, rmem->size); diff --git a/kernel/dma/coherent.c b/kernel/dma/coherent.c index 34621acbd3c5..64f9ba618e19 100644 --- a/kernel/dma/coherent.c +++ b/kernel/dma/coherent.c @@ -370,7 +370,7 @@ static const struct reserved_mem_ops rmem_dma_ops =3D { static int __init rmem_dma_setup(unsigned long node, struct reserved_mem *= rmem) { if (of_get_flat_dt_prop(node, "reusable", NULL)) - return -EINVAL; + return -ENODEV; =20 #ifdef CONFIG_ARM if (!of_get_flat_dt_prop(node, "no-map", NULL)) { diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c index 81a2fa4971ee..e6fc6906b5c0 100644 --- a/kernel/dma/contiguous.c +++ b/kernel/dma/contiguous.c @@ -483,7 +483,7 @@ static int __init rmem_cma_setup(unsigned long node, st= ruct reserved_mem *rmem) =20 if (!of_get_flat_dt_prop(node, "reusable", NULL) || of_get_flat_dt_prop(node, "no-map", NULL)) - return -EINVAL; + return -ENODEV; =20 if (!IS_ALIGNED(rmem->base | rmem->size, CMA_MIN_ALIGNMENT_BYTES)) { pr_err("Reserved memory: incorrect alignment of CMA region\n"); --=20 2.34.1 From nobody Fri Apr 3 20:53:41 2026 Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) (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 B968D38A719 for ; Mon, 23 Mar 2026 10:09:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.118.77.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774260554; cv=none; b=No769kxeJ9FXlmmoROkG6/khoPDc/0ax5aEKky99hGt3rWlmfYmjHG8HfakO2vzTXvVnBGpVplUP4wU8jDq7EIMT/pXV/bELve2rmuqj0WrfKvqRXhUOo7Tlbb10y2yK8YzevStEuwYNrVfJySwzZdkudt1SKnC3bBZXv5CRnO4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774260554; c=relaxed/simple; bh=ei6MF0hUYGibQ2dVwjDxg8lKDxfQaGY8DF3gxUpHxwc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:MIME-Version: Content-Type:References; b=dLlYGqMvDvUCRTGONCYRUQpEWQgpw5lG5NRpKlkUU8C41trxSqFGM+68bBvPEu5Nvkm5SCjrSuK/kQoMoNr32N5b8WNF4q5SCT0rzXSp+EezHhjgnAXq4CYJkRDXbWHiFKRX43glXoBxbFiZz5laVqTK2L+/JdnVRqBDtVnvi7g= 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=aRyk+qdg; arc=none smtp.client-ip=210.118.77.12 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="aRyk+qdg" Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20260323100910euoutp02d1328018cbe640efd3fc79f3ff21c3ad~fcJH4hW1O2330323303euoutp02Y for ; Mon, 23 Mar 2026 10:09:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20260323100910euoutp02d1328018cbe640efd3fc79f3ff21c3ad~fcJH4hW1O2330323303euoutp02Y DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1774260550; bh=vAQ/TZu2vjjYASs/E4HF4m+c+RDaNT7+pt0zKRFLNe4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aRyk+qdg47p6NVlVYeV/71DAj5jnwkVjcIFfIlSLEIJTZ3X6PjVRtBnj1U5ZgbDME ySGJpNMWkS8t5PZX7sAwIg86i2vkN/RWnUnzZm3ZTF8prs4ZMir5V129nVP7lAPWUB R1iC4+/4r4eUBDnv3CfSpEdX2MlXjIcs5O2BpmC0= Received: from eusmtip2.samsung.com (unknown [203.254.199.222]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20260323100910eucas1p2926c5ad3c6dbb3b4cbad1c53a55a6f63~fcJHkTeFe1105911059eucas1p2G; Mon, 23 Mar 2026 10:09:10 +0000 (GMT) Received: from AMDC4653.digital.local (unknown [106.120.51.32]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20260323100909eusmtip2514f11e62e99322cb957386f3c5f41ec~fcJHBjup60975809758eusmtip2l; Mon, 23 Mar 2026 10:09:09 +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 3/7] of: reserved_mem: switch to ops based OF_DECLARE() Date: Mon, 23 Mar 2026 11:08:57 +0100 Message-Id: <20260323100901.4079171-4-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: 20260323100910eucas1p2926c5ad3c6dbb3b4cbad1c53a55a6f63 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20260323100910eucas1p2926c5ad3c6dbb3b4cbad1c53a55a6f63 X-EPHeader: CA X-CMS-RootMailID: 20260323100910eucas1p2926c5ad3c6dbb3b4cbad1c53a55a6f63 References: <20260323100901.4079171-1-m.szyprowski@samsung.com> Move init function from OF_DECLARE() argument to the given reserved memory region ops structure and then pass that structure to the OF_DECLARE() initializer. This makes it possible in the future to add more functions called by the generic code before given memory region is initialized and rmem object created. Signed-off-by: Marek Szyprowski --- drivers/memory/tegra/tegra210-emc-table.c | 16 ++++++++-------- drivers/of/of_reserved_mem.c | 17 +++++++++++++---- include/linux/of_reserved_mem.h | 15 ++++++++------- kernel/dma/coherent.c | 13 +++++++------ kernel/dma/contiguous.c | 15 ++++++++------- kernel/dma/swiotlb.c | 14 +++++++------- 6 files changed, 51 insertions(+), 39 deletions(-) diff --git a/drivers/memory/tegra/tegra210-emc-table.c b/drivers/memory/teg= ra/tegra210-emc-table.c index ac1d1e13482a..4b3c478b2743 100644 --- a/drivers/memory/tegra/tegra210-emc-table.c +++ b/drivers/memory/tegra/tegra210-emc-table.c @@ -70,20 +70,20 @@ static void tegra210_emc_table_device_release(struct re= served_mem *rmem, memunmap(timings); } =20 -static const struct reserved_mem_ops tegra210_emc_table_ops =3D { - .device_init =3D tegra210_emc_table_device_init, - .device_release =3D tegra210_emc_table_device_release, -}; - 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); =20 - rmem->ops =3D &tegra210_emc_table_ops; - return 0; } + +static const struct reserved_mem_ops tegra210_emc_table_ops =3D { + .node_init =3D tegra210_emc_table_init, + .device_init =3D tegra210_emc_table_device_init, + .device_release =3D tegra210_emc_table_device_release, +}; + RESERVEDMEM_OF_DECLARE(tegra210_emc_table, "nvidia,tegra210-emc-table", - tegra210_emc_table_init); + &tegra210_emc_table_ops); diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 9aff460a0420..d67864db3019 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -480,8 +480,16 @@ static int __init __reserved_mem_alloc_size(unsigned l= ong node, const char *unam static const struct of_device_id __rmem_of_table_sentinel __used __section("__reservedmem_of_table_end"); =20 -/* - * __reserved_mem_init_node() - call region specific reserved memory init = code +/** + * __reserved_mem_init_node() - initialize a reserved memory region + * @rmem: reserved_mem structure to initialize + * @node: FDT node describing the reserved memory region + * + * This function iterates through the reserved memory drivers and calls the + * node_init callback for the compatible entry matching the node. On succe= ss, + * the operations pointer is stored in the reserved_mem structure. + * + * Return: 0 on success, -ENODEV if no compatible match found */ static int __init __reserved_mem_init_node(struct reserved_mem *rmem, unsigned long node) @@ -492,14 +500,15 @@ static int __init __reserved_mem_init_node(struct res= erved_mem *rmem, =20 for (i =3D __reservedmem_of_table; ret =3D=3D -ENODEV && i < &__rmem_of_table_sentinel; i++) { - reservedmem_of_init_fn initfn =3D i->data; + const struct reserved_mem_ops *ops =3D i->data; const char *compat =3D i->compatible; =20 if (!of_flat_dt_is_compatible(node, compat)) continue; =20 - ret =3D initfn(node, rmem); + ret =3D ops->node_init(node, rmem); if (ret =3D=3D 0) { + rmem->ops =3D ops; pr_info("initialized node %s, compatible id %s\n", rmem->name, compat); break; diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_me= m.h index 5159938bfe03..320ac8929a28 100644 --- a/include/linux/of_reserved_mem.h +++ b/include/linux/of_reserved_mem.h @@ -18,19 +18,20 @@ struct reserved_mem { }; =20 struct reserved_mem_ops { + int (*node_init)(unsigned long fdt_node, struct reserved_mem *rmem); int (*device_init)(struct reserved_mem *rmem, struct device *dev); void (*device_release)(struct reserved_mem *rmem, struct device *dev); }; =20 -typedef int (*reservedmem_of_init_fn)(unsigned long node, - struct reserved_mem *rmem); - #ifdef CONFIG_OF_RESERVED_MEM =20 -#define RESERVEDMEM_OF_DECLARE(name, compat, init) \ - _OF_DECLARE(reservedmem, name, compat, init, reservedmem_of_init_fn) +#define RESERVEDMEM_OF_DECLARE(name, compat, ops) \ + static const struct of_device_id __of_table_##name \ + __used __section("__reservedmem_of_table") \ + __aligned(__alignof__(struct of_device_id)) \ + =3D { .compatible =3D compat, .data =3D ops } =20 int of_reserved_mem_device_init_by_idx(struct device *dev, struct device_node *np, int idx); @@ -48,8 +49,8 @@ int of_reserved_mem_region_count(const struct device_node= *np); =20 #else =20 -#define RESERVEDMEM_OF_DECLARE(name, compat, init) \ - _OF_DECLARE_STUB(reservedmem, name, compat, init, reservedmem_of_init_fn) +#define RESERVEDMEM_OF_DECLARE(name, compat, ops) \ + _OF_DECLARE_STUB(reservedmem, name, compat, ops, void *) =20 static inline int of_reserved_mem_device_init_by_idx(struct device *dev, struct device_node *np, int idx) diff --git a/kernel/dma/coherent.c b/kernel/dma/coherent.c index 64f9ba618e19..bcdc0f76d2e8 100644 --- a/kernel/dma/coherent.c +++ b/kernel/dma/coherent.c @@ -362,10 +362,6 @@ static void rmem_dma_device_release(struct reserved_me= m *rmem, dev->dma_mem =3D NULL; } =20 -static const struct reserved_mem_ops rmem_dma_ops =3D { - .device_init =3D rmem_dma_device_init, - .device_release =3D rmem_dma_device_release, -}; =20 static int __init rmem_dma_setup(unsigned long node, struct reserved_mem *= rmem) { @@ -388,7 +384,6 @@ static int __init rmem_dma_setup(unsigned long node, st= ruct reserved_mem *rmem) } #endif =20 - rmem->ops =3D &rmem_dma_ops; pr_info("Reserved memory: created DMA memory pool at %pa, size %ld MiB\n", &rmem->base, (unsigned long)rmem->size / SZ_1M); return 0; @@ -405,5 +400,11 @@ static int __init dma_init_reserved_memory(void) core_initcall(dma_init_reserved_memory); #endif /* CONFIG_DMA_GLOBAL_POOL */ =20 -RESERVEDMEM_OF_DECLARE(dma, "shared-dma-pool", rmem_dma_setup); +static const struct reserved_mem_ops rmem_dma_ops =3D { + .node_init =3D rmem_dma_setup, + .device_init =3D rmem_dma_device_init, + .device_release =3D rmem_dma_device_release, +}; + +RESERVEDMEM_OF_DECLARE(dma, "shared-dma-pool", &rmem_dma_ops); #endif diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c index e6fc6906b5c0..efeebda92537 100644 --- a/kernel/dma/contiguous.c +++ b/kernel/dma/contiguous.c @@ -470,11 +470,6 @@ static void rmem_cma_device_release(struct reserved_me= m *rmem, dev->cma_area =3D NULL; } =20 -static const struct reserved_mem_ops rmem_cma_ops =3D { - .device_init =3D rmem_cma_device_init, - .device_release =3D rmem_cma_device_release, -}; - static int __init rmem_cma_setup(unsigned long node, struct reserved_mem *= rmem) { bool default_cma =3D of_get_flat_dt_prop(node, "linux,cma-default", NULL); @@ -499,7 +494,6 @@ static int __init rmem_cma_setup(unsigned long node, st= ruct reserved_mem *rmem) if (default_cma) dma_contiguous_default_area =3D cma; =20 - rmem->ops =3D &rmem_cma_ops; rmem->priv =3D cma; =20 pr_info("Reserved memory: created CMA memory pool at %pa, size %ld MiB\n", @@ -511,5 +505,12 @@ static int __init rmem_cma_setup(unsigned long node, s= truct reserved_mem *rmem) =20 return 0; } -RESERVEDMEM_OF_DECLARE(cma, "shared-dma-pool", rmem_cma_setup); + +static const struct reserved_mem_ops rmem_cma_ops =3D { + .node_init =3D rmem_cma_setup, + .device_init =3D rmem_cma_device_init, + .device_release =3D rmem_cma_device_release, +}; + +RESERVEDMEM_OF_DECLARE(cma, "shared-dma-pool", &rmem_cma_ops); #endif diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index f3a12e15a951..44b566d20e04 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -1855,11 +1855,6 @@ static void rmem_swiotlb_device_release(struct reser= ved_mem *rmem, dev->dma_io_tlb_mem =3D &io_tlb_default_mem; } =20 -static const struct reserved_mem_ops rmem_swiotlb_ops =3D { - .device_init =3D rmem_swiotlb_device_init, - .device_release =3D rmem_swiotlb_device_release, -}; - static int __init rmem_swiotlb_setup(unsigned long node, struct reserved_mem *rmem) { @@ -1869,11 +1864,16 @@ static int __init rmem_swiotlb_setup(unsigned long = node, of_get_flat_dt_prop(node, "no-map", NULL)) return -EINVAL; =20 - rmem->ops =3D &rmem_swiotlb_ops; pr_info("Reserved memory: created restricted DMA pool at %pa, size %ld Mi= B\n", &rmem->base, (unsigned long)rmem->size / SZ_1M); return 0; } =20 -RESERVEDMEM_OF_DECLARE(dma, "restricted-dma-pool", rmem_swiotlb_setup); +static const struct reserved_mem_ops rmem_swiotlb_ops =3D { + .node_init =3D rmem_swiotlb_setup, + .device_init =3D rmem_swiotlb_device_init, + .device_release =3D rmem_swiotlb_device_release, +}; + +RESERVEDMEM_OF_DECLARE(dma, "restricted-dma-pool", &rmem_swiotlb_ops); #endif /* CONFIG_DMA_RESTRICTED_POOL */ --=20 2.34.1 From nobody Fri Apr 3 20:53:41 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 EC8C238B14F for ; Mon, 23 Mar 2026 10:09:17 +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=1774260560; cv=none; b=qXufjPokFADF/e2JM3ohVJE9S0jWEEJipIlmeMONmeS+uDDj2w5KyfTLuGUGPXyyyWb8fFo6hsUiqCogb48elCrIYzB7gjh9jOgvS++KMMs3dru/7CUeyOt/SzQB7dOhFK19l7UwzhV5rIilznfGID0e3H+EAZBUQoL5jAjFFuw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774260560; c=relaxed/simple; bh=kjWSOU5uvl5Oo9bVZ1CjKZvhEeWS2XHHpc42+L9hpms=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:MIME-Version: Content-Type:References; b=OBSLs6c099xK6wEm1NqeFD/rSnBC6VlhI/KiQBstBHe+agdsKeiwIMZOHDQDd6IO/4OxiI2WRvLWofPZZjyPd97hVeGC7uRm/aI3O71h05KcBnWn/omRCFY1OOtwvzrx/5khJNjbhwWpjVmtwfU/eqsYPxd5ypxP9qfjvdYqrDo= 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=I4/DFDhI; 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="I4/DFDhI" Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20260323100911euoutp01d6ff79baa2aa4491ee8938436c8cb487~fcJIkemHv1424914249euoutp01k for ; Mon, 23 Mar 2026 10:09:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20260323100911euoutp01d6ff79baa2aa4491ee8938436c8cb487~fcJIkemHv1424914249euoutp01k DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1774260551; bh=oOH6y278hBlhXpW5TgFEFamleQgzNhyjv0GT6zDAD3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I4/DFDhIKlsKuldMs5IIuMJfXiA+dzSWZHnVm9QQ1pQeCxxV1w8hy+YkQ0TQW3KqM P97vtNzCAiYHEdsV4yq8LOBd1JbdZHsoJNogvTM910KocUv9glQtRKGYv1XcvElfNn XHtThNKdsFjHxQ6ZP6COdpRzDqiIGUHlxS/SFjeY= Received: from eusmtip2.samsung.com (unknown [203.254.199.222]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20260323100910eucas1p1efe6ee90c38f4261f6eae2a81a25717a~fcJIN3oVG0576205762eucas1p1I; Mon, 23 Mar 2026 10:09:10 +0000 (GMT) Received: from AMDC4653.digital.local (unknown [106.120.51.32]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20260323100910eusmtip2e62a495bc8823ea856879b6e0bc097aa~fcJHqGIed0975509755eusmtip2m; Mon, 23 Mar 2026 10:09:10 +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 4/7] of: reserved_mem: replace CMA quirks by generic methods Date: Mon, 23 Mar 2026 11:08:58 +0100 Message-Id: <20260323100901.4079171-5-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: 20260323100910eucas1p1efe6ee90c38f4261f6eae2a81a25717a X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20260323100910eucas1p1efe6ee90c38f4261f6eae2a81a25717a X-EPHeader: CA X-CMS-RootMailID: 20260323100910eucas1p1efe6ee90c38f4261f6eae2a81a25717a References: <20260323100901.4079171-1-m.szyprowski@samsung.com> Add optional reserved memory callbacks to perform region verification and early fixup, then move all CMA related code in of_reserved_mem.c to them. Signed-off-by: Marek Szyprowski --- drivers/of/of_reserved_mem.c | 118 ++++++++++++++++++++++---------- include/linux/cma.h | 10 --- include/linux/dma-map-ops.h | 3 - include/linux/of_reserved_mem.h | 3 + kernel/dma/contiguous.c | 70 ++++++++++++++----- 5 files changed, 137 insertions(+), 67 deletions(-) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index d67864db3019..61ef148add68 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -24,8 +24,6 @@ #include #include #include -#include -#include =20 #include "of_private.h" =20 @@ -106,6 +104,11 @@ static void __init alloc_reserved_mem_array(void) =20 static void __init fdt_init_reserved_mem_node(struct reserved_mem *rmem, unsigned long node); +static int fdt_validate_reserved_mem_node(unsigned long node, + phys_addr_t *align); +static int fdt_fixup_reserved_mem_node(unsigned long node, + phys_addr_t base, phys_addr_t size); + /* * fdt_reserved_mem_save_node() - save fdt node for second pass initializa= tion */ @@ -154,21 +157,19 @@ static int __init __reserved_mem_reserve_reg(unsigned= long node, const char *uname) { phys_addr_t base, size; - int i, len; + int i, len, err; const __be32 *prop; - bool nomap, default_cma; + bool nomap; =20 prop =3D of_flat_dt_get_addr_size_prop(node, "reg", &len); if (!prop) return -ENOENT; =20 nomap =3D of_get_flat_dt_prop(node, "no-map", NULL) !=3D NULL; - default_cma =3D of_get_flat_dt_prop(node, "linux,cma-default", NULL); =20 - if (default_cma && cma_skip_dt_default_reserved_mem()) { - pr_err("Skipping dt linux,cma-default for \"cma=3D\" kernel param.\n"); - return -EINVAL; - } + err =3D fdt_validate_reserved_mem_node(node, NULL); + if (err && err !=3D -ENODEV) + return err; =20 for (i =3D 0; i < len; i++) { u64 b, s; @@ -179,10 +180,7 @@ static int __init __reserved_mem_reserve_reg(unsigned = long node, size =3D s; =20 if (size && early_init_dt_reserve_memory(base, size, nomap) =3D=3D 0) { - /* Architecture specific contiguous memory fixup. */ - if (of_flat_dt_is_compatible(node, "shared-dma-pool") && - of_get_flat_dt_prop(node, "reusable", NULL)) - dma_contiguous_early_fixup(base, size); + fdt_fixup_reserved_mem_node(node, base, size); pr_debug("Reserved memory: reserved region for node '%s': base %pa, siz= e %lu MiB\n", uname, &base, (unsigned long)(size / SZ_1M)); } else { @@ -253,17 +251,19 @@ void __init fdt_scan_reserved_mem_reg_nodes(void) =20 fdt_for_each_subnode(child, fdt, node) { const char *uname; - bool default_cma =3D of_get_flat_dt_prop(child, "linux,cma-default", NUL= L); u64 b, s; + int ret; =20 if (!of_fdt_device_is_available(fdt, child)) continue; - if (default_cma && cma_skip_dt_default_reserved_mem()) - continue; =20 if (!of_flat_dt_get_addr_size(child, "reg", &b, &s)) continue; =20 + ret =3D fdt_validate_reserved_mem_node(child, NULL); + if (ret && ret !=3D -ENODEV) + continue; + base =3D b; size =3D s; =20 @@ -397,7 +397,7 @@ static int __init __reserved_mem_alloc_size(unsigned lo= ng node, const char *unam phys_addr_t base =3D 0, align =3D 0, size; int i, len; const __be32 *prop; - bool nomap, default_cma; + bool nomap; int ret; =20 prop =3D of_get_flat_dt_prop(node, "size", &len); @@ -421,19 +421,10 @@ static int __init __reserved_mem_alloc_size(unsigned = long node, const char *unam } =20 nomap =3D of_get_flat_dt_prop(node, "no-map", NULL) !=3D NULL; - default_cma =3D of_get_flat_dt_prop(node, "linux,cma-default", NULL); =20 - if (default_cma && cma_skip_dt_default_reserved_mem()) { - pr_err("Skipping dt linux,cma-default for \"cma=3D\" kernel param.\n"); - return -EINVAL; - } - - /* Need adjust the alignment to satisfy the CMA requirement */ - if (IS_ENABLED(CONFIG_CMA) - && of_flat_dt_is_compatible(node, "shared-dma-pool") - && of_get_flat_dt_prop(node, "reusable", NULL) - && !nomap) - align =3D max_t(phys_addr_t, align, CMA_MIN_ALIGNMENT_BYTES); + ret =3D fdt_validate_reserved_mem_node(node, &align); + if (ret && ret !=3D -ENODEV) + return ret; =20 prop =3D of_flat_dt_get_addr_size_prop(node, "alloc-ranges", &len); if (prop) { @@ -468,18 +459,76 @@ static int __init __reserved_mem_alloc_size(unsigned = long node, const char *unam uname, (unsigned long)(size / SZ_1M)); return -ENOMEM; } - /* Architecture specific contiguous memory fixup. */ - if (of_flat_dt_is_compatible(node, "shared-dma-pool") && - of_get_flat_dt_prop(node, "reusable", NULL)) - dma_contiguous_early_fixup(base, size); + + fdt_fixup_reserved_mem_node(node, base, size); + /* Save region in the reserved_mem array */ fdt_reserved_mem_save_node(node, uname, base, size); return 0; } =20 +extern const struct of_device_id __reservedmem_of_table[]; static const struct of_device_id __rmem_of_table_sentinel __used __section("__reservedmem_of_table_end"); =20 +/** + * fdt_fixup_reserved_mem_node() - call fixup function for a reserved memo= ry node + * @node: FDT node to fixup + * @base: base address of the reserved memory region + * @size: size of the reserved memory region + * + * This function iterates through the reserved memory drivers and calls + * the node_fixup callback for the compatible entry matching the node. + * + * Return: 0 on success, -ENODEV if no compatible match found + */ +static int __init fdt_fixup_reserved_mem_node(unsigned long node, + phys_addr_t base, phys_addr_t size) +{ + const struct of_device_id *i; + int ret =3D -ENODEV; + + for (i =3D __reservedmem_of_table; ret =3D=3D -ENODEV && + i < &__rmem_of_table_sentinel; i++) { + const struct reserved_mem_ops *ops =3D i->data; + + if (!of_flat_dt_is_compatible(node, i->compatible)) + continue; + + if (ops->node_fixup) + ret =3D ops->node_fixup(node, base, size); + } + return ret; +} + +/** + * fdt_validate_reserved_mem_node() - validate a reserved memory node + * @node: FDT node to validate + * @align: pointer to store the validated alignment (may be modified by ca= llback) + * + * This function iterates through the reserved memory drivers and calls + * the node_validate callback for the compatible entry matching the node. + * + * Return: 0 on success, -ENODEV if no compatible match found + */ +static int __init fdt_validate_reserved_mem_node(unsigned long node, phys_= addr_t *align) +{ + const struct of_device_id *i; + int ret =3D -ENODEV; + + for (i =3D __reservedmem_of_table; ret =3D=3D -ENODEV && + i < &__rmem_of_table_sentinel; i++) { + const struct reserved_mem_ops *ops =3D i->data; + + if (!of_flat_dt_is_compatible(node, i->compatible)) + continue; + + if (ops->node_validate) + ret =3D ops->node_validate(node, align); + } + return ret; +} + /** * __reserved_mem_init_node() - initialize a reserved memory region * @rmem: reserved_mem structure to initialize @@ -494,7 +543,6 @@ static const struct of_device_id __rmem_of_table_sentin= el 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; int ret =3D -ENODEV; =20 @@ -511,7 +559,7 @@ static int __init __reserved_mem_init_node(struct reser= ved_mem *rmem, rmem->ops =3D ops; pr_info("initialized node %s, compatible id %s\n", rmem->name, compat); - break; + return ret; } } return ret; diff --git a/include/linux/cma.h b/include/linux/cma.h index d0793eaaadaa..8555d38a97b1 100644 --- a/include/linux/cma.h +++ b/include/linux/cma.h @@ -61,14 +61,4 @@ extern int cma_for_each_area(int (*it)(struct cma *cma, = void *data), void *data) extern bool cma_intersects(struct cma *cma, unsigned long start, unsigned = long end); =20 extern void cma_reserve_pages_on_error(struct cma *cma); - -#ifdef CONFIG_DMA_CMA -extern bool cma_skip_dt_default_reserved_mem(void); -#else -static inline bool cma_skip_dt_default_reserved_mem(void) -{ - return false; -} -#endif - #endif diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h index 60b63756df82..55ecd2934225 100644 --- a/include/linux/dma-map-ops.h +++ b/include/linux/dma-map-ops.h @@ -147,9 +147,6 @@ static inline void dma_free_contiguous(struct device *d= ev, struct page *page, { __free_pages(page, get_order(size)); } -static inline void dma_contiguous_early_fixup(phys_addr_t base, unsigned l= ong size) -{ -} #endif /* CONFIG_DMA_CMA*/ =20 #ifdef CONFIG_DMA_DECLARE_COHERENT diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_me= m.h index 320ac8929a28..ecca1eaac4ec 100644 --- a/include/linux/of_reserved_mem.h +++ b/include/linux/of_reserved_mem.h @@ -18,6 +18,9 @@ struct reserved_mem { }; =20 struct reserved_mem_ops { + int (*node_validate)(unsigned long fdt_node, phys_addr_t *align); + int (*node_fixup)(unsigned long fdt_node, phys_addr_t base, + phys_addr_t size); int (*node_init)(unsigned long fdt_node, struct reserved_mem *rmem); int (*device_init)(struct reserved_mem *rmem, struct device *dev); diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c index efeebda92537..65d216663e81 100644 --- a/kernel/dma/contiguous.c +++ b/kernel/dma/contiguous.c @@ -91,16 +91,6 @@ static int __init early_cma(char *p) } early_param("cma", early_cma); =20 -/* - * cma_skip_dt_default_reserved_mem - This is called from the - * reserved_mem framework to detect if the default cma region is being - * set by the "cma=3D" kernel parameter. - */ -bool __init cma_skip_dt_default_reserved_mem(void) -{ - return size_cmdline !=3D -1; -} - #ifdef CONFIG_DMA_NUMA_CMA =20 static struct cma *dma_contiguous_numa_area[MAX_NUMNODES]; @@ -470,25 +460,65 @@ static void rmem_cma_device_release(struct reserved_m= em *rmem, dev->cma_area =3D NULL; } =20 +static int __init __rmem_cma_verify_node(unsigned long node) +{ + if (!of_get_flat_dt_prop(node, "reusable", NULL) || + of_get_flat_dt_prop(node, "no-map", NULL)) + return -ENODEV; + + if (size_cmdline !=3D -1 && + of_get_flat_dt_prop(node, "linux,cma-default", NULL)) { + pr_err("Skipping dt linux,cma-default node in favor for \"cma=3D\" kerne= l param.\n"); + return -EBUSY; + } + return 0; +} + +static int __init rmem_cma_validate(unsigned long node, phys_addr_t *align) +{ + int ret =3D __rmem_cma_verify_node(node); + + if (ret) + return ret; + + if (align) + *align =3D max_t(phys_addr_t, *align, CMA_MIN_ALIGNMENT_BYTES); + + return 0; +} + +static int __init rmem_cma_fixup(unsigned long node, phys_addr_t base, + phys_addr_t size) +{ + int ret =3D __rmem_cma_verify_node(node); + + if (ret) + return ret; + + /* Architecture specific contiguous memory fixup. */ + dma_contiguous_early_fixup(base, size); + return 0; +} + static int __init rmem_cma_setup(unsigned long node, struct reserved_mem *= rmem) { bool default_cma =3D of_get_flat_dt_prop(node, "linux,cma-default", NULL); struct cma *cma; - int err; + int ret; =20 - if (!of_get_flat_dt_prop(node, "reusable", NULL) || - of_get_flat_dt_prop(node, "no-map", NULL)) - return -ENODEV; + ret =3D __rmem_cma_verify_node(node); + if (ret) + return ret; =20 if (!IS_ALIGNED(rmem->base | rmem->size, CMA_MIN_ALIGNMENT_BYTES)) { pr_err("Reserved memory: incorrect alignment of CMA region\n"); return -EINVAL; } =20 - err =3D cma_init_reserved_mem(rmem->base, rmem->size, 0, rmem->name, &cma= ); - if (err) { + ret =3D cma_init_reserved_mem(rmem->base, rmem->size, 0, rmem->name, &cma= ); + if (ret) { pr_err("Reserved memory: unable to setup CMA region\n"); - return err; + return ret; } =20 if (default_cma) @@ -499,14 +529,16 @@ static int __init rmem_cma_setup(unsigned long node, = struct reserved_mem *rmem) pr_info("Reserved memory: created CMA memory pool at %pa, size %ld MiB\n", &rmem->base, (unsigned long)rmem->size / SZ_1M); =20 - err =3D dma_heap_cma_register_heap(cma); - if (err) + ret =3D dma_heap_cma_register_heap(cma); + if (ret) pr_warn("Couldn't register CMA heap."); =20 return 0; } =20 static const struct reserved_mem_ops rmem_cma_ops =3D { + .node_validate =3D rmem_cma_validate, + .node_fixup =3D rmem_cma_fixup, .node_init =3D rmem_cma_setup, .device_init =3D rmem_cma_device_init, .device_release =3D rmem_cma_device_release, --=20 2.34.1 From nobody Fri Apr 3 20:53:41 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 D0A2738A719 for ; Mon, 23 Mar 2026 10:09:18 +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=1774260561; cv=none; b=DWHdj89ANB2jj7WVc7qBLCSg+mZmB2I8PylTkBXGjp3WsepVDsQAvaden7aNU9lkQATSYE0/JZJD8odJqSwyCJN61rmJcgdwz4IMN7+/IT40QkzbVFlnpz0Yi+CUooYJ2e0A+a/XtAazdr/aYftAoMWpIWl4AANOrbDXlrp/ZYk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774260561; c=relaxed/simple; bh=UFxD3Oo6DiJipbrK09mt1t60POygPIdXOUvs+xOwOOI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:MIME-Version: Content-Type:References; b=HmQ0CU8SWQEd7pY8nTtj9PekcJLhxHqfMRMAmbXAMrSlKJzh3sW5gM27hFa4oXKTLB41VNSbOy0xDa3LpXcla2f5lxSXxKXfrM1Puipo/4lVmco2Y2ZnpJz61NSN5Q2uBNApT0e2/IEi2nh7MWi4vjgmpyeGyrUj+xLLe/TlrUY= 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=KvJlPcDi; 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="KvJlPcDi" Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20260323100913euoutp01f5468ce502b43136b5300af2f4434deb~fcJLBxpsF1424914249euoutp01n for ; Mon, 23 Mar 2026 10:09:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20260323100913euoutp01f5468ce502b43136b5300af2f4434deb~fcJLBxpsF1424914249euoutp01n DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1774260553; bh=972MCStl0Do5pbAEI1ulif24I8j7EecGgHsf7doFi+Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KvJlPcDiBhJVwKtTD3Qm8FlVlND9yR6iGVq4FvcsX4FAeEEf0tbbgkS9mJ/q3nbel DFd6KXxe8jPfgJ/BGyy8F9IXIIA2xGppJVH50E70+r8KFBJexZSo8YC8Qw3gK6SM2f 9jjaW1MhLIRW/27WCcNgb/edxN8O7UfbH9C8vC0s= Received: from eusmtip2.samsung.com (unknown [203.254.199.222]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20260323100911eucas1p173dd26efc96b0907995fda7d551d1db6~fcJI1zBPu2572725727eucas1p1y; Mon, 23 Mar 2026 10:09:11 +0000 (GMT) Received: from AMDC4653.digital.local (unknown [106.120.51.32]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20260323100910eusmtip2e9e46f4e66801de4b7b4824f5e72b134~fcJITYgu-0975809758eusmtip2n; Mon, 23 Mar 2026 10:09:10 +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 5/7] of: reserved_mem: rearrange code a bit Date: Mon, 23 Mar 2026 11:08:59 +0100 Message-Id: <20260323100901.4079171-6-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: 20260323100911eucas1p173dd26efc96b0907995fda7d551d1db6 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20260323100911eucas1p173dd26efc96b0907995fda7d551d1db6 X-EPHeader: CA X-CMS-RootMailID: 20260323100911eucas1p173dd26efc96b0907995fda7d551d1db6 References: <20260323100901.4079171-1-m.szyprowski@samsung.com> Move __rmem_check_for_overlap() and __rmem_cmp() functions before fdt_scan_reserved_mem_reg_nodes() to avoid forward declaration and keep related code close together. Signed-off-by: Marek Szyprowski --- drivers/of/of_reserved_mem.c | 99 ++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 50 deletions(-) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 61ef148add68..dceaf19f31fb 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -214,7 +214,55 @@ static int __init __reserved_mem_check_root(unsigned l= ong node) return 0; } =20 -static void __init __rmem_check_for_overlap(void); +static int __init __rmem_cmp(const void *a, const void *b) +{ + const struct reserved_mem *ra =3D a, *rb =3D b; + + if (ra->base < rb->base) + return -1; + + if (ra->base > rb->base) + return 1; + + /* + * Put the dynamic allocations (address =3D=3D 0, size =3D=3D 0) before s= tatic + * allocations at address 0x0 so that overlap detection works + * correctly. + */ + if (ra->size < rb->size) + return -1; + if (ra->size > rb->size) + return 1; + + return 0; +} + +static void __init __rmem_check_for_overlap(void) +{ + int i; + + if (reserved_mem_count < 2) + return; + + sort(reserved_mem, reserved_mem_count, sizeof(reserved_mem[0]), + __rmem_cmp, NULL); + for (i =3D 0; i < reserved_mem_count - 1; i++) { + struct reserved_mem *this, *next; + + this =3D &reserved_mem[i]; + next =3D &reserved_mem[i + 1]; + + if (this->base + this->size > next->base) { + phys_addr_t this_end, next_end; + + this_end =3D this->base + this->size; + next_end =3D next->base + next->size; + pr_err("OVERLAP DETECTED!\n%s (%pa--%pa) overlaps with %s (%pa--%pa)\n", + this->name, &this->base, &this_end, + next->name, &next->base, &next_end); + } + } +} =20 /** * fdt_scan_reserved_mem_reg_nodes() - Store info for the "reg" defined @@ -565,55 +613,6 @@ static int __init __reserved_mem_init_node(struct rese= rved_mem *rmem, return ret; } =20 -static int __init __rmem_cmp(const void *a, const void *b) -{ - const struct reserved_mem *ra =3D a, *rb =3D b; - - if (ra->base < rb->base) - return -1; - - if (ra->base > rb->base) - return 1; - - /* - * Put the dynamic allocations (address =3D=3D 0, size =3D=3D 0) before s= tatic - * allocations at address 0x0 so that overlap detection works - * correctly. - */ - if (ra->size < rb->size) - return -1; - if (ra->size > rb->size) - return 1; - - return 0; -} - -static void __init __rmem_check_for_overlap(void) -{ - int i; - - if (reserved_mem_count < 2) - return; - - sort(reserved_mem, reserved_mem_count, sizeof(reserved_mem[0]), - __rmem_cmp, NULL); - for (i =3D 0; i < reserved_mem_count - 1; i++) { - struct reserved_mem *this, *next; - - this =3D &reserved_mem[i]; - next =3D &reserved_mem[i + 1]; - - if (this->base + this->size > next->base) { - phys_addr_t this_end, next_end; - - this_end =3D this->base + this->size; - next_end =3D next->base + next->size; - pr_err("OVERLAP DETECTED!\n%s (%pa--%pa) overlaps with %s (%pa--%pa)\n", - this->name, &this->base, &this_end, - next->name, &next->base, &next_end); - } - } -} =20 /** * fdt_init_reserved_mem_node() - Initialize a reserved memory region --=20 2.34.1 From nobody Fri Apr 3 20:53:41 2026 Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) (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 6B19238AC95 for ; Mon, 23 Mar 2026 10:09:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.118.77.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774260557; cv=none; b=RIsScmy6VVhoJx8FWg1E98lfW8Y7qqSsISIdeNiZssMeUaUILGcIRFOzkfCmCXZ39n/BvK53AdPfw+IEOROH4ZKFKuVe7a2sFgL1S0ISe+K7BSqrd7qW0oNL/spiT+9ZyeBw/PC3JitqNuGnfmWdgsBNCky6/PfxsbFiFRy7Hyc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774260557; c=relaxed/simple; bh=lIpGm9w9sQdb12Ur9F4Sb3EiTSGgkied7VvY4NFy6No=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:MIME-Version: Content-Type:References; b=aEDpK2ewAuzGnSYfhNrg/rrOizyXePFKEL3EF6Y5KasSyVCLCyFSdAEKxLtpLnoVJtY+MhRffzScNh38cfkDYs3Pv6LNPjobsW12zfz5NOAjJspxjmKG1KoRjBrs4H6sICAAOqVcfkXk2wilX/lMsVzqbywLVqv93cIZcTjAPtA= 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=FUCRWglD; arc=none smtp.client-ip=210.118.77.12 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="FUCRWglD" Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20260323100914euoutp0222e4f383bc573a70a1036e357a74e4b4~fcJLM0_iO2329223292euoutp02e for ; Mon, 23 Mar 2026 10:09:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20260323100914euoutp0222e4f383bc573a70a1036e357a74e4b4~fcJLM0_iO2329223292euoutp02e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1774260554; bh=XnpG/ghmAqbS6QKwZNF5IxO0PeBEQO07aIL3Tp2D5sY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FUCRWglDvcz6v+kCemIlvGSD7pNISs5yAxcT2r7ya/G7VI7UyRLCBkT9zC3UULCMV Eem7IL2mnlBxEZ1z7lF7vcs2tzmJS2nw5Xp9z3VjP2Dd6YVmFtQFTPo0NBiSqS5TpR zQbp6vhU7+W0tyRiJ6+JtoAl7UXpqOmsXNsxauzc= Received: from eusmtip2.samsung.com (unknown [203.254.199.222]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20260323100912eucas1p1f13cc5bfc49a119c7f1e0d6bd754d42c~fcJJeUWMb0541705417eucas1p1O; Mon, 23 Mar 2026 10:09:12 +0000 (GMT) Received: from AMDC4653.digital.local (unknown [106.120.51.32]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20260323100911eusmtip2884e9a5ebc23eed9d8cea4e2a5e97500~fcJI7eMUO0421504215eusmtip2T; Mon, 23 Mar 2026 10:09:11 +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 6/7] of: reserved_mem: clarify fdt_scan_reserved_mem*() functions Date: Mon, 23 Mar 2026 11:09:00 +0100 Message-Id: <20260323100901.4079171-7-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: 20260323100912eucas1p1f13cc5bfc49a119c7f1e0d6bd754d42c X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20260323100912eucas1p1f13cc5bfc49a119c7f1e0d6bd754d42c X-EPHeader: CA X-CMS-RootMailID: 20260323100912eucas1p1f13cc5bfc49a119c7f1e0d6bd754d42c References: <20260323100901.4079171-1-m.szyprowski@samsung.com> Rename fdt_scan_reserved_mem_reg_nodes() to fdt_scan_reserved_mem_late() to clearly show how it differs from fdt_scan_reserved_mem() and update description of both functions. Signed-off-by: Marek Szyprowski --- drivers/of/fdt.c | 2 +- drivers/of/of_private.h | 2 +- drivers/of/of_reserved_mem.c | 24 +++++++++++++++--------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 331646d667b9..43a0944ca462 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1274,7 +1274,7 @@ void __init unflatten_device_tree(void) void *fdt =3D initial_boot_params; =20 /* Save the statically-placed regions in the reserved_mem array */ - fdt_scan_reserved_mem_reg_nodes(); + fdt_scan_reserved_mem_late(); =20 /* Populate an empty root node when bootloader doesn't provide one */ if (!fdt) { diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h index df0bb00349e0..0ae16da066e2 100644 --- a/drivers/of/of_private.h +++ b/drivers/of/of_private.h @@ -186,7 +186,7 @@ static inline struct device_node *__of_get_dma_parent(c= onst struct device_node * #endif =20 int fdt_scan_reserved_mem(void); -void __init fdt_scan_reserved_mem_reg_nodes(void); +void __init fdt_scan_reserved_mem_late(void); =20 bool of_fdt_device_is_available(const void *blob, unsigned long node); =20 diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index dceaf19f31fb..801451d034fa 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -265,16 +265,15 @@ static void __init __rmem_check_for_overlap(void) } =20 /** - * fdt_scan_reserved_mem_reg_nodes() - Store info for the "reg" defined - * reserved memory regions. + * fdt_scan_reserved_mem_late() - Scan FDT and initialize remaining reserv= ed + * memory regions. * - * This function is used to scan through the DT and store the - * information for the reserved memory regions that are defined using - * the "reg" property. The region node number, name, base address, and - * size are all stored in the reserved_mem array by calling the - * fdt_reserved_mem_save_node() function. + * This function is used to scan again through the DT and initialize the + * "static" reserved memory regions, that are defined using the "reg" + * property. Each such region is then initialized with its specific init + * function and stored in the global reserved_mem array. */ -void __init fdt_scan_reserved_mem_reg_nodes(void) +void __init fdt_scan_reserved_mem_late(void) { const void *fdt =3D initial_boot_params; phys_addr_t base, size; @@ -328,7 +327,14 @@ void __init fdt_scan_reserved_mem_reg_nodes(void) static int __init __reserved_mem_alloc_size(unsigned long node, const char= *uname); =20 /* - * fdt_scan_reserved_mem() - scan a single FDT node for reserved memory + * fdt_scan_reserved_mem() - reserve and allocate memory occupied by + * reserved memory regions. + * + * This function is used to scan through the FDT and mark memory occupied + * by all static (defined by the "reg" property) reserved memory regions. + * Then memory for all dynamic regions (defined by size & alignment) is + * allocated, a region specific init function is called and region informa= tion + * is stored in the reserved_mem array. */ int __init fdt_scan_reserved_mem(void) { --=20 2.34.1 From nobody Fri Apr 3 20:53:41 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 A282A38BF83 for ; Mon, 23 Mar 2026 10:09:19 +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=1774260561; cv=none; b=BBx4EFyk2zJ9o7jy9n6J7WmV3M4mhtSzdw/3boKg2ep4PfRAcX75sE7STDwpNKZgxFgmm4dubYBcdAf3TQ763tXzjTnKia6d+TOjoNmdo+JTAmfwPBh5bPA3mdjflpXsEEhFAxoS/lOV8ggavAuhlImA0o5qAU2e9fGA34+rm5k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774260561; c=relaxed/simple; bh=iByLlERWMi84pzf4bnyBGpGXQxAdR8qksLE2GMzDhr0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:MIME-Version: Content-Type:References; b=Im0+JLnPtbTvFS4uO3nYwZEk9Qct/ALwljKgh+v9iNCE47/taDDZXJ70ttsbOq3sMIgkUmBMr3QzF0h7iJxKJZwO9qWEnlR05TXAIZNyZU7SGHcTn+CBS5AMZzvGoyqeZY6DUs3ks/MaBUaNVx/x5RlhJ5Hg9+DhRcn/nbRIIOA= 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=CKfa4HmP; 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="CKfa4HmP" Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20260323100914euoutp010852303bc92989a33e5381db90cb5ed9~fcJLVoqJ91314013140euoutp01g for ; Mon, 23 Mar 2026 10:09:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20260323100914euoutp010852303bc92989a33e5381db90cb5ed9~fcJLVoqJ91314013140euoutp01g DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1774260554; bh=Zbv558l0JXbA/evotEn7j2Yp5sFsNk7kEVzz156NoGI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CKfa4HmPLdhrTKj9GAspBvrBdZaibIjlc7dUnoD561qJf5/RTtdU/sTy1rczsDI+R Leqf8l2WKtGdnQCymPl7H89+cf2fGRfVc0Gmp3a0BMoo+7dWtguHdJUZNBPTcI/aLJ tTYxSkfX/ofWAYEZFiLJlVPLmphBJ7jgJdRScHiY= Received: from eusmtip2.samsung.com (unknown [203.254.199.222]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20260323100912eucas1p1aadb718d2c0eea3404aa5be379ae21c1~fcJKGQmYG2578125781eucas1p1t; Mon, 23 Mar 2026 10:09:12 +0000 (GMT) Received: from AMDC4653.digital.local (unknown [106.120.51.32]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20260323100912eusmtip20108a44eb532b22a6560aefbc89b4f9a~fcJJjxuTO0899908999eusmtip2j; Mon, 23 Mar 2026 10:09:12 +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 7/7] of: reserved_mem: rework fdt_init_reserved_mem_node() Date: Mon, 23 Mar 2026 11:09:01 +0100 Message-Id: <20260323100901.4079171-8-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: 20260323100912eucas1p1aadb718d2c0eea3404aa5be379ae21c1 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20260323100912eucas1p1aadb718d2c0eea3404aa5be379ae21c1 X-EPHeader: CA X-CMS-RootMailID: 20260323100912eucas1p1aadb718d2c0eea3404aa5be379ae21c1 References: <20260323100901.4079171-1-m.szyprowski@samsung.com> Move the content of fdt_reserved_mem_save_node() to fdt_init_reserved_mem_node() function. Initialization is no longer performed in two steps as it was initially, so fdt_reserved_mem_save_node() name is a bit misleading and that function now performs full initialization of the reserved memory region. Signed-off-by: Marek Szyprowski --- drivers/of/of_reserved_mem.c | 60 ++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 34 deletions(-) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 801451d034fa..661116034692 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -102,36 +102,13 @@ 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, - unsigned long node); +static void fdt_init_reserved_mem_node(unsigned long node, const char *una= me, + phys_addr_t base, phys_addr_t size); static int fdt_validate_reserved_mem_node(unsigned long node, phys_addr_t *align); static int fdt_fixup_reserved_mem_node(unsigned long node, phys_addr_t base, phys_addr_t size); =20 -/* - * fdt_reserved_mem_save_node() - save fdt node for second pass initializa= tion - */ -static void __init fdt_reserved_mem_save_node(unsigned long node, const ch= ar *uname, - phys_addr_t base, phys_addr_t size) -{ - struct reserved_mem *rmem =3D &reserved_mem[reserved_mem_count]; - - if (reserved_mem_count =3D=3D total_reserved_mem_cnt) { - pr_err("not enough space for all defined regions.\n"); - return; - } - - rmem->name =3D uname; - rmem->base =3D base; - rmem->size =3D size; - - /* Call the region specific initialization function */ - fdt_init_reserved_mem_node(rmem, node); - - reserved_mem_count++; -} - static int __init early_init_dt_reserve_memory(phys_addr_t base, phys_addr_t size, bool nomap) { @@ -316,7 +293,7 @@ void __init fdt_scan_reserved_mem_late(void) =20 if (size) { uname =3D fdt_get_name(fdt, child, NULL); - fdt_reserved_mem_save_node(child, uname, base, size); + fdt_init_reserved_mem_node(child, uname, base, size); } } =20 @@ -515,9 +492,8 @@ static int __init __reserved_mem_alloc_size(unsigned lo= ng node, const char *unam } =20 fdt_fixup_reserved_mem_node(node, base, size); + fdt_init_reserved_mem_node(node, uname, base, size); =20 - /* Save region in the reserved_mem array */ - fdt_reserved_mem_save_node(node, uname, base, size); return 0; } =20 @@ -619,21 +595,34 @@ static int __init __reserved_mem_init_node(struct res= erved_mem *rmem, return ret; } =20 - /** * 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 + * @uname: name of the reserved memory node + * @base: base address of the reserved memory region + * @size: size of the reserved memory region * - * This function is used to call the region specific initialization - * function for a reserved memory region. + * This function calls the region-specific initialization function for a + * reserved memory region and saves all region-specific data to the + * reserved_mem array to allow of_reserved_mem_lookup() to find it. */ -static void __init fdt_init_reserved_mem_node(struct reserved_mem *rmem, - unsigned long node) +static void __init fdt_init_reserved_mem_node(unsigned long node, const ch= ar *uname, + phys_addr_t base, phys_addr_t size) { int err =3D 0; bool nomap; =20 + struct reserved_mem *rmem =3D &reserved_mem[reserved_mem_count]; + + if (reserved_mem_count =3D=3D total_reserved_mem_cnt) { + pr_err("not enough space for all defined regions.\n"); + return; + } + + rmem->name =3D uname; + rmem->base =3D base; + rmem->size =3D size; + nomap =3D of_get_flat_dt_prop(node, "no-map", NULL) !=3D NULL; =20 err =3D __reserved_mem_init_node(rmem, node); @@ -643,6 +632,7 @@ static void __init fdt_init_reserved_mem_node(struct re= served_mem *rmem, memblock_clear_nomap(rmem->base, rmem->size); else memblock_phys_free(rmem->base, rmem->size); + return; } else { phys_addr_t end =3D rmem->base + rmem->size - 1; bool reusable =3D @@ -654,6 +644,8 @@ static void __init fdt_init_reserved_mem_node(struct re= served_mem *rmem, reusable ? "reusable" : "non-reusable", rmem->name ? rmem->name : "unknown"); } + + reserved_mem_count++; } =20 struct rmem_assigned_device { --=20 2.34.1