From nobody Mon Feb 9 19:30:46 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 143D4C77B60 for ; Tue, 28 Mar 2023 20:16:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229879AbjC1UQ1 (ORCPT ); Tue, 28 Mar 2023 16:16:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229806AbjC1UQS (ORCPT ); Tue, 28 Mar 2023 16:16:18 -0400 Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 823653C3F; Tue, 28 Mar 2023 13:16:17 -0700 (PDT) Received: by mail-oi1-f179.google.com with SMTP id bi31so9932108oib.9; Tue, 28 Mar 2023 13:16:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680034577; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VpsM8Gyt+E2oU3DAGA2Cy9raNlOEiWzk+fnJGTbZemI=; b=Ax3ex1KHX/0ypZoxKFZlT5QACisbTcVH7G8usW8x8RfetiJg2szV8g03M9jZQoGAEZ eDCuHCIbHihTGRAOx4dooSssv6bPtkaAokldqCnUA3PpvsRgW7cfp0HOCMVoEIAGSgbu ippLNPcnO8juVoBioA50tU5m04/MybwiluoNfXKTXjaKXGcCjNPBWIGvuzPwiIQ9YRab 5iwWM/YJ+4WR/Fmwax0NgOlKQ2thTlaneZuMAu8MFDXvI2EIDWsu3r0MQpa7X8gt0BMZ 2LURSukIuGHr+pev6uWeLUrFdJumPmeSZbU71Vv1I/Kz/hGg3mcboGOqbQ7TW72v8OHW +cXA== X-Gm-Message-State: AO0yUKWNVCHwZ3HeU3OWIGu1xBMbCo0owyHATeDEVDB+EHeNnTxortyq 10Ddj+7VzUF5dL6L5BMsflw/gV9iVg== X-Google-Smtp-Source: AK7set9zxFcHUmej6FZI0b/r9kzi7HNM/sTT+QF7paaDfTXpKf0/Bz0qzrUkdUNA414JIRwtcEX/5g== X-Received: by 2002:a05:6808:de6:b0:387:1a46:8317 with SMTP id g38-20020a0568080de600b003871a468317mr7680846oic.13.1680034576781; Tue, 28 Mar 2023 13:16:16 -0700 (PDT) Received: from robh_at_kernel.org (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id v7-20020a4aaec7000000b00529cc3986c8sm2696062oon.40.2023.03.28.13.16.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 13:16:16 -0700 (PDT) Received: (nullmailer pid 3993710 invoked by uid 1000); Tue, 28 Mar 2023 20:16:10 -0000 From: Rob Herring Date: Tue, 28 Mar 2023 15:15:56 -0500 Subject: [PATCH 1/5] of: unittest: Add bus address range parsing tests MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230328-dt-address-helpers-v1-1-e2456c3e77ab@kernel.org> References: <20230328-dt-address-helpers-v1-0-e2456c3e77ab@kernel.org> In-Reply-To: <20230328-dt-address-helpers-v1-0-e2456c3e77ab@kernel.org> To: Michael Ellerman , Nicholas Piggin , Christophe Leroy , Stuart Yoder , Laurentiu Tudor , Benjamin Herrenschmidt Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org X-Mailer: b4 0.13-dev Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org While there are tests for "dma-ranges" helpers, "ranges" is missing any tests. It's the same underlying code, but for completeness add a test for "ranges" parsing iterators. This is in preparation to add some additional "ranges" helpers. Signed-off-by: Rob Herring --- drivers/of/unittest.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 53 insertions(+) diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index b5a7a31d8bd2..1a45df1f354a 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -1008,6 +1008,58 @@ static void __init of_unittest_pci_dma_ranges(void) of_node_put(np); } =20 +static void __init of_unittest_bus_ranges(void) +{ + struct device_node *np; + struct of_range range; + struct of_range_parser parser; + int i =3D 0; + + np =3D of_find_node_by_path("/testcase-data/address-tests"); + if (!np) { + pr_err("missing testcase data\n"); + return; + } + + if (of_range_parser_init(&parser, np)) { + pr_err("missing ranges property\n"); + return; + } + + /* + * Get the "ranges" from the device tree + */ + for_each_of_range(&parser, &range) { + unittest(range.flags =3D=3D IORESOURCE_MEM, + "for_each_of_range wrong flags on node %pOF flags=3D%x (expected %x)\n", + np, range.flags, IORESOURCE_MEM); + if (!i) { + unittest(range.size =3D=3D 0x40000000, + "for_each_of_range wrong size on node %pOF size=3D%llx\n", + np, range.size); + unittest(range.cpu_addr =3D=3D 0x70000000, + "for_each_of_range wrong CPU addr (%llx) on node %pOF", + range.cpu_addr, np); + unittest(range.bus_addr =3D=3D 0x70000000, + "for_each_of_range wrong bus addr (%llx) on node %pOF", + range.pci_addr, np); + } else { + unittest(range.size =3D=3D 0x20000000, + "for_each_of_range wrong size on node %pOF size=3D%llx\n", + np, range.size); + unittest(range.cpu_addr =3D=3D 0xd0000000, + "for_each_of_range wrong CPU addr (%llx) on node %pOF", + range.cpu_addr, np); + unittest(range.bus_addr =3D=3D 0x00000000, + "for_each_of_range wrong bus addr (%llx) on node %pOF", + range.pci_addr, np); + } + i++; + } + + of_node_put(np); +} + static void __init of_unittest_parse_interrupts(void) { struct device_node *np; @@ -3644,6 +3696,7 @@ static int __init of_unittest(void) of_unittest_dma_get_max_cpu_address(); of_unittest_parse_dma_ranges(); of_unittest_pci_dma_ranges(); + of_unittest_bus_ranges(); of_unittest_match_node(); of_unittest_platform_populate(); of_unittest_overlay(); --=20 2.39.2 From nobody Mon Feb 9 19:30:46 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3BFBAC6FD18 for ; Tue, 28 Mar 2023 20:16:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229774AbjC1UQT (ORCPT ); Tue, 28 Mar 2023 16:16:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229711AbjC1UQP (ORCPT ); Tue, 28 Mar 2023 16:16:15 -0400 Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA5C53C24; Tue, 28 Mar 2023 13:16:13 -0700 (PDT) Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-17aceccdcf6so14004930fac.9; Tue, 28 Mar 2023 13:16:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680034573; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WffwCkUrO2QFOwkwd1OwIoPn40+WgwuocFCo25EFRP4=; b=nbWDwYydzmyTk6g98A46iCswmTD7o+2WfWVj2CH3Ct2GuwSPliyarfl+1DOmoX7z+5 2eZMtVOjJ3sAPz1KgYZclBlx/AtAh/W3UE4+VbZClc9aQAQtpb54ncfAfqB6w49ceAaN iXWydSvyUox/FnlQX1b0zN8PzPU888dbQZ6ZbiWWuLY8V5vGy6ema/ks51BADeRB+zvm A/br8gvjFvA6OEY43EoPcPQSmnNPkbOSsJqARUocCYs3f2Cxr19MS4t28QCpz3AIv70H yFckoUA92LCj3M5Vqa47zcPSPKXxuSHcLv6uWFIw1BA4XS2fP6H1OnZ3gae/3VrQzRDN qLVw== X-Gm-Message-State: AAQBX9fMsDFaOGHyc9j2Pb7ceGJMaT8n/o5vD4z2hrrb54NuTDyAqo1K 5d7lVf51+Aa5Ja9EhuiQCQ== X-Google-Smtp-Source: AK7set9O95zUO5XPRjY3del1fKAHhbZzd1ayFyAZFIuT0LhS8F1687vY4wmshaSQMXVNhTAnL+nVzg== X-Received: by 2002:a05:6870:e40d:b0:169:dcba:1ec9 with SMTP id n13-20020a056870e40d00b00169dcba1ec9mr11894631oag.41.1680034573156; Tue, 28 Mar 2023 13:16:13 -0700 (PDT) Received: from robh_at_kernel.org (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id m9-20020a9d6ac9000000b0069f153bb37asm8467384otq.62.2023.03.28.13.16.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 13:16:12 -0700 (PDT) Received: (nullmailer pid 3993719 invoked by uid 1000); Tue, 28 Mar 2023 20:16:10 -0000 From: Rob Herring Date: Tue, 28 Mar 2023 15:15:57 -0500 Subject: [PATCH 2/5] of/address: Add of_range_to_resource() helper MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230328-dt-address-helpers-v1-2-e2456c3e77ab@kernel.org> References: <20230328-dt-address-helpers-v1-0-e2456c3e77ab@kernel.org> In-Reply-To: <20230328-dt-address-helpers-v1-0-e2456c3e77ab@kernel.org> To: Michael Ellerman , Nicholas Piggin , Christophe Leroy , Stuart Yoder , Laurentiu Tudor , Benjamin Herrenschmidt Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org X-Mailer: b4 0.13-dev Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A few users need to convert a specific "ranges" entry into a struct resource. Add a helper to similar to of_address_to_resource(). The existing of_pci_range_to_resource() helper isn't really PCI specific, so it can be used with the CONFIG_PCI check dropped. Signed-off-by: Rob Herring --- drivers/of/address.c | 31 ++++++++++++++++++++++++++++--- drivers/of/unittest.c | 16 +++++++++++++++- include/linux/of_address.h | 8 ++++++++ 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/drivers/of/address.c b/drivers/of/address.c index 4c0b169ef9bf..b79f005834fc 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -229,9 +229,6 @@ int of_pci_range_to_resource(struct of_pci_range *range, res->parent =3D res->child =3D res->sibling =3D NULL; res->name =3D np->full_name; =20 - if (!IS_ENABLED(CONFIG_PCI)) - return -ENOSYS; - if (res->flags & IORESOURCE_IO) { unsigned long port; err =3D pci_register_io_range(&np->fwnode, range->cpu_addr, @@ -263,6 +260,34 @@ int of_pci_range_to_resource(struct of_pci_range *rang= e, } EXPORT_SYMBOL(of_pci_range_to_resource); =20 +/* + * of_range_to_resource - Create a resource from a ranges entry + * @np: device node where the range belongs to + * @index: the 'ranges' index to convert to a resource + * @res: pointer to a valid resource that will be updated to + * reflect the values contained in the range. + * + * Returns ENOENT if the entry is not found or EINVAL if the range cannot = be + * converted to resource. + */ +int of_range_to_resource(struct device_node *np, int index, struct resourc= e *res) +{ + int ret, i =3D 0; + struct of_range_parser parser; + struct of_range range; + + ret =3D of_range_parser_init(&parser, np); + if (ret) + return ret; + + for_each_of_range(&parser, &range) + if (i++ =3D=3D index) + return of_pci_range_to_resource(&range, np, res); + + return -ENOENT; +} +EXPORT_SYMBOL(of_range_to_resource); + /* * ISA bus specific translator */ diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 1a45df1f354a..945288d5672f 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -1013,7 +1013,8 @@ static void __init of_unittest_bus_ranges(void) struct device_node *np; struct of_range range; struct of_range_parser parser; - int i =3D 0; + struct resource res; + int ret, i =3D 0; =20 np =3D of_find_node_by_path("/testcase-data/address-tests"); if (!np) { @@ -1026,6 +1027,19 @@ static void __init of_unittest_bus_ranges(void) return; } =20 + ret =3D of_range_to_resource(np, 1, &res); + unittest(!ret, "of_range_to_resource returned error (%d) node %pOF\n", + ret, np); + unittest(resource_type(&res) =3D=3D IORESOURCE_MEM, + "of_range_to_resource wrong resource type on node %pOF res=3D%pR\n", + np, &res); + unittest(res.start =3D=3D 0xd0000000, + "of_range_to_resource wrong resource start address on node %pOF res=3D%p= R\n", + np, &res); + unittest(resource_size(&res) =3D=3D 0x20000000, + "of_range_to_resource wrong resource start address on node %pOF res=3D%p= R\n", + np, &res); + /* * Get the "ranges" from the device tree */ diff --git a/include/linux/of_address.h b/include/linux/of_address.h index 376671594746..1d005439f026 100644 --- a/include/linux/of_address.h +++ b/include/linux/of_address.h @@ -68,6 +68,8 @@ extern int of_pci_address_to_resource(struct device_node = *dev, int bar, extern int of_pci_range_to_resource(struct of_pci_range *range, struct device_node *np, struct resource *res); +extern int of_range_to_resource(struct device_node *np, int index, + struct resource *res); extern bool of_dma_is_coherent(struct device_node *np); #else /* CONFIG_OF_ADDRESS */ static inline void __iomem *of_io_request_and_map(struct device_node *devi= ce, @@ -120,6 +122,12 @@ static inline int of_pci_range_to_resource(struct of_p= ci_range *range, return -ENOSYS; } =20 +static inline int of_range_to_resource(struct device_node *np, int index, + struct resource *res) +{ + return -ENOSYS; +} + static inline bool of_dma_is_coherent(struct device_node *np) { return false; --=20 2.39.2 From nobody Mon Feb 9 19:30:46 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77FD7C76196 for ; Tue, 28 Mar 2023 20:16:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229875AbjC1UQZ (ORCPT ); Tue, 28 Mar 2023 16:16:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229823AbjC1UQS (ORCPT ); Tue, 28 Mar 2023 16:16:18 -0400 Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D8F33C24; Tue, 28 Mar 2023 13:16:16 -0700 (PDT) Received: by mail-ot1-f54.google.com with SMTP id k14-20020a9d700e000000b0069faa923e7eso7047280otj.10; Tue, 28 Mar 2023 13:16:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680034575; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KPV83Ku05eVtYDdjByFRpdT6sBQBYt8mDRN3PCU3Qec=; b=Nllb4I47NftUFjJbkHf+VDUOMpj/TZFcHe1fGut2oXqOGcU93wb3xYweH3rwFeeWW/ qSQIgikaMCwq4tt9qb0Eoy06MupkBcDknpE5DodGw2HNaK2KHLhlB/wN3LhLsc83lipK wyLeJfliUnM0lX7pK1n8eHLhGxpYJCzV1707pW7dfn1lJfZxkn8rNplhmEuJqPEzGpf8 MNk5Zk/OT0XJdKKv1nU8wVsIRjnyeszsVEcKomCegkf5pMhsDVCnJPEQc1n8KetaH7qs 6PhEpQ2J65jIlbieUyLRmJZGvEGQ0lGB/c0LHV/S11zF0KdskueUPt1LofMOD96/Djjs Z/Qw== X-Gm-Message-State: AAQBX9e6pD1O6IF+7oWxGSUOUymNNVyeRT+ad06b0A/4G2WYoGRVOn8O HHD/BP0TOKH+WrtCz2E8PTrkUf3NQQ== X-Google-Smtp-Source: AKy350Yvh7h3jcQs0qnOEKMeNpdXqJbdelh/CYaGEedZYqt4AXoReTYyPgoYdksvfizCTRrhxzbqJg== X-Received: by 2002:a9d:6c93:0:b0:69f:b065:7716 with SMTP id c19-20020a9d6c93000000b0069fb0657716mr8330440otr.11.1680034575472; Tue, 28 Mar 2023 13:16:15 -0700 (PDT) Received: from robh_at_kernel.org (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id d11-20020a05683018eb00b0069f1774cde8sm6583848otf.71.2023.03.28.13.16.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 13:16:15 -0700 (PDT) Received: (nullmailer pid 3993727 invoked by uid 1000); Tue, 28 Mar 2023 20:16:10 -0000 From: Rob Herring Date: Tue, 28 Mar 2023 15:15:58 -0500 Subject: [PATCH 3/5] of/address: Add support for 3 address cell bus MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230328-dt-address-helpers-v1-3-e2456c3e77ab@kernel.org> References: <20230328-dt-address-helpers-v1-0-e2456c3e77ab@kernel.org> In-Reply-To: <20230328-dt-address-helpers-v1-0-e2456c3e77ab@kernel.org> To: Michael Ellerman , Nicholas Piggin , Christophe Leroy , Stuart Yoder , Laurentiu Tudor , Benjamin Herrenschmidt Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org X-Mailer: b4 0.13-dev Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There's a few custom bus bindings (e.g. fsl,qoriq-mc) which use a 3 cell format with custom flags in the high cell. We can match these buses as a fallback if we didn't match on PCI bus which is the only standard bus binding with 3 address cells. Signed-off-by: Rob Herring --- drivers/of/address.c | 22 +++++++++++ drivers/of/unittest-data/tests-address.dtsi | 9 ++++- drivers/of/unittest.c | 58 +++++++++++++++++++++++++= +++- 3 files changed, 87 insertions(+), 2 deletions(-) diff --git a/drivers/of/address.c b/drivers/of/address.c index b79f005834fc..8cfae24148e0 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -95,11 +95,17 @@ static int of_bus_default_translate(__be32 *addr, u64 o= ffset, int na) return 0; } =20 +static unsigned int of_bus_default_flags_get_flags(const __be32 *addr) +{ + return of_read_number(addr, 1); +} + static unsigned int of_bus_default_get_flags(const __be32 *addr) { return IORESOURCE_MEM; } =20 + #ifdef CONFIG_PCI static unsigned int of_bus_pci_get_flags(const __be32 *addr) { @@ -344,6 +350,11 @@ static unsigned int of_bus_isa_get_flags(const __be32 = *addr) return flags; } =20 +static int of_bus_default_flags_match(struct device_node *np) +{ + return of_bus_n_addr_cells(np) =3D=3D 3; +} + /* * Array of bus specific translators */ @@ -373,6 +384,17 @@ static struct of_bus of_busses[] =3D { .has_flags =3D true, .get_flags =3D of_bus_isa_get_flags, }, + /* Default with flags cell */ + { + .name =3D "default-flags", + .addresses =3D "reg", + .match =3D of_bus_default_flags_match, + .count_cells =3D of_bus_default_count_cells, + .map =3D of_bus_default_map, + .translate =3D of_bus_default_translate, + .has_flags =3D true, + .get_flags =3D of_bus_default_flags_get_flags, + }, /* Default */ { .name =3D "default", diff --git a/drivers/of/unittest-data/tests-address.dtsi b/drivers/of/unitt= est-data/tests-address.dtsi index 6604a52bf6cb..bc0029cbf8ea 100644 --- a/drivers/of/unittest-data/tests-address.dtsi +++ b/drivers/of/unittest-data/tests-address.dtsi @@ -14,7 +14,7 @@ address-tests { #size-cells =3D <1>; /* ranges here is to make sure we don't use it for * dma-ranges translation */ - ranges =3D <0x70000000 0x70000000 0x40000000>, + ranges =3D <0x70000000 0x70000000 0x50000000>, <0x00000000 0xd0000000 0x20000000>; dma-ranges =3D <0x0 0x20000000 0x40000000>; =20 @@ -43,6 +43,13 @@ pci@90000000 { <0x42000000 0x0 0xc0000000 0x20000000 0x0 0x10000000>; }; =20 + bus@a0000000 { + #address-cells =3D <3>; + #size-cells =3D <2>; + ranges =3D <0xf00baa 0x0 0x0 0xa0000000 0x0 0x100000>, + <0xf00bee 0x1 0x0 0xb0000000 0x0 0x200000>; + }; + }; }; }; diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 945288d5672f..29066ecbed47 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -1048,7 +1048,7 @@ static void __init of_unittest_bus_ranges(void) "for_each_of_range wrong flags on node %pOF flags=3D%x (expected %x)\n", np, range.flags, IORESOURCE_MEM); if (!i) { - unittest(range.size =3D=3D 0x40000000, + unittest(range.size =3D=3D 0x50000000, "for_each_of_range wrong size on node %pOF size=3D%llx\n", np, range.size); unittest(range.cpu_addr =3D=3D 0x70000000, @@ -1074,6 +1074,61 @@ static void __init of_unittest_bus_ranges(void) of_node_put(np); } =20 +static void __init of_unittest_bus_3cell_ranges(void) +{ + struct device_node *np; + struct of_range range; + struct of_range_parser parser; + int i =3D 0; + + np =3D of_find_node_by_path("/testcase-data/address-tests/bus@a0000000"); + if (!np) { + pr_err("missing testcase data\n"); + return; + } + + if (of_range_parser_init(&parser, np)) { + pr_err("missing ranges property\n"); + return; + } + + /* + * Get the "ranges" from the device tree + */ + for_each_of_range(&parser, &range) { + if (!i) { + unittest(range.flags =3D=3D 0xf00baa, + "for_each_of_range wrong flags on node %pOF flags=3D%x\n", + np, range.flags); + unittest(range.size =3D=3D 0x100000, + "for_each_of_range wrong size on node %pOF size=3D%llx\n", + np, range.size); + unittest(range.cpu_addr =3D=3D 0xa0000000, + "for_each_of_range wrong CPU addr (%llx) on node %pOF", + range.cpu_addr, np); + unittest(range.bus_addr =3D=3D 0x0, + "for_each_of_range wrong bus addr (%llx) on node %pOF", + range.pci_addr, np); + } else { + unittest(range.flags =3D=3D 0xf00bee, + "for_each_of_range wrong flags on node %pOF flags=3D%x\n", + np, range.flags); + unittest(range.size =3D=3D 0x200000, + "for_each_of_range wrong size on node %pOF size=3D%llx\n", + np, range.size); + unittest(range.cpu_addr =3D=3D 0xb0000000, + "for_each_of_range wrong CPU addr (%llx) on node %pOF", + range.cpu_addr, np); + unittest(range.bus_addr =3D=3D 0x100000000, + "for_each_of_range wrong bus addr (%llx) on node %pOF", + range.pci_addr, np); + } + i++; + } + + of_node_put(np); +} + static void __init of_unittest_parse_interrupts(void) { struct device_node *np; @@ -3711,6 +3766,7 @@ static int __init of_unittest(void) of_unittest_parse_dma_ranges(); of_unittest_pci_dma_ranges(); of_unittest_bus_ranges(); + of_unittest_bus_3cell_ranges(); of_unittest_match_node(); of_unittest_platform_populate(); of_unittest_overlay(); --=20 2.39.2 From nobody Mon Feb 9 19:30:46 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55308C761A6 for ; Tue, 28 Mar 2023 20:16:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229549AbjC1UQW (ORCPT ); Tue, 28 Mar 2023 16:16:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229745AbjC1UQQ (ORCPT ); Tue, 28 Mar 2023 16:16:16 -0400 Received: from mail-oo1-f47.google.com (mail-oo1-f47.google.com [209.85.161.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DC713C34; Tue, 28 Mar 2023 13:16:15 -0700 (PDT) Received: by mail-oo1-f47.google.com with SMTP id n6-20020a4abd06000000b0053b59893660so2098392oop.0; Tue, 28 Mar 2023 13:16:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680034574; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wq9MleJbVtyTb3QrV3Xlq0I3I3gqQWPoavFTMvWxBWU=; b=cjCaxNPhDjCYwxKd1vlh0gNPer9LikdolCMHsUUQJa4pl4wq63n8tukJlBSfn3i3cM YB2XlZLRDavSZnIpoHOTik1HFKyFmVobMALFFXrcwahHn+1yJgdoY9xbOgSUYifEDRp5 4P/rJ2Iwvz7q0bweboHXR7gyCAje0e1kQgRsmT3cE/xzkLlxVmN1efaK6Tn02JtH7cUL hvecglhyw6v1jT4M2gaz7tPIxB8FxQ0j+XNIqjYpT7eL+J0L5wmPW93AxsUmEVrOaNG/ fBKN/QPq/DsEqFb1KX0N1SLIVV1C/yZzfBdoaPN1n67YoeRD2rBuSIZ8fltVuvyOIWsd g7ZQ== X-Gm-Message-State: AO0yUKVds1V6NScy2sqtAbahWd2f1dPNsiLppAl8V6Y2lkv3TsYVjCg9 JKCsZ84eSwUlWgiHIaL50Q== X-Google-Smtp-Source: AK7set9De6XnycHJIQgLEMSB8BvrDZtnx3/knyjsjlWaCorjvDtfznD+X/H4ZPT08mbWWvY4Eor3wg== X-Received: by 2002:a4a:4f83:0:b0:53b:4b94:45bf with SMTP id c125-20020a4a4f83000000b0053b4b9445bfmr8745156oob.3.1680034574395; Tue, 28 Mar 2023 13:16:14 -0700 (PDT) Received: from robh_at_kernel.org (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id c192-20020a4a4fc9000000b0053b88b03e24sm7136185oob.18.2023.03.28.13.16.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 13:16:13 -0700 (PDT) Received: (nullmailer pid 3993734 invoked by uid 1000); Tue, 28 Mar 2023 20:16:10 -0000 From: Rob Herring Date: Tue, 28 Mar 2023 15:15:59 -0500 Subject: [PATCH 4/5] of/address: Add of_range_count() helper MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230328-dt-address-helpers-v1-4-e2456c3e77ab@kernel.org> References: <20230328-dt-address-helpers-v1-0-e2456c3e77ab@kernel.org> In-Reply-To: <20230328-dt-address-helpers-v1-0-e2456c3e77ab@kernel.org> To: Michael Ellerman , Nicholas Piggin , Christophe Leroy , Stuart Yoder , Laurentiu Tudor , Benjamin Herrenschmidt Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org X-Mailer: b4 0.13-dev Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some users need a count of the number of ranges entries before iterating over the entries. Typically this is for allocating some data structure based on the size. Add a helper, of_range_count(), to get the count. The helper must be called with an struct of_range_parser initialized by of_range_parser_init(). Signed-off-by: Rob Herring --- drivers/of/unittest.c | 7 ++++++- include/linux/of_address.h | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 29066ecbed47..eaeb58065acc 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -1014,7 +1014,7 @@ static void __init of_unittest_bus_ranges(void) struct of_range range; struct of_range_parser parser; struct resource res; - int ret, i =3D 0; + int ret, count, i =3D 0; =20 np =3D of_find_node_by_path("/testcase-data/address-tests"); if (!np) { @@ -1040,6 +1040,11 @@ static void __init of_unittest_bus_ranges(void) "of_range_to_resource wrong resource start address on node %pOF res=3D%p= R\n", np, &res); =20 + count =3D of_range_count(&parser); + unittest(count =3D=3D 2, + "of_range_count wrong size on node %pOF count=3D%d\n", + np, count); + /* * Get the "ranges" from the device tree */ diff --git a/include/linux/of_address.h b/include/linux/of_address.h index 1d005439f026..5292f62c1baa 100644 --- a/include/linux/of_address.h +++ b/include/linux/of_address.h @@ -35,6 +35,22 @@ struct of_pci_range { for (; of_pci_range_parser_one(parser, range);) #define for_each_of_range for_each_of_pci_range =20 +/* + * of_range_count - Get the number of "ranges" or "dma-ranges" entries + * @parser: Parser state initialized by of_range_parser_init() + * + * Returns the number of entries or 0 if none. + * + * Note that calling this within or after the for_each_of_range() iterator= will + * be inaccurate giving the number of entries remaining. + */ +static inline int of_range_count(const struct of_range_parser *parser) +{ + if (!parser || !parser->node || !parser->range || parser->range =3D=3D pa= rser->end) + return 0; + return (parser->end - parser->range) / (parser->na + parser->pna + parser= ->ns); +} + /* Translate a DMA address from device space to CPU space */ extern u64 of_translate_dma_address(struct device_node *dev, const __be32 *in_addr); --=20 2.39.2 From nobody Mon Feb 9 19:30:46 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2162C6FD18 for ; Tue, 28 Mar 2023 20:16:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229884AbjC1UQ3 (ORCPT ); Tue, 28 Mar 2023 16:16:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229772AbjC1UQT (ORCPT ); Tue, 28 Mar 2023 16:16:19 -0400 Received: from mail-oa1-f50.google.com (mail-oa1-f50.google.com [209.85.160.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8F0E3A99; Tue, 28 Mar 2023 13:16:18 -0700 (PDT) Received: by mail-oa1-f50.google.com with SMTP id 586e51a60fabf-17683b570b8so13974530fac.13; Tue, 28 Mar 2023 13:16:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680034578; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bCPFOdIpNQUFJhPrmeiDu2DdLbGsab44HmyQyVjGzEY=; b=se0GTU860Zvce3ghTGwaZ6IXAGrmAY2/PGcFwDMpYU55m8AEFR9yUyZScojUD3TEa+ rBzpX3wqMGCNsPPiTtKz6so1Pq/j6M9oxQv37PYqXnIVkjec0aQsU04312yp2t1iUq4h NrbuREUzYHB6li42IIIzjQGD1t2o+wyp1H6sKKvqOqkyM4v4wpH9mj7+dS0hJ9PjLbsQ UDWXynq9th0muNLH9YiZkYcJZVWTuU8H9SOI66O8KWJdQPVb67XpHYbHb2XDRGcXfq+e U26U4xE0VTu6TX6ULeffVXhGk2iqGsg8sJp16pSW+TcNviqqvU0jnimTvPdSMnH+Dacm vjug== X-Gm-Message-State: AAQBX9c0h0UE6f83ZTMkHS0maIONVY8Y+sWOBz4lZNABMQDl5ufWCibe L2UzXc9q5TriOvFbXtJKKA== X-Google-Smtp-Source: AK7set/9uPgN0yCrXLJT35rq7Qat3QtTAkbocxc8t5r/+YdjprY4iCDY11yfxUH4UdUAQpsUjhc5qg== X-Received: by 2002:a05:6870:a454:b0:177:c8dc:501f with SMTP id n20-20020a056870a45400b00177c8dc501fmr12122129oal.29.1680034578097; Tue, 28 Mar 2023 13:16:18 -0700 (PDT) Received: from robh_at_kernel.org (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id v23-20020a056870709700b0017280f7d653sm11129807oae.35.2023.03.28.13.16.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 13:16:17 -0700 (PDT) Received: (nullmailer pid 3993737 invoked by uid 1000); Tue, 28 Mar 2023 20:16:10 -0000 From: Rob Herring Date: Tue, 28 Mar 2023 15:16:00 -0500 Subject: [PATCH 5/5] of/address: Add of_property_read_reg() helper MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230328-dt-address-helpers-v1-5-e2456c3e77ab@kernel.org> References: <20230328-dt-address-helpers-v1-0-e2456c3e77ab@kernel.org> In-Reply-To: <20230328-dt-address-helpers-v1-0-e2456c3e77ab@kernel.org> To: Michael Ellerman , Nicholas Piggin , Christophe Leroy , Stuart Yoder , Laurentiu Tudor , Benjamin Herrenschmidt Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org X-Mailer: b4 0.13-dev Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a helper, of_property_read_reg(), to read "reg" entries untranslated address and size. This function is intended mainly for cases with an untranslatable "reg" address (i.e. not MMIO). There's also a few translatable cases such as address cells containing a bus chip-select number. Signed-off-by: Rob Herring --- drivers/of/address.c | 23 +++++++++++++++++++++++ drivers/of/unittest.c | 22 ++++++++++++++++++++++ include/linux/of_address.h | 7 +++++++ 3 files changed, 52 insertions(+) diff --git a/drivers/of/address.c b/drivers/of/address.c index 8cfae24148e0..fdb15c6fb3b1 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -760,6 +760,29 @@ const __be32 *__of_get_address(struct device_node *dev= , int index, int bar_no, } EXPORT_SYMBOL(__of_get_address); =20 +/** + * of_property_read_reg - Retrieve the specified "reg" entry index without= translating + * @np: device tree node for which to retrieve "reg" from + * @idx: "reg" entry index to read + * @addr: return value for the untranslated address + * @size: return value for the entry size + * + * Returns -EINVAL if "reg" is not found. Returns 0 on success with addr a= nd + * size values filled in. + */ +int of_property_read_reg(struct device_node *np, int idx, u64 *addr, u64 *= size) +{ + const __be32 *prop =3D of_get_address(np, idx, size, NULL); + + if (!prop) + return -EINVAL; + + *addr =3D of_read_number(prop, of_n_addr_cells(np)); + + return 0; +} +EXPORT_SYMBOL(of_property_read_reg); + static int parser_init(struct of_pci_range_parser *parser, struct device_node *node, const char *name) { diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index eaeb58065acc..e73ecbef977b 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -1134,6 +1134,27 @@ static void __init of_unittest_bus_3cell_ranges(void) of_node_put(np); } =20 +static void __init of_unittest_reg(void) +{ + struct device_node *np; + int ret; + u64 addr, size; + + np =3D of_find_node_by_path("/testcase-data/address-tests/bus@80000000/de= vice@1000"); + if (!np) { + pr_err("missing testcase data\n"); + return; + } + + ret =3D of_property_read_reg(np, 0, &addr, &size); + unittest(!ret, "of_property_read_reg(%pOF) returned error %d\n", + np, ret); + unittest(addr =3D=3D 0x1000, "of_property_read_reg(%pOF) untranslated add= ress (%llx) incorrect\n", + np, addr); + + of_node_put(np); +} + static void __init of_unittest_parse_interrupts(void) { struct device_node *np; @@ -3772,6 +3793,7 @@ static int __init of_unittest(void) of_unittest_pci_dma_ranges(); of_unittest_bus_ranges(); of_unittest_bus_3cell_ranges(); + of_unittest_reg(); of_unittest_match_node(); of_unittest_platform_populate(); of_unittest_overlay(); diff --git a/include/linux/of_address.h b/include/linux/of_address.h index 5292f62c1baa..95cb6c5c2d67 100644 --- a/include/linux/of_address.h +++ b/include/linux/of_address.h @@ -72,6 +72,8 @@ void __iomem *of_io_request_and_map(struct device_node *d= evice, extern const __be32 *__of_get_address(struct device_node *dev, int index, = int bar_no, u64 *size, unsigned int *flags); =20 +int of_property_read_reg(struct device_node *np, int idx, u64 *addr, u64 *= size); + extern int of_pci_range_parser_init(struct of_pci_range_parser *parser, struct device_node *node); extern int of_pci_dma_range_parser_init(struct of_pci_range_parser *parser, @@ -106,6 +108,11 @@ static inline const __be32 *__of_get_address(struct de= vice_node *dev, int index, return NULL; } =20 +static int of_property_read_reg(struct device_node *np, int idx, u64 *addr= , u64 *size) +{ + return -ENOSYS; +} + static inline int of_pci_range_parser_init(struct of_pci_range_parser *par= ser, struct device_node *node) { --=20 2.39.2