can: mcp251xfd: add TX IRQ coalescing ethtool support

This patch adds support ethtool based configuration for the TX IRQ
coalescing added in the previous patch.

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

diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-ethtool.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-ethtool.c
index 6e49cf3411a2a7ad2c0c22496e3b90dfb55b5ae6..6c7a57f16cc6c1120d762c82853094eb64abb0ec 100644 (file)
--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-ethtool.c
+++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-ethtool.c
@@ -58,7 +58,7 @@ static int mcp251xfd_ring_get_coalesce(struct net_device *ndev,
                                       struct netlink_ext_ack *ext_ack)
 {
        struct mcp251xfd_priv *priv = netdev_priv(ndev);
-       u32 rx_max_frames;
+       u32 rx_max_frames, tx_max_frames;
 
        /* The ethtool doc says:
         * To disable coalescing, set usecs = 0 and max_frames = 1.
@@ -71,6 +71,14 @@ static int mcp251xfd_ring_get_coalesce(struct net_device *ndev,
        ec->rx_max_coalesced_frames_irq = rx_max_frames;
        ec->rx_coalesce_usecs_irq = priv->rx_coalesce_usecs_irq;
 
+       if (priv->tx_obj_num_coalesce_irq == 0)
+               tx_max_frames = 1;
+       else
+               tx_max_frames = priv->tx_obj_num_coalesce_irq;
+
+       ec->tx_max_coalesced_frames_irq = tx_max_frames;
+       ec->tx_coalesce_usecs_irq = priv->tx_coalesce_usecs_irq;
+
        return 0;
 }
 
@@ -90,21 +98,28 @@ static int mcp251xfd_ring_set_coalesce(struct net_device *ndev,
        can_ram_get_layout(&layout, &mcp251xfd_ram_config, &ring, ec, fd_mode);
 
        if ((layout.rx_coalesce != priv->rx_obj_num_coalesce_irq ||
-            ec->rx_coalesce_usecs_irq != priv->rx_coalesce_usecs_irq) &&
+            ec->rx_coalesce_usecs_irq != priv->rx_coalesce_usecs_irq ||
+            layout.tx_coalesce != priv->tx_obj_num_coalesce_irq ||
+            ec->tx_coalesce_usecs_irq != priv->tx_coalesce_usecs_irq) &&
            netif_running(ndev))
                return -EBUSY;
 
        priv->rx_obj_num = layout.cur_rx;
        priv->rx_obj_num_coalesce_irq = layout.rx_coalesce;
        priv->rx_coalesce_usecs_irq = ec->rx_coalesce_usecs_irq;
+
        priv->tx->obj_num = layout.cur_tx;
+       priv->tx_obj_num_coalesce_irq = layout.tx_coalesce;
+       priv->tx_coalesce_usecs_irq = ec->tx_coalesce_usecs_irq;
 
        return 0;
 }
 
 static const struct ethtool_ops mcp251xfd_ethtool_ops = {
        .supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS_IRQ |
-               ETHTOOL_COALESCE_RX_MAX_FRAMES_IRQ,
+               ETHTOOL_COALESCE_RX_MAX_FRAMES_IRQ |
+               ETHTOOL_COALESCE_TX_USECS_IRQ |
+               ETHTOOL_COALESCE_TX_MAX_FRAMES_IRQ,
        .get_ringparam = mcp251xfd_ring_get_ringparam,
        .set_ringparam = mcp251xfd_ring_set_ringparam,
        .get_coalesce = mcp251xfd_ring_get_coalesce,
@@ -122,5 +137,7 @@ void mcp251xfd_ethtool_init(struct mcp251xfd_priv *priv)
        priv->tx->obj_num = layout.default_tx;
 
        priv->rx_obj_num_coalesce_irq = 0;
+       priv->tx_obj_num_coalesce_irq = 0;
        priv->rx_coalesce_usecs_irq = 0;
+       priv->tx_coalesce_usecs_irq = 0;
 }

diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c
index 3037ad3dd46be173c0897a35cd34da751e1f1ac1..bf3f0f150199d0dd21b32a10e89b1a824378262a 100644 (file)
--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c
+++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c
@@ -442,6 +442,7 @@ const struct can_ram_config mcp251xfd_ram_config = {
                .def[CAN_RAM_MODE_CANFD] = MCP251XFD_TX_OBJ_NUM_CANFD_DEFAULT,
                .fifo_num = MCP251XFD_FIFO_TX_NUM,
                .fifo_depth_min = MCP251XFD_TX_FIFO_DEPTH_MIN,
+               .fifo_depth_coalesce_min = MCP251XFD_TX_FIFO_DEPTH_COALESCE_MIN,
        },
        .size = MCP251XFD_RAM_SIZE,
        .fifo_depth = MCP251XFD_FIFO_DEPTH,

diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd.h b/drivers/net/can/spi/mcp251xfd/mcp251xfd.h
index ee2c93ddc5ede7d1738568c1374cb9e965c7655f..c6cb8c3391b3ab8b12ec4e28925b808bf7918548 100644 (file)
--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd.h
+++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd.h
@@ -413,6 +413,7 @@ static_assert(MCP251XFD_TIMESTAMP_WORK_DELAY_SEC <
 #define MCP251XFD_TX_OBJ_NUM_CAN_DEFAULT 8U
 #define MCP251XFD_TX_OBJ_NUM_CANFD_DEFAULT 4U
 #define MCP251XFD_TX_FIFO_DEPTH_MIN 2U
+#define MCP251XFD_TX_FIFO_DEPTH_COALESCE_MIN 2U
 
 static_assert(MCP251XFD_FIFO_TEF_NUM == 1U);
 static_assert(MCP251XFD_FIFO_TEF_NUM == MCP251XFD_FIFO_TX_NUM);