net: hns3: add ethtool_ops.get_coalesce support to PF

This patch adds ethtool_ops.get_coalesce support to PF.

Whilst our hardware supports per queue values, external interfaces
support only a single shared value. As such we use the values for
queue 0.

Signed-off-by: Fuyun Liang <liangfuyun1@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
index adec88d941df79a38fe80e8b4dcb88c3c336114f..0bad0e37edbda6f1131e933448f2180a453b2fe6 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
@@ -448,6 +448,8 @@ struct hnae3_knic_private_info {
        u16 num_tqps;             /* total number of TQPs in this handle */
        struct hnae3_queue **tqp;  /* array base of all TQPs in this instance */
        const struct hnae3_dcb_ops *dcb_ops;
+
+       u16 int_rl_setting;
 };
 
 struct hnae3_roce_private_info {

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
index a2a7ea3e9a3a2bd2a8c4faf5dc8c070fa3502c51..24f610970cb84c7290d60fdc24c74952ac763133 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
@@ -464,6 +464,7 @@ struct hns3_enet_ring_group {
        u16 count;
        enum hns3_flow_level_range flow_level;
        u16 int_gl;
+       u8 gl_adapt_enable;
 };
 
 struct hns3_enet_tqp_vector {

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
index f44336c6acb842057fdd5ec26b23b3eb9192c7f5..81b4b3b504ff3cca5ff83071eb88f4a6d1eac5e2 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
@@ -887,6 +887,42 @@ static void hns3_get_channels(struct net_device *netdev,
                h->ae_algo->ops->get_channels(h, ch);
 }
 
+static int hns3_get_coalesce_per_queue(struct net_device *netdev, u32 queue,
+                                      struct ethtool_coalesce *cmd)
+{
+       struct hns3_enet_tqp_vector *tx_vector, *rx_vector;
+       struct hns3_nic_priv *priv = netdev_priv(netdev);
+       struct hnae3_handle *h = priv->ae_handle;
+       u16 queue_num = h->kinfo.num_tqps;
+
+       if (queue >= queue_num) {
+               netdev_err(netdev,
+                          "Invalid queue value %d! Queue max id=%d\n",
+                          queue, queue_num - 1);
+               return -EINVAL;
+       }
+
+       tx_vector = priv->ring_data[queue].ring->tqp_vector;
+       rx_vector = priv->ring_data[queue_num + queue].ring->tqp_vector;
+
+       cmd->use_adaptive_tx_coalesce = tx_vector->tx_group.gl_adapt_enable;
+       cmd->use_adaptive_rx_coalesce = rx_vector->rx_group.gl_adapt_enable;
+
+       cmd->tx_coalesce_usecs = tx_vector->tx_group.int_gl;
+       cmd->rx_coalesce_usecs = rx_vector->rx_group.int_gl;
+
+       cmd->tx_coalesce_usecs_high = h->kinfo.int_rl_setting;
+       cmd->rx_coalesce_usecs_high = h->kinfo.int_rl_setting;
+
+       return 0;
+}
+
+static int hns3_get_coalesce(struct net_device *netdev,
+                            struct ethtool_coalesce *cmd)
+{
+       return hns3_get_coalesce_per_queue(netdev, 0, cmd);
+}
+
 static const struct ethtool_ops hns3vf_ethtool_ops = {
        .get_drvinfo = hns3_get_drvinfo,
        .get_ringparam = hns3_get_ringparam,
@@ -925,6 +961,7 @@ static const struct ethtool_ops hns3_ethtool_ops = {
        .nway_reset = hns3_nway_reset,
        .get_channels = hns3_get_channels,
        .set_channels = hns3_set_channels,
+       .get_coalesce = hns3_get_coalesce,
 };
 
 void hns3_ethtool_set_ops(struct net_device *netdev)