From nobody Fri Dec 19 21:17:22 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 0713913E889; Tue, 28 May 2024 22:37:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716935846; cv=none; b=sYd+ovFDVX61Izji0ASnC5SQBOuENFBEcH4ap4wRejeKp1e1iWoLDJWOnG73LLsKICmRgy708s5phAOiOqQIJfW49F0BFNWAvekTMev1VYPTwGFgiRIm2B/V3t4x+xDd2ytnBRHds88JTefyHuyfPFX0FoRe26Pv4JDebscCui0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716935846; c=relaxed/simple; bh=3hxjq3n/Rbx1YoohrpPmBxlaS+/WENfm4yf4nBLd5q8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=m31G3xFzYP17L0SzpCW+1F8kbIjFdwWLgKe3jueHviNCbsUjan2m16dSIiX6Kaju2P32o4mK0LftpC1GMm1zJaR8ty042HNxPMFKcb8wb58R/c5T88T4E+U6gGrMnSabStiTKgExHemepUQQ5EQ7PwlMSwgoLAUY5Msu/9XCSQc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=PsBO5CCF; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="PsBO5CCF" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 44SL3iax003640; Tue, 28 May 2024 22:37:08 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= Gz3XZZVJT4oGhs+9zgJTkY973qkuB93msz5Squ9jXMk=; b=PsBO5CCFINbPWaRT zisPU553DNU50CwB49EdYg+yq/R3DHSTb3ckr5qTD/vUjPJMUXOfNu6CJTV68EBo N10F869E016pgQW4Co4Dn9UUHCYsoFoXa8pQoq9YC2jKk98aPi3pKuSkI+P4kkAV 09WeamZ1h+7jYFzomwdx3px1MpuwfPiijLRH4XWAM387iSalEkOB696yKWrXUN+D drxVtDKKQDbvm5vvnWb+pNjE+OOkfsWLoW8W0zjgcLK+TkraKVcXDgmte1JFS8pw nB840YsIuho8aoX5kT2Uen/ZyWxMnpI3MK/2B6V68R8nzPzU0NfYXrUKb0TICmOP n5vLBA== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3yba1k7fty-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 May 2024 22:37:08 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 44SMb7WP012676 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 May 2024 22:37:07 GMT Received: from hu-obabatun-lv.qualcomm.com (10.49.16.6) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Tue, 28 May 2024 15:37:04 -0700 From: Oreoluwa Babatunde To: , , , , , , CC: , , , , Oreoluwa Babatunde Subject: [PATCH v6 3/4] of: reserved_mem: Use unflatten_devicetree APIs to scan reserved memory nodes Date: Tue, 28 May 2024 15:36:49 -0700 Message-ID: <20240528223650.619532-4-quic_obabatun@quicinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240528223650.619532-1-quic_obabatun@quicinc.com> References: <20240528223650.619532-1-quic_obabatun@quicinc.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-ClientProxiedBy: nalasex01a.na.qualcomm.com (10.47.209.196) To nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: 8RoWvymOaRXmz1GwYAHGsOyMqY08yRM5 X-Proofpoint-GUID: 8RoWvymOaRXmz1GwYAHGsOyMqY08yRM5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-28_14,2024-05-28_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 impostorscore=0 suspectscore=0 phishscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 bulkscore=0 spamscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405170001 definitions=main-2405280168 Content-Type: text/plain; charset="utf-8" The unflatten_devicetree APIs have been setup and are available to be used by the time the fdt_init_reserved_mem() function is called. Since the unflatten_devicetree APIs are a more efficient way of scanning through the DT nodes, switch to using these APIs to facilitate the rest of the reserved memory processing. Signed-off-by: Oreoluwa Babatunde --- drivers/of/of_reserved_mem.c | 93 ++++++++++++++++++++------------- include/linux/of_reserved_mem.h | 2 +- kernel/dma/coherent.c | 10 ++-- kernel/dma/contiguous.c | 8 +-- kernel/dma/swiotlb.c | 10 ++-- 5 files changed, 72 insertions(+), 51 deletions(-) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 113d593ea031..05283cd24c3b 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -99,7 +100,7 @@ static void __init alloc_reserved_mem_array(void) /* * 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, +static void __init fdt_reserved_mem_save_node(struct device_node *node, co= nst char *uname, phys_addr_t base, phys_addr_t size) { struct reserved_mem *rmem =3D &reserved_mem[reserved_mem_count]; @@ -109,7 +110,7 @@ static void __init fdt_reserved_mem_save_node(unsigned = long node, const char *un return; } =20 - rmem->fdt_node =3D node; + rmem->dev_node =3D node; rmem->name =3D uname; rmem->base =3D base; rmem->size =3D size; @@ -178,11 +179,11 @@ static int __init __reserved_mem_reserve_reg(unsigned= long node, } =20 /* - * __reserved_mem_check_root() - check if #size-cells, #address-cells prov= ided + * __fdt_reserved_mem_check_root() - check if #size-cells, #address-cells = provided * in /reserved-memory matches the values supported by the current impleme= ntation, * also check if ranges property has been provided */ -static int __init __reserved_mem_check_root(unsigned long node) +static int __init __fdt_reserved_mem_check_root(unsigned long node) { const __be32 *prop; =20 @@ -200,6 +201,35 @@ static int __init __reserved_mem_check_root(unsigned l= ong node) return 0; } =20 +/* + * of_reserved_mem_check_root() - check if #size-cells, #address-cells pro= vided + * in /reserved-memory matches the values supported by the current impleme= ntation, + * also check if ranges property has been provided + */ +static int __init of_reserved_mem_check_root(struct device_node *node) +{ + u32 prop; + int ret; + + ret =3D of_property_read_u32(node, "#size-cells", &prop); + if (ret) + return ret; + + if (prop !=3D dt_root_size_cells) + return -EINVAL; + + ret =3D of_property_read_u32(node, "#address-cells", &prop); + if (ret) + return ret; + + if (prop !=3D dt_root_addr_cells) + return -EINVAL; + + if (!of_property_present(node, "ranges")) + return -EINVAL; + return 0; +} + /** * fdt_scan_reserved_mem_reg_nodes() - Store info for the "reg" defined * reserved memory regions. @@ -212,41 +242,40 @@ static int __init __reserved_mem_check_root(unsigned = long node) */ static void __init fdt_scan_reserved_mem_reg_nodes(void) { - int t_len =3D (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32); - const void *fdt =3D initial_boot_params; + struct device_node *node, *child; phys_addr_t base, size; - const __be32 *prop; - int node, child; - int len; =20 - node =3D fdt_path_offset(fdt, "/reserved-memory"); - if (node < 0) { + node =3D of_find_node_by_path("/reserved-memory"); + if (!node) { pr_info("Reserved memory: No reserved-memory node in the DT\n"); return; } =20 - if (__reserved_mem_check_root(node)) { + if (of_reserved_mem_check_root(node)) { pr_err("Reserved memory: unsupported node format, ignoring\n"); return; } =20 - fdt_for_each_subnode(child, fdt, node) { + for_each_child_of_node(node, child) { + int ret =3D 0; const char *uname; + struct resource res; + struct reserved_mem *rmem; =20 - prop =3D of_get_flat_dt_prop(child, "reg", &len); - if (!prop) - continue; - if (!of_fdt_device_is_available(fdt, child)) + if (!of_device_is_available(child)) continue; =20 - uname =3D fdt_get_name(fdt, child, NULL); - if (len && len % t_len !=3D 0) { - pr_err("Reserved memory: invalid reg property in '%s', skipping node.\n= ", - uname); + ret =3D of_address_to_resource(child, 0, &res); + if (ret) { + rmem =3D of_reserved_mem_lookup(child); + if (rmem) + rmem->dev_node =3D child; continue; } - base =3D dt_mem_next_cell(dt_root_addr_cells, &prop); - size =3D dt_mem_next_cell(dt_root_size_cells, &prop); + uname =3D of_node_full_name(child); + + base =3D res.start; + size =3D res.end - res.start + 1; =20 if (size) fdt_reserved_mem_save_node(child, uname, base, size); @@ -269,7 +298,7 @@ int __init fdt_scan_reserved_mem(void) if (node < 0) return -ENODEV; =20 - if (__reserved_mem_check_root(node) !=3D 0) { + if (__fdt_reserved_mem_check_root(node) !=3D 0) { pr_err("Reserved memory: unsupported node format, ignoring\n"); return -EINVAL; } @@ -447,7 +476,7 @@ static int __init __reserved_mem_alloc_size(unsigned lo= ng node, const char *unam uname, (unsigned long)(size / SZ_1M)); return -ENOMEM; } - fdt_reserved_mem_save_node(node, uname, base, size); + fdt_reserved_mem_save_node(NULL, uname, base, size); return 0; } =20 @@ -467,7 +496,7 @@ static int __init __reserved_mem_init_node(struct reser= ved_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_device_is_compatible(rmem->dev_node, compat)) continue; =20 ret =3D initfn(rmem); @@ -500,11 +529,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 @@ -551,11 +575,11 @@ void __init fdt_init_reserved_mem(void) =20 for (i =3D 0; i < reserved_mem_count; i++) { struct reserved_mem *rmem =3D &reserved_mem[i]; - unsigned long node =3D rmem->fdt_node; + struct device_node *node =3D rmem->dev_node; int err =3D 0; bool nomap; =20 - nomap =3D of_get_flat_dt_prop(node, "no-map", NULL) !=3D NULL; + nomap =3D of_property_present(node, "no-map"); =20 err =3D __reserved_mem_init_node(rmem); if (err !=3D 0 && err !=3D -ENOENT) { @@ -566,8 +590,7 @@ void __init fdt_init_reserved_mem(void) memblock_phys_free(rmem->base, rmem->size); } else { phys_addr_t end =3D rmem->base + rmem->size - 1; - bool reusable =3D - (of_get_flat_dt_prop(node, "reusable", NULL)) !=3D NULL; + bool reusable =3D of_property_present(node, "reusable"); =20 pr_info("%pa..%pa (%lu KiB) %s %s %s\n", &rmem->base, &end, (unsigned long)(rmem->size / SZ_1K), diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_me= m.h index e338282da652..769b8f67c8d3 100644 --- a/include/linux/of_reserved_mem.h +++ b/include/linux/of_reserved_mem.h @@ -10,7 +10,7 @@ struct reserved_mem_ops; =20 struct reserved_mem { const char *name; - unsigned long fdt_node; + struct device_node *dev_node; const struct reserved_mem_ops *ops; phys_addr_t base; phys_addr_t size; diff --git a/kernel/dma/coherent.c b/kernel/dma/coherent.c index ff5683a57f77..8f99586204fb 100644 --- a/kernel/dma/coherent.c +++ b/kernel/dma/coherent.c @@ -362,20 +362,18 @@ static const struct reserved_mem_ops rmem_dma_ops =3D= { =20 static int __init rmem_dma_setup(struct reserved_mem *rmem) { - unsigned long node =3D rmem->fdt_node; + struct device_node *node =3D rmem->dev_node; =20 - if (of_get_flat_dt_prop(node, "reusable", NULL)) + if (of_property_present(node, "reusable")) return -EINVAL; =20 -#ifdef CONFIG_ARM - if (!of_get_flat_dt_prop(node, "no-map", NULL)) { + if (IS_ENABLED(CONFIG_ARM) && !of_property_present(node, "no-map")) { pr_err("Reserved memory: regions without no-map are not yet supported\n"= ); return -EINVAL; } -#endif =20 #ifdef CONFIG_DMA_GLOBAL_POOL - if (of_get_flat_dt_prop(node, "linux,dma-default", NULL)) { + if (of_property_present(node, "linux,dma-default")) { WARN(dma_reserved_default_memory, "Reserved memory: region for default DMA coherent area is redefined= \n"); dma_reserved_default_memory =3D rmem; diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c index 055da410ac71..450e9e4be79c 100644 --- a/kernel/dma/contiguous.c +++ b/kernel/dma/contiguous.c @@ -456,8 +456,8 @@ static const struct reserved_mem_ops rmem_cma_ops =3D { =20 static int __init rmem_cma_setup(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 device_node *node =3D rmem->dev_node; + bool default_cma =3D of_property_read_bool(node, "linux,cma-default"); struct cma *cma; int err; =20 @@ -467,8 +467,8 @@ static int __init rmem_cma_setup(struct reserved_mem *r= mem) return -EBUSY; } =20 - if (!of_get_flat_dt_prop(node, "reusable", NULL) || - of_get_flat_dt_prop(node, "no-map", NULL)) + if (!of_property_present(node, "reusable") || + of_property_present(node, "no-map")) return -EINVAL; =20 if (!IS_ALIGNED(rmem->base | rmem->size, CMA_MIN_ALIGNMENT_BYTES)) { diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index fe1ccb53596f..9949ddc14272 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -1859,12 +1859,12 @@ static const struct reserved_mem_ops rmem_swiotlb_o= ps =3D { =20 static int __init rmem_swiotlb_setup(struct reserved_mem *rmem) { - unsigned long node =3D rmem->fdt_node; + struct device_node *node =3D rmem->dev_node; =20 - 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) || - of_get_flat_dt_prop(node, "no-map", NULL)) + if (of_property_present(node, "reusable") || + of_property_present(node, "linux,cma-default") || + of_property_present(node, "linux,dma-default") || + of_property_present(node, "no-map")) return -EINVAL; =20 rmem->ops =3D &rmem_swiotlb_ops; --=20 2.34.1