From: Johan Jonker <jbx6244@gmail.com>
To: dario.binacchi@amarulasolutions.com,
michael@amarulasolutions.com, sjg@chromium.org,
philipp.tomsich@vrull.eu, kever.yang@rock-chips.com
Cc: u-boot@lists.denx.de, yifeng.zhao@rock-chips.com
Subject: [PATCH v8 17/24] drivers: use dev_read_addr_index_ptr when cast to pointer
Date: Mon, 13 Mar 2023 01:31:49 +0100 [thread overview]
Message-ID: <b39e8ec5-0e7a-2ecc-3bf6-b266a2063737@gmail.com> (raw)
In-Reply-To: <be3c5f12-9df4-0a52-4858-c44d848e9147@gmail.com>
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
dev_read_addr_index_ptr instead of the dev_read_addr_index function
in the various files in the drivers directory that cast to a pointer.
As we are there also streamline the error response to -EINVAL on return.
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com>
---
Changed V6:
use -EINVAL on return
drop cast
---
drivers/mtd/nand/raw/cortina_nand.c | 4 ++--
drivers/net/dm9000x.c | 2 +-
drivers/net/dwmac_meson8b.c | 4 ++--
drivers/pci/pcie_dw_meson.c | 8 ++++----
drivers/pci/pcie_dw_rockchip.c | 8 ++++----
drivers/watchdog/sbsa_gwdt.c | 12 ++++++------
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/mtd/nand/raw/cortina_nand.c b/drivers/mtd/nand/raw/cortina_nand.c
index 88798f23..8de35731 100644
--- a/drivers/mtd/nand/raw/cortina_nand.c
+++ b/drivers/mtd/nand/raw/cortina_nand.c
@@ -1175,8 +1175,8 @@ static int fdt_decode_nand(struct udevice *dev, struct nand_drv *info)
int ecc_strength;
info->reg = (struct nand_ctlr *)dev_read_addr(dev);
- info->dma_glb = (struct dma_global *)dev_read_addr_index(dev, 1);
- info->dma_nand = (struct dma_ssp *)dev_read_addr_index(dev, 2);
+ info->dma_glb = dev_read_addr_index_ptr(dev, 1);
+ info->dma_nand = dev_read_addr_index_ptr(dev, 2);
info->config.enabled = dev_read_enabled(dev);
ecc_strength = dev_read_u32_default(dev, "nand-ecc-strength", 16);
info->flash_base =
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index b46bdeb2..bec8d67d 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -651,7 +651,7 @@ static int dm9000_of_to_plat(struct udevice *dev)
pdata->iobase = dev_read_addr_index(dev, 0);
db->base_io = (void __iomem *)pdata->iobase;
- db->base_data = (void __iomem *)dev_read_addr_index(dev, 1);
+ db->base_data = dev_read_addr_index_ptr(dev, 1);
return 0;
}
diff --git a/drivers/net/dwmac_meson8b.c b/drivers/net/dwmac_meson8b.c
index ddbaa87d..871171e1 100644
--- a/drivers/net/dwmac_meson8b.c
+++ b/drivers/net/dwmac_meson8b.c
@@ -41,8 +41,8 @@ static int dwmac_meson8b_of_to_plat(struct udevice *dev)
{
struct dwmac_meson8b_plat *pdata = dev_get_plat(dev);
- pdata->regs = (void *)dev_read_addr_index(dev, 1);
- if ((fdt_addr_t)pdata->regs == FDT_ADDR_T_NONE)
+ pdata->regs = dev_read_addr_index_ptr(dev, 1);
+ if (!pdata->regs)
return -EINVAL;
pdata->dwmac_setup = (void *)dev_get_driver_data(dev);
diff --git a/drivers/pci/pcie_dw_meson.c b/drivers/pci/pcie_dw_meson.c
index 07da9fa5..f9537979 100644
--- a/drivers/pci/pcie_dw_meson.c
+++ b/drivers/pci/pcie_dw_meson.c
@@ -337,15 +337,15 @@ static int meson_pcie_parse_dt(struct udevice *dev)
struct meson_pcie *priv = dev_get_priv(dev);
int ret;
- priv->dw.dbi_base = (void *)dev_read_addr_index(dev, 0);
+ priv->dw.dbi_base = dev_read_addr_index_ptr(dev, 0);
if (!priv->dw.dbi_base)
- return -ENODEV;
+ return -EINVAL;
dev_dbg(dev, "ELBI address is 0x%p\n", priv->dw.dbi_base);
- priv->meson_cfg_base = (void *)dev_read_addr_index(dev, 1);
+ priv->meson_cfg_base = dev_read_addr_index_ptr(dev, 1);
if (!priv->meson_cfg_base)
- return -ENODEV;
+ return -EINVAL;
dev_dbg(dev, "CFG address is 0x%p\n", priv->meson_cfg_base);
diff --git a/drivers/pci/pcie_dw_rockchip.c b/drivers/pci/pcie_dw_rockchip.c
index 9322e735..624ca1cb 100644
--- a/drivers/pci/pcie_dw_rockchip.c
+++ b/drivers/pci/pcie_dw_rockchip.c
@@ -353,15 +353,15 @@ static int rockchip_pcie_parse_dt(struct udevice *dev)
struct rk_pcie *priv = dev_get_priv(dev);
int ret;
- priv->dw.dbi_base = (void *)dev_read_addr_index(dev, 0);
+ priv->dw.dbi_base = dev_read_addr_index_ptr(dev, 0);
if (!priv->dw.dbi_base)
- return -ENODEV;
+ return -EINVAL;
dev_dbg(dev, "DBI address is 0x%p\n", priv->dw.dbi_base);
- priv->apb_base = (void *)dev_read_addr_index(dev, 1);
+ priv->apb_base = dev_read_addr_index_ptr(dev, 1);
if (!priv->apb_base)
- return -ENODEV;
+ return -EINVAL;
dev_dbg(dev, "APB address is 0x%p\n", priv->apb_base);
diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
index f43cd3fd..96d04665 100644
--- a/drivers/watchdog/sbsa_gwdt.c
+++ b/drivers/watchdog/sbsa_gwdt.c
@@ -98,13 +98,13 @@ static int sbsa_gwdt_of_to_plat(struct udevice *dev)
{
struct sbsa_gwdt_priv *priv = dev_get_priv(dev);
- priv->reg_control = (void __iomem *)dev_read_addr_index(dev, 0);
- if (IS_ERR(priv->reg_control))
- return PTR_ERR(priv->reg_control);
+ priv->reg_control = dev_read_addr_index_ptr(dev, 0);
+ if (!priv->reg_control)
+ return -EINVAL;
- priv->reg_refresh = (void __iomem *)dev_read_addr_index(dev, 1);
- if (IS_ERR(priv->reg_refresh))
- return PTR_ERR(priv->reg_refresh);
+ priv->reg_refresh = dev_read_addr_index_ptr(dev, 1);
+ if (!priv->reg_refresh)
+ return -EINVAL;
return 0;
}
--
2.20.1
next prev parent reply other threads:[~2023-03-13 0:32 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-13 0:23 [PATCH v8 00/24] Fixes for Rockchip NFC driver part 1 Johan Jonker
2023-03-13 0:28 ` [PATCH v8 01/24] mtd: nand: raw: rockchip_nfc: use dev_read_addr_ptr Johan Jonker
2023-03-13 0:28 ` [PATCH v8 02/24] mtd: nand: raw: rockchip_nfc: remove the compatible string "rockchip,rk3308-nfc" Johan Jonker
2023-03-13 0:28 ` [PATCH v8 03/24] mtd: nand: raw: rockchip_nfc: add layout structure Johan Jonker
2023-03-13 0:28 ` [PATCH v8 04/24] mtd: nand: raw: rockchip_nfc: add flash_node to chip structure Johan Jonker
2023-03-13 0:29 ` [PATCH v8 05/24] mtd: nand: raw: rockchip_nfc: fix oobfree offset and description Johan Jonker
2023-03-13 0:29 ` [PATCH v8 06/24] mtd: nand: add support for the Sandisk SDTNQGAMA chip Johan Jonker
2023-03-13 0:29 ` [PATCH v8 07/24] rockchip: adc: rockchip-saradc: use dev_read_addr_ptr Johan Jonker
2023-03-13 0:29 ` [PATCH v8 08/24] rockchip: timer: dw-apb-timer: use regs variable with uintptr_t size Johan Jonker
2023-03-13 3:10 ` Simon Glass
2023-03-13 0:30 ` [PATCH v8 09/24] rockchip: pwm: rk_pwm: use base " Johan Jonker
2023-03-13 3:10 ` Simon Glass
2023-03-13 0:30 ` [PATCH v8 10/24] rockchip: spi: rk_spi: " Johan Jonker
2023-03-13 3:10 ` Simon Glass
2023-03-13 0:30 ` [PATCH v8 11/24] include: dm: ofnode: fix headers Johan Jonker
2023-03-13 0:30 ` [PATCH v8 12/24] core: remap: fix regmap_init_mem_plat() reg size handeling Johan Jonker
2023-03-13 3:10 ` Simon Glass
2023-03-13 0:30 ` [PATCH v8 13/24] rockchip: rk3288: syscon_rk3288: store syscon platdata in regmap Johan Jonker
2023-03-13 3:10 ` Simon Glass
2023-03-13 12:15 ` Johan Jonker
2023-03-13 13:26 ` John Keeping
2023-03-13 16:53 ` Johan Jonker
2023-03-13 17:46 ` John Keeping
2023-03-13 21:09 ` Johan Jonker
2023-03-14 18:28 ` John Keeping
2023-03-13 0:31 ` [PATCH v8 14/24] core: fdtaddr: add devfdt_get_addr_size_index_ptr function Johan Jonker
2023-03-13 0:31 ` [PATCH v8 15/24] core: read: add dev_read_addr_index_ptr function Johan Jonker
2023-03-13 0:31 ` [PATCH v8 16/24] spi: spi-aspeed-smc: use devfdt_get_addr_index_ptr Johan Jonker
2023-03-13 0:31 ` Johan Jonker [this message]
2023-03-13 3:10 ` [PATCH v8 17/24] drivers: use dev_read_addr_index_ptr when cast to pointer Simon Glass
2023-03-13 0:32 ` [PATCH v8 18/24] drivers: use dev_read_addr_ptr " Johan Jonker
2023-03-13 0:32 ` [PATCH v8 19/24] drivers: use devfdt_get_addr_size_index_ptr " Johan Jonker
2023-03-13 0:32 ` [PATCH v8 20/24] drivers: use devfdt_get_addr_index_ptr " Johan Jonker
2023-03-13 0:32 ` [PATCH v8 21/24] drivers: use devfdt_get_addr_ptr " Johan Jonker
2023-03-13 0:32 ` [PATCH v8 22/24] drivers: fix debug string with fdt_addr_t input Johan Jonker
2023-03-13 0:33 ` [PATCH v8 23/24] arm: stm32mp: spl: fix function " Johan Jonker
2023-03-13 0:33 ` [PATCH v8 24/24] include: fdtdec: decouple fdt_addr_t and phys_addr_t size Johan Jonker
2023-04-21 3:15 ` [PATCH v8 00/24] Fixes for Rockchip NFC driver part 1 Kever Yang
2023-04-21 15:33 ` [PATCH v9] core: fdtaddr: add devfdt_get_addr_size_index_ptr function Johan Jonker
2023-04-21 15:34 ` [PATCH v8 00/24] Fixes for Rockchip NFC driver part 1 Johan Jonker
2023-04-22 20:33 ` Johan Jonker
2023-04-23 1:51 ` Kever Yang
2023-04-23 9:24 ` Johan Jonker
2023-04-24 23:33 ` Simon Glass
2023-04-23 9:19 ` [PATCH v9] core: fdtaddr: use map_sysmem() as cast for the return Johan Jonker
2023-04-24 19:42 ` Simon Glass
2023-04-28 19:20 ` Simon Glass
2023-04-28 19:26 ` Simon Glass
2023-05-10 21:48 ` [PATCH v10] core: fdtaddr: use map_sysmem() as cast for the return (part 2) Johan Jonker
2023-05-11 7:12 ` Kever Yang
2023-05-11 8:03 ` Johan Jonker
2023-05-16 15:19 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b39e8ec5-0e7a-2ecc-3bf6-b266a2063737@gmail.com \
--to=jbx6244@gmail.com \
--cc=dario.binacchi@amarulasolutions.com \
--cc=kever.yang@rock-chips.com \
--cc=michael@amarulasolutions.com \
--cc=philipp.tomsich@vrull.eu \
--cc=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
--cc=yifeng.zhao@rock-chips.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).