net: dpaa2: add adaptive interrupt coalescing

Add support for adaptive interrupt coalescing to the dpaa2-eth driver.
First of all, ETHTOOL_COALESCE_USE_ADAPTIVE_RX is defined as a supported
coalesce parameter and the requested state is configured through the
dpio APIs added in the previous patch.

Besides the ethtool API interaction, we keep track of how many bytes and
frames are dequeued per CDAN (Channel Data Availability Notification)
and update the Net DIM instance through the dpaa2_io_update_net_dim()
API.

Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
index 34f189271ef2b6801b6df3af9c30152bc684fadb..714e961e7a77a28ae861a80810cd8fc320cc9733 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -533,6 +533,7 @@ static void dpaa2_eth_rx(struct dpaa2_eth_priv *priv,
 
        percpu_stats->rx_packets++;
        percpu_stats->rx_bytes += dpaa2_fd_get_len(fd);
+       ch->stats.bytes_per_cdan += dpaa2_fd_get_len(fd);
 
        list_add_tail(&skb->list, ch->rx_list);
 
@@ -641,6 +642,7 @@ static int dpaa2_eth_consume_frames(struct dpaa2_eth_channel *ch,
 
        fq->stats.frames += cleaned;
        ch->stats.frames += cleaned;
+       ch->stats.frames_per_cdan += cleaned;
 
        /* A dequeue operation only pulls frames from a single queue
         * into the store. Return the frame queue as an out param.
@@ -1264,7 +1266,7 @@ static netdev_tx_t dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev)
 
 /* Tx confirmation frame processing routine */
 static void dpaa2_eth_tx_conf(struct dpaa2_eth_priv *priv,
-                             struct dpaa2_eth_channel *ch __always_unused,
+                             struct dpaa2_eth_channel *ch,
                              const struct dpaa2_fd *fd,
                              struct dpaa2_eth_fq *fq)
 {
@@ -1279,6 +1281,7 @@ static void dpaa2_eth_tx_conf(struct dpaa2_eth_priv *priv,
        percpu_extras = this_cpu_ptr(priv->percpu_extras);
        percpu_extras->tx_conf_frames++;
        percpu_extras->tx_conf_bytes += fd_len;
+       ch->stats.bytes_per_cdan += fd_len;
 
        /* Check frame errors in the FD field */
        fd_errors = dpaa2_fd_get_ctrl(fd) & DPAA2_FD_TX_ERR_MASK;
@@ -1601,6 +1604,12 @@ static int dpaa2_eth_poll(struct napi_struct *napi, int budget)
                }
        } while (store_cleaned);
 
+       /* Update NET DIM with the values for this CDAN */
+       dpaa2_io_update_net_dim(ch->dpio, ch->stats.frames_per_cdan,
+                               ch->stats.bytes_per_cdan);
+       ch->stats.frames_per_cdan = 0;
+       ch->stats.bytes_per_cdan = 0;
+
        /* We didn't consume the entire budget, so finish napi and
         * re-enable data availability notifications
         */

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
index 628d2d45f045db134dd96975c4d25dfdf6f4e35c..2085844227fe535d190df8ec73d52975638367d2 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
@@ -384,6 +384,8 @@ struct dpaa2_eth_ch_stats {
        __u64 xdp_redirect;
        /* Must be last, does not show up in ethtool stats */
        __u64 frames;
+       __u64 frames_per_cdan;
+       __u64 bytes_per_cdan;
 };
 
 /* Maximum number of queues associated with a DPNI */

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
index 69a6860e11fa39aabc399bb3ede4343fe95c5c14..adb8ce5306ee84240f6b8b637d1dcd64d8694d61 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
@@ -829,6 +829,7 @@ static int dpaa2_eth_get_coalesce(struct net_device *dev,
        struct dpaa2_io *dpio = priv->channel[0]->dpio;
 
        dpaa2_io_get_irq_coalescing(dpio, &ic->rx_coalesce_usecs);
+       ic->use_adaptive_rx_coalesce = dpaa2_io_get_adaptive_coalescing(dpio);
 
        return 0;
 }
@@ -840,17 +841,21 @@ static int dpaa2_eth_set_coalesce(struct net_device *dev,
 {
        struct dpaa2_eth_priv *priv = netdev_priv(dev);
        struct dpaa2_io *dpio;
+       int prev_adaptive;
        u32 prev_rx_usecs;
        int i, j, err;
 
        /* Keep track of the previous value, just in case we fail */
        dpio = priv->channel[0]->dpio;
        dpaa2_io_get_irq_coalescing(dpio, &prev_rx_usecs);
+       prev_adaptive = dpaa2_io_get_adaptive_coalescing(dpio);
 
        /* Setup new value for rx coalescing */
        for (i = 0; i < priv->num_channels; i++) {
                dpio = priv->channel[i]->dpio;
 
+               dpaa2_io_set_adaptive_coalescing(dpio,
+                                                ic->use_adaptive_rx_coalesce);
                err = dpaa2_io_set_irq_coalescing(dpio, ic->rx_coalesce_usecs);
                if (err)
                        goto restore_rx_usecs;
@@ -863,13 +868,15 @@ restore_rx_usecs:
                dpio = priv->channel[j]->dpio;
 
                dpaa2_io_set_irq_coalescing(dpio, prev_rx_usecs);
+               dpaa2_io_set_adaptive_coalescing(dpio, prev_adaptive);
        }
 
        return err;
 }
 
 const struct ethtool_ops dpaa2_ethtool_ops = {
-       .supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS,
+       .supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |
+                                    ETHTOOL_COALESCE_USE_ADAPTIVE_RX,
        .get_drvinfo = dpaa2_eth_get_drvinfo,
        .nway_reset = dpaa2_eth_nway_reset,
        .get_link = ethtool_op_get_link,