From patchwork Mon Feb 6 19:45:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 13130543 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 48787C636D3 for ; Mon, 6 Feb 2023 19:47:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=P3BL5nW9JODplILZRVbwzkWazJtODEqGXL7svbAynuc=; b=4XcOBwqERQb8Iw u/Kn6E6E/YptzLM6SmIh0wcN6zfPyUyFnoIR3yiJSNVFoVPT3rt+DRhS/aZ5rGgZFs/FUhm6DszRD 4oxyqsdlfQX/AT6lT7IjjOAuF9HATq3KwT5nJ+DQVZwsp0bVSlrGxZ5janBySENNSmFDj2JD5cekI FytefDK6MAdJeluXxika/S8rO5AgyI8Fa03hzZl058chhn2b8BLgon6aV0v/MS/03STOV3iC+YKHJ rEZEJCBggdhA6zA7WHgEN1MIi0RdJoMJq3HzEeCcdtdXKlSK+OridD+KgUzWFbw3wjE5xY/lF71vR OieDJ3wvMZlCjrfhu54g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pP7RM-009k4r-B3; Mon, 06 Feb 2023 19:46:12 +0000 Received: from mail-oa1-f42.google.com ([209.85.160.42]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pP7RI-009k3I-6E for linux-arm-kernel@lists.infradead.org; Mon, 06 Feb 2023 19:46:10 +0000 Received: by mail-oa1-f42.google.com with SMTP id 586e51a60fabf-16a27344a17so7118779fac.4 for ; Mon, 06 Feb 2023 11:46:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=F4DTh2z1rpPRJ/teaflCZt687gPrck3bGUNfCgC0QoI=; b=RlE3/87MDX59Q3MwvogyRJAUMPUO7dyGvZhIEyK6ggW9GR4p4mn/lgYE9LX7ew1+W+ yjXg5KPdIJjv37guXwkF7XarvzkV9wFInEDJ03392yaGBnuCChMEeZ1Yf4P4rchlEQwF KUKOtggfvd6DwIvwdU9vzWTFlLK1T4cTvOFR91yUTqGWsgHLaPybKjbcG8ODmTKOrbAM LG6h+EuSF8NsJH8F9PXyzmXT0eMZaLQ3mFqeL3I518a2Sl2Eh4ZQz1e19IPK+A1h+xNg 8KtIuDXcw+jKPqDtWh23fr6r5DKnKP/0FXYlQUGXfwAcR5xvI7LBvXJz7opBZ9mG6mDC 7n8A== X-Gm-Message-State: AO0yUKUXysMZlXTigTT9lj1upiXNp7V//umOhvXJR02U45S6aAumvnbX H69y91z15uNvRNEPYqFZugv/YqisYg== X-Google-Smtp-Source: AK7set8lDNcFV4HeZmp8nc61LAgkpAfWj4rmjX01wERSBhT4ExCxllVrC3mU0gL3aLnTDVBizvfcNA== X-Received: by 2002:a05:6871:6a9:b0:15e:cfce:fcb9 with SMTP id l41-20020a05687106a900b0015ecfcefcb9mr11802215oao.34.1675712765745; Mon, 06 Feb 2023 11:46:05 -0800 (PST) Received: from robh_at_kernel.org (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id h5-20020a056870538500b0015f9cc16ef7sm4487247oan.46.2023.02.06.11.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Feb 2023 11:46:05 -0800 (PST) Received: (nullmailer pid 1173026 invoked by uid 1000); Mon, 06 Feb 2023 19:46:04 -0000 From: Rob Herring To: Kunihiko Hayashi , Masami Hiramatsu Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] bus: uniphier-system-bus: Remove open coded "ranges" parsing Date: Mon, 6 Feb 2023 13:45:04 -0600 Message-Id: <20230206194503.1162108-1-robh@kernel.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230206_114608_253472_A8C3127B X-CRM114-Status: GOOD ( 15.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org "ranges" is a standard property and we have common helper functions for parsing it, so let's use them. Tested-by: Kunihiko Hayashi Signed-off-by: Rob Herring --- Compile tested only! v2: - Fix subject: s/unifier/uniphier/ --- drivers/bus/uniphier-system-bus.c | 54 +++++++------------------------ 1 file changed, 11 insertions(+), 43 deletions(-) diff --git a/drivers/bus/uniphier-system-bus.c b/drivers/bus/uniphier-system-bus.c index f70dedace20b..cb5c89ce7b86 100644 --- a/drivers/bus/uniphier-system-bus.c +++ b/drivers/bus/uniphier-system-bus.c @@ -176,10 +176,9 @@ static int uniphier_system_bus_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct uniphier_system_bus_priv *priv; - const __be32 *ranges; - u32 cells, addr, size; - u64 paddr; - int pna, bank, rlen, rone, ret; + struct of_range_parser parser; + struct of_range range; + int ret; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) @@ -191,48 +190,17 @@ static int uniphier_system_bus_probe(struct platform_device *pdev) priv->dev = dev; - pna = of_n_addr_cells(dev->of_node); - - ret = of_property_read_u32(dev->of_node, "#address-cells", &cells); - if (ret) { - dev_err(dev, "failed to get #address-cells\n"); - return ret; - } - if (cells != 2) { - dev_err(dev, "#address-cells must be 2\n"); - return -EINVAL; - } - - ret = of_property_read_u32(dev->of_node, "#size-cells", &cells); - if (ret) { - dev_err(dev, "failed to get #size-cells\n"); + ret = of_range_parser_init(&parser, dev->of_node); + if (ret) return ret; - } - if (cells != 1) { - dev_err(dev, "#size-cells must be 1\n"); - return -EINVAL; - } - ranges = of_get_property(dev->of_node, "ranges", &rlen); - if (!ranges) { - dev_err(dev, "failed to get ranges property\n"); - return -ENOENT; - } - - rlen /= sizeof(*ranges); - rone = pna + 2; - - for (; rlen >= rone; rlen -= rone) { - bank = be32_to_cpup(ranges++); - addr = be32_to_cpup(ranges++); - paddr = of_translate_address(dev->of_node, ranges); - if (paddr == OF_BAD_ADDR) + for_each_of_range(&parser, &range) { + if (range.cpu_addr == OF_BAD_ADDR) return -EINVAL; - ranges += pna; - size = be32_to_cpup(ranges++); - - ret = uniphier_system_bus_add_bank(priv, bank, addr, - paddr, size); + ret = uniphier_system_bus_add_bank(priv, + upper_32_bits(range.bus_addr), + lower_32_bits(range.bus_addr), + range.cpu_addr, range.size); if (ret) return ret; }