On 1/22/21 4:01 AM, Su Yanjun wrote:
> The sizeof(u32) is hardcoded. It's better to use the config value in
> regmap.
>
> It increases the size of target object, but it's flexible when new mcp chip
> need other val_bytes.
>
> Signed-off-by: Su Yanjun <suyanjun...@gmail.com>
> ---
> drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
> b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
> index f07e8b737d31..3dde52669343 100644
> --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
> +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
> @@ -1308,6 +1308,7 @@ mcp251xfd_tef_obj_read(const struct mcp251xfd_priv
> *priv,
> const u8 offset, const u8 len)
> {
> const struct mcp251xfd_tx_ring *tx_ring = priv->tx;
> + int val_bytes = regmap_get_val_bytes(priv->map_reg);
You're using the wrong regmap here.
>
> if (IS_ENABLED(CONFIG_CAN_MCP251XFD_SANITY) &&
> (offset > tx_ring->obj_num ||
> @@ -1322,7 +1323,7 @@ mcp251xfd_tef_obj_read(const struct mcp251xfd_priv
> *priv,
> return regmap_bulk_read(priv->map_rx,
> mcp251xfd_get_tef_obj_addr(offset),
> hw_tef_obj,
> - sizeof(*hw_tef_obj) / sizeof(u32) * len);
> + sizeof(*hw_tef_obj) / val_bytes * len);
> }
>
> static int mcp251xfd_handle_tefif(struct mcp251xfd_priv *priv)
> @@ -1511,11 +1512,12 @@ mcp251xfd_rx_obj_read(const struct mcp251xfd_priv
> *priv,
> const u8 offset, const u8 len)
> {
> int err;
> + int val_bytes = regmap_get_val_bytes(priv->map_reg);
You're using the wrong regmap here.
>
> err = regmap_bulk_read(priv->map_rx,
> mcp251xfd_get_rx_obj_addr(ring, offset),
> hw_rx_obj,
> - len * ring->obj_size / sizeof(u32));
> + len * ring->obj_size / val_bytes);
>
> return err;
> }
> @@ -2139,6 +2141,7 @@ static irqreturn_t mcp251xfd_irq(int irq, void *dev_id)
> struct mcp251xfd_priv *priv = dev_id;
> irqreturn_t handled = IRQ_NONE;
> int err;
> + int val_bytes = regmap_get_val_bytes(priv->map_reg);
>
> if (priv->rx_int)
> do {
> @@ -2162,7 +2165,7 @@ static irqreturn_t mcp251xfd_irq(int irq, void *dev_id)
> err = regmap_bulk_read(priv->map_reg, MCP251XFD_REG_INT,
> &priv->regs_status,
> sizeof(priv->regs_status) /
> - sizeof(u32));
> + val_bytes);
> if (err)
> goto out_fail;
>
>
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
signature.asc
Description: OpenPGP digital signature
