can: mcp251xfd: ring: update FIFO setup debug info

The recent change of the order of the TX and RX FIFOs is not reflected
in the debug info of the FIFO setup. This patch adjust the order and
additionally prints the base address of each FIFO.

Since the mcp251xfd_ring_init() may fail due to wrongly configured
FIFOs, printing of the FIFO setup is moved there. In case of an error
it would not be printed in mcp251xfd_ring_init().

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

diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c
index 8126f88d57d7e17653f4fa5eee8af18b45a317b1..9610d262e96697296210dd6a515c6b1030b64297 100644 (file)
--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c
+++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c
@@ -209,8 +209,10 @@ mcp251xfd_ring_init_rx(struct mcp251xfd_priv *priv, u16 *base, u8 *fifo_nr)
 
 int mcp251xfd_ring_init(struct mcp251xfd_priv *priv)
 {
+       const struct mcp251xfd_rx_ring *rx_ring;
        u16 base = 0, ram_used;
        u8 fifo_nr = 1;
+       int i;
 
        netdev_reset_queue(priv->ndev);
 
@@ -218,6 +220,32 @@ int mcp251xfd_ring_init(struct mcp251xfd_priv *priv)
        mcp251xfd_ring_init_rx(priv, &base, &fifo_nr);
        mcp251xfd_ring_init_tx(priv, &base, &fifo_nr);
 
+       netdev_dbg(priv->ndev,
+                  "FIFO setup: TEF:         0x%03x: %2d*%zu bytes = %4zu bytes\n",
+                  mcp251xfd_get_tef_obj_addr(0),
+                  priv->tx->obj_num, sizeof(struct mcp251xfd_hw_tef_obj),
+                  priv->tx->obj_num * sizeof(struct mcp251xfd_hw_tef_obj));
+
+       mcp251xfd_for_each_rx_ring(priv, rx_ring, i) {
+               netdev_dbg(priv->ndev,
+                          "FIFO setup: RX-%u: FIFO %u/0x%03x: %2u*%u bytes = %4u bytes\n",
+                          rx_ring->nr, rx_ring->fifo_nr,
+                          mcp251xfd_get_rx_obj_addr(rx_ring, 0),
+                          rx_ring->obj_num, rx_ring->obj_size,
+                          rx_ring->obj_num * rx_ring->obj_size);
+       }
+
+       netdev_dbg(priv->ndev,
+                  "FIFO setup: TX:   FIFO %u/0x%03x: %2u*%u bytes = %4u bytes\n",
+                  priv->tx->fifo_nr,
+                  mcp251xfd_get_tx_obj_addr(priv->tx, 0),
+                  priv->tx->obj_num, priv->tx->obj_size,
+                  priv->tx->obj_num * priv->tx->obj_size);
+
+       netdev_dbg(priv->ndev,
+                  "FIFO setup: free:                             %4u bytes\n",
+                  MCP251XFD_RAM_SIZE - (base - MCP251XFD_RAM_START));
+
        ram_used = base - MCP251XFD_RAM_START;
        if (ram_used > MCP251XFD_RAM_SIZE) {
                netdev_err(priv->ndev,
@@ -288,21 +316,5 @@ int mcp251xfd_ring_alloc(struct mcp251xfd_priv *priv)
        }
        priv->rx_ring_num = i;
 
-       netdev_dbg(priv->ndev,
-                  "FIFO setup: TEF: %d*%d bytes = %d bytes, TX: %d*%d bytes = %d bytes\n",
-                  tx_obj_num, tef_obj_size, tef_obj_size * tx_obj_num,
-                  tx_obj_num, tx_obj_size, tx_obj_size * tx_obj_num);
-
-       mcp251xfd_for_each_rx_ring(priv, rx_ring, i) {
-               netdev_dbg(priv->ndev,
-                          "FIFO setup: RX-%d: %d*%d bytes = %d bytes\n",
-                          i, rx_ring->obj_num, rx_ring->obj_size,
-                          rx_ring->obj_size * rx_ring->obj_num);
-       }
-
-       netdev_dbg(priv->ndev,
-                  "FIFO setup: free: %d bytes\n",
-                  ram_free);
-
        return 0;
 }