can: mcp251xfd: ring: mcp251xfd_ring_init(): checked RAM usage of ring setup

With this patch the usage of the on-chip RAM is checked. In the
current driver the FIFO setup is fixed and always fits into the RAM.

With an upcoming patch series the ring and FIFO setup will be more
dynamic. Although using more RAM than available should not happen, but
add this safety check, just in case.

Link: https://lore.kernel.org/all/20220217103826.2299157-6-mkl@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
index e5641696cdc26c2c7d11bb8d1173ca6bd2126e3c..2d033d12cdbb363808f5fe82416618ef9136c284 100644 (file)
--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
+++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
@@ -760,7 +760,9 @@ static int mcp251xfd_chip_start(struct mcp251xfd_priv *priv)
        if (err)
                goto out_chip_stop;
 
-       mcp251xfd_ring_init(priv);
+       err = mcp251xfd_ring_init(priv);
+       if (err)
+               goto out_chip_stop;
 
        err = mcp251xfd_chip_fifo_init(priv);
        if (err)

diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c
index 9657dbf251b0ff64c216fa4d92c1f5531d1fc8dd..8126f88d57d7e17653f4fa5eee8af18b45a317b1 100644 (file)
--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c
+++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c
@@ -207,9 +207,9 @@ mcp251xfd_ring_init_rx(struct mcp251xfd_priv *priv, u16 *base, u8 *fifo_nr)
        }
 }
 
-void mcp251xfd_ring_init(struct mcp251xfd_priv *priv)
+int mcp251xfd_ring_init(struct mcp251xfd_priv *priv)
 {
-       u16 base = 0;
+       u16 base = 0, ram_used;
        u8 fifo_nr = 1;
 
        netdev_reset_queue(priv->ndev);
@@ -217,6 +217,16 @@ void mcp251xfd_ring_init(struct mcp251xfd_priv *priv)
        mcp251xfd_ring_init_tef(priv, &base);
        mcp251xfd_ring_init_rx(priv, &base, &fifo_nr);
        mcp251xfd_ring_init_tx(priv, &base, &fifo_nr);
+
+       ram_used = base - MCP251XFD_RAM_START;
+       if (ram_used > MCP251XFD_RAM_SIZE) {
+               netdev_err(priv->ndev,
+                          "Error during ring configuration, using more RAM (%u bytes) than available (%u bytes).\n",
+                          ram_used, MCP251XFD_RAM_SIZE);
+               return -ENOMEM;
+       }
+
+       return 0;
 }
 
 void mcp251xfd_ring_free(struct mcp251xfd_priv *priv)

diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd.h b/drivers/net/can/spi/mcp251xfd/mcp251xfd.h
index 8ee959890aea41f68ff3d5ca6e51841f8c67361b..58e76064cf9e5d576c4eb72f6a26f11005360396 100644 (file)
--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd.h
+++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd.h
@@ -882,7 +882,7 @@ u16 mcp251xfd_crc16_compute2(const void *cmd, size_t cmd_size,
                             const void *data, size_t data_size);
 u16 mcp251xfd_crc16_compute(const void *data, size_t data_size);
 int mcp251xfd_regmap_init(struct mcp251xfd_priv *priv);
-void mcp251xfd_ring_init(struct mcp251xfd_priv *priv);
+int mcp251xfd_ring_init(struct mcp251xfd_priv *priv);
 void mcp251xfd_ring_free(struct mcp251xfd_priv *priv);
 int mcp251xfd_ring_alloc(struct mcp251xfd_priv *priv);
 int mcp251xfd_handle_rxif(struct mcp251xfd_priv *priv);