net: hns3: add ethtool support for CQE/EQE mode configuration

Add support in ethtool for switching EQE/CQE mode.

Signed-off-by: Yufeng Mo <moyufeng@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 1bd83d742ea7274ff52d48a4ddab827a09b099ec..39d01ca026da686fa6e5a9246b36bd4413da539a 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -5055,9 +5055,9 @@ static void hns3_set_cq_period_mode(struct hns3_nic_priv *priv,
        }
 }
 
-static void hns3_cq_period_mode_init(struct hns3_nic_priv *priv,
-                                    enum dim_cq_period_mode tx_mode,
-                                    enum dim_cq_period_mode rx_mode)
+void hns3_cq_period_mode_init(struct hns3_nic_priv *priv,
+                             enum dim_cq_period_mode tx_mode,
+                             enum dim_cq_period_mode rx_mode)
 {
        hns3_set_cq_period_mode(priv, tx_mode, true);
        hns3_set_cq_period_mode(priv, rx_mode, false);

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
index ff45825b4b1c86af7431e017cffbd60b88e87ce6..dfad9060c284d4cf7dba070d6ccd08cc8cce62b4 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
@@ -718,4 +718,7 @@ void hns3_dbg_register_debugfs(const char *debugfs_dir_name);
 void hns3_dbg_unregister_debugfs(void);
 void hns3_shinfo_pack(struct skb_shared_info *shinfo, __u32 *size);
 u16 hns3_get_max_available_channels(struct hnae3_handle *h);
+void hns3_cq_period_mode_init(struct hns3_nic_priv *priv,
+                             enum dim_cq_period_mode tx_mode,
+                             enum dim_cq_period_mode rx_mode);
 #endif

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
index 049be076fd1857c84bf7f58c36f339a459b3356d..b8d9851aefc56a9a2e2c0c56bac1938756092edf 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
@@ -1203,6 +1203,11 @@ static int hns3_get_coalesce(struct net_device *netdev,
        cmd->tx_max_coalesced_frames = tx_coal->int_ql;
        cmd->rx_max_coalesced_frames = rx_coal->int_ql;
 
+       kernel_coal->use_cqe_mode_tx = (priv->tx_cqe_mode ==
+                                       DIM_CQ_PERIOD_MODE_START_FROM_CQE);
+       kernel_coal->use_cqe_mode_rx = (priv->rx_cqe_mode ==
+                                       DIM_CQ_PERIOD_MODE_START_FROM_CQE);
+
        return 0;
 }
 
@@ -1372,6 +1377,8 @@ static int hns3_set_coalesce(struct net_device *netdev,
        struct hns3_enet_coalesce *tx_coal = &priv->tx_coal;
        struct hns3_enet_coalesce *rx_coal = &priv->rx_coal;
        u16 queue_num = h->kinfo.num_tqps;
+       enum dim_cq_period_mode tx_mode;
+       enum dim_cq_period_mode rx_mode;
        int ret;
        int i;
 
@@ -1397,6 +1404,14 @@ static int hns3_set_coalesce(struct net_device *netdev,
        for (i = 0; i < queue_num; i++)
                hns3_set_coalesce_per_queue(netdev, cmd, i);
 
+       tx_mode = kernel_coal->use_cqe_mode_tx ?
+                 DIM_CQ_PERIOD_MODE_START_FROM_CQE :
+                 DIM_CQ_PERIOD_MODE_START_FROM_EQE;
+       rx_mode = kernel_coal->use_cqe_mode_rx ?
+                 DIM_CQ_PERIOD_MODE_START_FROM_CQE :
+                 DIM_CQ_PERIOD_MODE_START_FROM_EQE;
+       hns3_cq_period_mode_init(priv, tx_mode, rx_mode);
+
        return 0;
 }
 
@@ -1702,7 +1717,8 @@ static int hns3_set_tunable(struct net_device *netdev,
                                 ETHTOOL_COALESCE_USE_ADAPTIVE |        \
                                 ETHTOOL_COALESCE_RX_USECS_HIGH |       \
                                 ETHTOOL_COALESCE_TX_USECS_HIGH |       \
-                                ETHTOOL_COALESCE_MAX_FRAMES)
+                                ETHTOOL_COALESCE_MAX_FRAMES |          \
+                                ETHTOOL_COALESCE_USE_CQE)
 
 static int hns3_get_ts_info(struct net_device *netdev,
                            struct ethtool_ts_info *info)