From nobody Sat Feb 7 23:23:28 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 2F78CC7EE29 for ; Fri, 9 Jun 2023 18:32:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230400AbjFIScs (ORCPT ); Fri, 9 Jun 2023 14:32:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230289AbjFIScr (ORCPT ); Fri, 9 Jun 2023 14:32:47 -0400 Received: from mail-il1-f176.google.com (mail-il1-f176.google.com [209.85.166.176]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 017314206 for ; Fri, 9 Jun 2023 11:32:31 -0700 (PDT) Received: by mail-il1-f176.google.com with SMTP id e9e14a558f8ab-33e4e59da95so9046905ab.2 for ; Fri, 09 Jun 2023 11:32:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686335551; x=1688927551; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=H1tsdW879hEz8ZM1hUfjQy+GQmzb7YudBjWdJTwNOWo=; b=eyiJ3Pb3dhZfVgHzheVpzDYpFsrnIDbwPu3D7eWJjJglCtgPJvORm2Ju2Ojb4nEjnY Jj/XaBPGk24GLmv2dY9gIQSDETWn6HuGx3Jwu2z50rtLjTFZ0RgxfQvw80rHpXpHX/PR aOLuepU1cougRTaAWIyO0acuaLVtUUg1hm3m0hTNTMtByyjmLNuSpCgmrdMn2tDKhAB6 Z9hBPMP88dEZPfuxr1YG7qKPlsgnl104Z0BEiRVLd70HGhundyH4wruA+UC1ciYnygVl h2w97t2JSjCthjeaacAH9L9RLozRf1qaz5Sdx7wWGUE4n7PQvQi9LzMu9xj2v2hJ/uLz /C5Q== X-Gm-Message-State: AC+VfDwq9bridtMupSzqdagelUEpxlVAwokpbxG41x6OLGPbOvdLjWFd xfXALiXAlwq31AJmYmvqWg== X-Google-Smtp-Source: ACHHUZ7W/BNJTBWEuzlVSH6IdqkzDcm9veSVqRhEBiDBRS7zfxQmyz1wWm6tcwQq8rqCfLhFbBrE5Q== X-Received: by 2002:a92:d483:0:b0:338:d170:6e32 with SMTP id p3-20020a92d483000000b00338d1706e32mr2259045ilg.7.1686335550873; Fri, 09 Jun 2023 11:32:30 -0700 (PDT) Received: from robh_at_kernel.org ([64.188.179.250]) by smtp.gmail.com with ESMTPSA id p5-20020a92d285000000b00333b5ae4ab7sm1193799ilp.87.2023.06.09.11.32.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 11:32:30 -0700 (PDT) Received: (nullmailer pid 1766999 invoked by uid 1000); Fri, 09 Jun 2023 18:32:29 -0000 From: Rob Herring To: Stuart Yoder , Laurentiu Tudor Cc: linux-kernel@vger.kernel.org Subject: [PATCH] bus: fsl-mc: Use common ranges functions Date: Fri, 9 Jun 2023 12:32:15 -0600 Message-Id: <20230609183215.1766735-1-robh@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Since commit 3d5089c4263d ("of/address: Add support for 3 address cell bus"), the DT address functions can handle translating buses with 3 address cells. Replace the custom code with the for_each_of_range() iterator. The original code had fallbacks to get "#address-cells"/"#size-cells" from the bus parent node if they are missing. This is non-standard behavior, and AFAICT the upstream .dts files never relied on that. Signed-off-by: Rob Herring Reviewed-by: Laurentiu Tudor Tested-by: Laurentiu Tudor --- drivers/bus/fsl-mc/fsl-mc-bus.c | 90 +++++---------------------------- 1 file changed, 13 insertions(+), 77 deletions(-) diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bu= s.c index 653e2d4c116f..5062d73b13e2 100644 --- a/drivers/bus/fsl-mc/fsl-mc-bus.c +++ b/drivers/bus/fsl-mc/fsl-mc-bus.c @@ -999,75 +999,18 @@ struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_= mc_device *mc_dev, } EXPORT_SYMBOL_GPL(fsl_mc_get_endpoint); =20 -static int parse_mc_ranges(struct device *dev, - int *paddr_cells, - int *mc_addr_cells, - int *mc_size_cells, - const __be32 **ranges_start) -{ - const __be32 *prop; - int range_tuple_cell_count; - int ranges_len; - int tuple_len; - struct device_node *mc_node =3D dev->of_node; - - *ranges_start =3D of_get_property(mc_node, "ranges", &ranges_len); - if (!(*ranges_start) || !ranges_len) { - dev_warn(dev, - "missing or empty ranges property for device tree node '%pOFn'\n", - mc_node); - return 0; - } - - *paddr_cells =3D of_n_addr_cells(mc_node); - - prop =3D of_get_property(mc_node, "#address-cells", NULL); - if (prop) - *mc_addr_cells =3D be32_to_cpup(prop); - else - *mc_addr_cells =3D *paddr_cells; - - prop =3D of_get_property(mc_node, "#size-cells", NULL); - if (prop) - *mc_size_cells =3D be32_to_cpup(prop); - else - *mc_size_cells =3D of_n_size_cells(mc_node); - - range_tuple_cell_count =3D *paddr_cells + *mc_addr_cells + - *mc_size_cells; - - tuple_len =3D range_tuple_cell_count * sizeof(__be32); - if (ranges_len % tuple_len !=3D 0) { - dev_err(dev, "malformed ranges property '%pOFn'\n", mc_node); - return -EINVAL; - } - - return ranges_len / tuple_len; -} - static int get_mc_addr_translation_ranges(struct device *dev, struct fsl_mc_addr_translation_range **ranges, u8 *num_ranges) { - int ret; - int paddr_cells; - int mc_addr_cells; - int mc_size_cells; - int i; - const __be32 *ranges_start; - const __be32 *cell; - - ret =3D parse_mc_ranges(dev, - &paddr_cells, - &mc_addr_cells, - &mc_size_cells, - &ranges_start); - if (ret < 0) - return ret; + struct fsl_mc_addr_translation_range *r; + struct of_range_parser parser; + struct of_range range; =20 - *num_ranges =3D ret; - if (!ret) { + of_range_parser_init(&parser, dev->of_node); + *num_ranges =3D of_range_count(&parser); + if (!*num_ranges) { /* * Missing or empty ranges property ("ranges;") for the * 'fsl,qoriq-mc' node. In this case, identity mapping @@ -1083,20 +1026,13 @@ static int get_mc_addr_translation_ranges(struct de= vice *dev, if (!(*ranges)) return -ENOMEM; =20 - cell =3D ranges_start; - for (i =3D 0; i < *num_ranges; ++i) { - struct fsl_mc_addr_translation_range *range =3D &(*ranges)[i]; - - range->mc_region_type =3D of_read_number(cell, 1); - range->start_mc_offset =3D of_read_number(cell + 1, - mc_addr_cells - 1); - cell +=3D mc_addr_cells; - range->start_phys_addr =3D of_read_number(cell, paddr_cells); - cell +=3D paddr_cells; - range->end_mc_offset =3D range->start_mc_offset + - of_read_number(cell, mc_size_cells); - - cell +=3D mc_size_cells; + r =3D *ranges; + for_each_of_range(&parser, &range) { + r->mc_region_type =3D range.flags; + r->start_mc_offset =3D range.bus_addr; + r->end_mc_offset =3D range.bus_addr + range.size; + r->start_phys_addr =3D range.cpu_addr; + r++; } =20 return 0; --=20 2.39.2