From mboxrd@z Thu Jan 1 00:00:00 1970 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 phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 44CA9C7EE23 for ; Sat, 25 Feb 2023 20:40:55 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BB46B85B8C; Sat, 25 Feb 2023 21:40:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="B2TTkmKi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A210785B8F; Sat, 25 Feb 2023 21:40:50 +0100 (CET) Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1243085930 for ; Sat, 25 Feb 2023 21:40:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=michael@amarulasolutions.com Received: by mail-ed1-x52e.google.com with SMTP id o15so8166062edr.13 for ; Sat, 25 Feb 2023 12:40:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=hr6grlr8iwVRxQNzfdc3voAlUCLxyl7YITF8Mqk871s=; b=B2TTkmKiy98QBGOLZCjqyzPP5OINDea4Nc7iH5SV7eKIIYb9hI0c8QF1bmiXDElcf8 KHoHDGCzEdnwuH8ykfa6ECAYrI350GdEMoAyKI7IuNj28ZyyL6siNm8Ui5HU6Pn3HoZ2 ICJTjen9AxJ2VBv/6DNJOUsw4oB/pgASQBNJI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hr6grlr8iwVRxQNzfdc3voAlUCLxyl7YITF8Mqk871s=; b=5oIrX/Jnp075XeIBusmcDEVs38XOX9QtsAaO2NI2oojY/0OuuxNHXclOQmos4PMiAC L/Gb1jG7AX4U6q91CpR7jO4WYw38i/C7GdxN3a9I0vHf9E8RByLeN3TY6j0kXlcZdWYJ NwNgZTZYz2rTeCxJmlx2uYJR0LSZZ+I6xM7kMefxxCnYIVrPzJb20e6ZWV3oxfIEZJud 2iCJuJ3LUx0Whh5N3fHm0DtoN/wg3BGcLcjXnQRK+agWRg3GIKqVshf4zJI5izKBdQaq 9uZYtPvcH0McnV3w2ODPaU1EFp0XgdkTKdL96KhFziWgE27AaNR+imjOnoe9/m/yVFie q0Qw== X-Gm-Message-State: AO0yUKVOqOh7Z5XB7V64lyPDM29OLh0ZPDfa6SJtc2XJKuPI2GM/c47J DpUNtCvwtmFFG0tYn9jGAUF7r9eRYRYKr8SCPwhFJw== X-Google-Smtp-Source: AK7set+XRIDb5IWu4PWzgbvf0ywTlPXsuQRoKZbBF3xcfWdjWrwaBDrkp8vGb7yx3Pb+ydTgJwpotfExgeQ/kSoFJaQ= X-Received: by 2002:a17:906:d0cb:b0:8b2:94c1:9e8f with SMTP id bq11-20020a170906d0cb00b008b294c19e8fmr13479746ejb.12.1677357646383; Sat, 25 Feb 2023 12:40:46 -0800 (PST) MIME-Version: 1.0 References: <49d0321c-72e4-429f-335e-8f23ff866d39@rock-chips.com> <0a708ae1-4b92-a572-1d74-343070c8a26b@gmail.com> <8a0f9a61-5189-e799-6fe1-2dd68e3bf7d0@gmail.com> In-Reply-To: <8a0f9a61-5189-e799-6fe1-2dd68e3bf7d0@gmail.com> From: Michael Nazzareno Trimarchi Date: Sat, 25 Feb 2023 21:40:34 +0100 Message-ID: Subject: Re: [RFC PATCH v1 4/4] drivers: use devfdt_get_addr_index_ptr when cast to pointer To: Johan Jonker Cc: dario.binacchi@amarulasolutions.com, sjg@chromium.org, philipp.tomsich@vrull.eu, kever.yang@rock-chips.com, u-boot@lists.denx.de, yifeng.zhao@rock-chips.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Hi Johan On Sat, Feb 25, 2023 at 8:19=E2=80=AFPM Johan Jonker wr= ote: > > The fdt_addr_t and phys_addr_t size have been decoupled. > A 32bit CPU can expect 64-bit data from the device tree parser, > so use devfdt_get_addr_index_ptr instead of > the devfdt_get_addr_index function in the various files > in the drivers directory that cast to a pointer. > > Signed-off-by: Johan Jonker > --- > Thank you. We should wait now Simon on those patches Michael > Note: > > This is needed for a Rockchip patch serie to pass the test and > must be merged before by Rockchip maintainers: > > [PATCH v4 00/11] Fixes for Rockchip NFC driver part 1 > https://lore.kernel.org/u-boot/f3dba231-4a55-0a94-dfab-5cab1419d132@gmail= .com/ > > Replacement command used: > find . -type f -exec sed -i 's/*)devfdt_get_addr_index(/ > *)devfdt_get_addr_index_ptr(/g' {} + > --- > drivers/clk/clk-hsdk-cgu.c | 4 ++-- > drivers/ddr/altera/sdram_gen5.c | 2 +- > drivers/mmc/xenon_sdhci.c | 2 +- > drivers/net/mvpp2.c | 24 ++++++++++++------------ > drivers/pci/pcie_dw_mvebu.c | 4 ++-- > drivers/pci/pcie_imx.c | 4 ++-- > drivers/pci/pcie_layerscape_ep.c | 4 ++-- > drivers/phy/marvell/comphy_core.c | 12 ++++++------ > drivers/spi/cadence_qspi.c | 2 +- > drivers/usb/musb-new/ti-musb.c | 2 +- > 10 files changed, 30 insertions(+), 30 deletions(-) > > diff --git a/drivers/clk/clk-hsdk-cgu.c b/drivers/clk/clk-hsdk-cgu.c > index 26b0aa9a..cf3d0fd3 100644 > --- a/drivers/clk/clk-hsdk-cgu.c > +++ b/drivers/clk/clk-hsdk-cgu.c > @@ -753,11 +753,11 @@ static int hsdk_cgu_clk_probe(struct udevice *dev) > else > hsdk_clk->map =3D hsdk_4xd_clk_map; > > - hsdk_clk->cgu_regs =3D (void __iomem *)devfdt_get_addr_index(dev,= 0); > + hsdk_clk->cgu_regs =3D (void __iomem *)devfdt_get_addr_index_ptr(= dev, 0); > if (!hsdk_clk->cgu_regs) > return -EINVAL; > > - hsdk_clk->creg_regs =3D (void __iomem *)devfdt_get_addr_index(dev= , 1); > + hsdk_clk->creg_regs =3D (void __iomem *)devfdt_get_addr_index_ptr= (dev, 1); > if (!hsdk_clk->creg_regs) > return -EINVAL; > > diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_g= en5.c > index 8d3ce495..2cdfdd42 100644 > --- a/drivers/ddr/altera/sdram_gen5.c > +++ b/drivers/ddr/altera/sdram_gen5.c > @@ -567,7 +567,7 @@ static int altera_gen5_sdram_of_to_plat(struct udevic= e *dev) > { > struct altera_gen5_sdram_plat *plat =3D dev_get_plat(dev); > > - plat->sdr =3D (struct socfpga_sdr *)devfdt_get_addr_index(dev, 0)= ; > + plat->sdr =3D (struct socfpga_sdr *)devfdt_get_addr_index_ptr(dev= , 0); > if (!plat->sdr) > return -ENODEV; > > diff --git a/drivers/mmc/xenon_sdhci.c b/drivers/mmc/xenon_sdhci.c > index 2f880509..16ac84a2 100644 > --- a/drivers/mmc/xenon_sdhci.c > +++ b/drivers/mmc/xenon_sdhci.c > @@ -537,7 +537,7 @@ static int xenon_sdhci_of_to_plat(struct udevice *dev= ) > host->ioaddr =3D dev_read_addr_ptr(dev); > > if (device_is_compatible(dev, "marvell,armada-3700-sdhci")) > - priv->pad_ctrl_reg =3D (void *)devfdt_get_addr_index(dev,= 1); > + priv->pad_ctrl_reg =3D devfdt_get_addr_index_ptr(dev, 1); > > name =3D fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "marvell,p= ad-type", > NULL); > diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c > index 8c9afdf7..907d826d 100644 > --- a/drivers/net/mvpp2.c > +++ b/drivers/net/mvpp2.c > @@ -5351,18 +5351,18 @@ static int mvpp2_base_probe(struct udevice *dev) > } > > /* Save base addresses for later use */ > - priv->base =3D (void *)devfdt_get_addr_index(dev, 0); > - if (IS_ERR(priv->base)) > - return PTR_ERR(priv->base); > + priv->base =3D devfdt_get_addr_index_ptr(dev, 0); > + if (!priv->base) > + return -EINVAL; > > if (priv->hw_version =3D=3D MVPP21) { > - priv->lms_base =3D (void *)devfdt_get_addr_index(dev, 1); > - if (IS_ERR(priv->lms_base)) > - return PTR_ERR(priv->lms_base); > + priv->lms_base =3D devfdt_get_addr_index_ptr(dev, 1); > + if (!priv->lms_base) > + return -EINVAL; > } else { > - priv->iface_base =3D (void *)devfdt_get_addr_index(dev, 1= ); > - if (IS_ERR(priv->iface_base)) > - return PTR_ERR(priv->iface_base); > + priv->iface_base =3D devfdt_get_addr_index_ptr(dev, 1); > + if (!priv->iface_base) > + return -EINVAL; > > /* Store common base addresses for all ports */ > priv->mpcs_base =3D priv->iface_base + MVPP22_MPCS; > @@ -5401,10 +5401,10 @@ static int mvpp2_probe(struct udevice *dev) > if (priv->hw_version =3D=3D MVPP21) { > int priv_common_regs_num =3D 2; > > - port->base =3D (void __iomem *)devfdt_get_addr_index( > + port->base =3D (void __iomem *)devfdt_get_addr_index_ptr( > dev->parent, priv_common_regs_num + port->id); > - if (IS_ERR(port->base)) > - return PTR_ERR(port->base); > + if (!port->base) > + return -EINVAL; > } else { > port->gop_id =3D fdtdec_get_int(gd->fdt_blob, dev_of_offs= et(dev), > "gop-port-id", -1); > diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c > index 3b2ada54..c41f3f15 100644 > --- a/drivers/pci/pcie_dw_mvebu.c > +++ b/drivers/pci/pcie_dw_mvebu.c > @@ -564,8 +564,8 @@ static int pcie_dw_mvebu_of_to_plat(struct udevice *d= ev) > struct pcie_dw_mvebu *pcie =3D dev_get_priv(dev); > > /* Get the controller base address */ > - pcie->ctrl_base =3D (void *)devfdt_get_addr_index(dev, 0); > - if ((fdt_addr_t)pcie->ctrl_base =3D=3D FDT_ADDR_T_NONE) > + pcie->ctrl_base =3D devfdt_get_addr_index_ptr(dev, 0); > + if (!pcie->ctrl_base) > return -EINVAL; > > /* Get the config space base address and size */ > diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c > index da484664..bf1ca5b6 100644 > --- a/drivers/pci/pcie_imx.c > +++ b/drivers/pci/pcie_imx.c > @@ -751,8 +751,8 @@ static int imx_pcie_of_to_plat(struct udevice *dev) > { > struct imx_pcie_priv *priv =3D dev_get_priv(dev); > > - priv->dbi_base =3D (void __iomem *)devfdt_get_addr_index(dev, 0); > - priv->cfg_base =3D (void __iomem *)devfdt_get_addr_index(dev, 1); > + priv->dbi_base =3D (void __iomem *)devfdt_get_addr_index_ptr(dev,= 0); > + priv->cfg_base =3D (void __iomem *)devfdt_get_addr_index_ptr(dev,= 1); > if (!priv->dbi_base || !priv->cfg_base) > return -EINVAL; > > diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layersca= pe_ep.c > index ff26a5cd..f4a0d1f2 100644 > --- a/drivers/pci/pcie_layerscape_ep.c > +++ b/drivers/pci/pcie_layerscape_ep.c > @@ -250,11 +250,11 @@ static int ls_pcie_ep_probe(struct udevice *dev) > > pcie_ep->pcie =3D pcie; > > - pcie->dbi =3D (void __iomem *)devfdt_get_addr_index(dev, 0); > + pcie->dbi =3D (void __iomem *)devfdt_get_addr_index_ptr(dev, 0); > if (!pcie->dbi) > return -ENOMEM; > > - pcie->ctrl =3D (void __iomem *)devfdt_get_addr_index(dev, 1); > + pcie->ctrl =3D (void __iomem *)devfdt_get_addr_index_ptr(dev, 1); > if (!pcie->ctrl) > return -ENOMEM; > > diff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comp= hy_core.c > index df2460db..7272dfb9 100644 > --- a/drivers/phy/marvell/comphy_core.c > +++ b/drivers/phy/marvell/comphy_core.c > @@ -88,13 +88,13 @@ static int comphy_probe(struct udevice *dev) > int res; > > /* Save base addresses for later use */ > - chip_cfg->comphy_base_addr =3D (void *)devfdt_get_addr_index(dev,= 0); > - if (IS_ERR(chip_cfg->comphy_base_addr)) > - return PTR_ERR(chip_cfg->comphy_base_addr); > + chip_cfg->comphy_base_addr =3D devfdt_get_addr_index_ptr(dev, 0); > + if (!chip_cfg->comphy_base_addr) > + return -EINVAL; > > - chip_cfg->hpipe3_base_addr =3D (void *)devfdt_get_addr_index(dev,= 1); > - if (IS_ERR(chip_cfg->hpipe3_base_addr)) > - return PTR_ERR(chip_cfg->hpipe3_base_addr); > + chip_cfg->hpipe3_base_addr =3D devfdt_get_addr_index_ptr(dev, 1); > + if (!chip_cfg->hpipe3_base_addr) > + return -EINVAL; > > if (device_is_compatible(dev, "marvell,comphy-a3700")) { > chip_cfg->comphy_init_map =3D comphy_a3700_init_serdes_ma= p; > diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c > index 93e57a54..ce069b96 100644 > --- a/drivers/spi/cadence_qspi.c > +++ b/drivers/spi/cadence_qspi.c > @@ -377,7 +377,7 @@ static int cadence_spi_of_to_plat(struct udevice *bus= ) > struct cadence_spi_priv *priv =3D dev_get_priv(bus); > ofnode subnode; > > - plat->regbase =3D (void *)devfdt_get_addr_index(bus, 0); > + plat->regbase =3D devfdt_get_addr_index_ptr(bus, 0); > plat->ahbbase =3D devfdt_get_addr_size_index_ptr(bus, 1, &plat->a= hbsize); > plat->is_decoded_cs =3D dev_read_bool(bus, "cdns,is-decoded-cs"); > plat->fifo_depth =3D dev_read_u32_default(bus, "cdns,fifo-depth",= 128); > diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-mus= b.c > index 91042935..3be3f93d 100644 > --- a/drivers/usb/musb-new/ti-musb.c > +++ b/drivers/usb/musb-new/ti-musb.c > @@ -88,7 +88,7 @@ static int ti_musb_of_to_plat(struct udevice *dev) > int usb_index; > struct musb_hdrc_config *musb_config; > > - plat->base =3D (void *)devfdt_get_addr_index(dev, 1); > + plat->base =3D devfdt_get_addr_index_ptr(dev, 1); > > phys =3D fdtdec_lookup_phandle(fdt, node, "phys"); > ctrl_mod =3D fdtdec_lookup_phandle(fdt, phys, "ti,ctrl_mod"); > -- > 2.20.1 > --=20 Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 michael@amarulasolutions.com __________________________________ Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 info@amarulasolutions.com www.amarulasolutions.com