net: hns: add get_coalesce_range api for hns

This patch adds get_coalesce_range api for hns, it shows
range of coalesce usecs and frames that can be set on
this interface.

Signed-off-by: Daode Huang <huangdaode@hisilicon.com>
Signed-off-by: Yisen Zhuang <Yisen.Zhuang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.h b/drivers/net/ethernet/hisilicon/hns/hnae.h
index 529cb1341270bf2398563fc38988ccd499674f81..962e445ee83fcaedfbdc705734b00a9860f6555e 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hnae.h
+++ b/drivers/net/ethernet/hisilicon/hns/hnae.h
@@ -473,6 +473,11 @@ struct hnae_ae_ops {
        int (*set_coalesce_usecs)(struct hnae_handle *handle, u32 timeout);
        int (*set_coalesce_frames)(struct hnae_handle *handle,
                                   u32 coalesce_frames);
+       void (*get_coalesce_range)(struct hnae_handle *handle,
+                                  u32 *tx_frames_low, u32 *rx_frames_low,
+                                  u32 *tx_frames_high, u32 *rx_frames_high,
+                                  u32 *tx_usecs_low, u32 *rx_usecs_low,
+                                  u32 *tx_usecs_high, u32 *rx_usecs_high);
        void (*set_promisc_mode)(struct hnae_handle *handle, u32 en);
        int (*get_mac_addr)(struct hnae_handle *handle, void **p);
        int (*set_mac_addr)(struct hnae_handle *handle, void *p);

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
index b97cc754bfae35bf791fdd13607d3fcc2dc207ec..6b3796f1b30f98441dd68d8339e1fbe1f013e2e0 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
@@ -465,6 +465,30 @@ static int  hns_ae_set_coalesce_frames(struct hnae_handle *handle,
                ring_pair->port_id_in_comm, coalesce_frames);
 }
 
+static void hns_ae_get_coalesce_range(struct hnae_handle *handle,
+                                     u32 *tx_frames_low, u32 *rx_frames_low,
+                                     u32 *tx_frames_high, u32 *rx_frames_high,
+                                     u32 *tx_usecs_low, u32 *rx_usecs_low,
+                                     u32 *tx_usecs_high, u32 *rx_usecs_high)
+{
+       struct dsaf_device *dsaf_dev;
+
+       dsaf_dev = hns_ae_get_dsaf_dev(handle->dev);
+
+       *tx_frames_low  = HNS_RCB_MIN_COALESCED_FRAMES;
+       *rx_frames_low  = HNS_RCB_MIN_COALESCED_FRAMES;
+       *tx_frames_high =
+               (dsaf_dev->desc_num - 1 > HNS_RCB_MAX_COALESCED_FRAMES) ?
+               HNS_RCB_MAX_COALESCED_FRAMES : dsaf_dev->desc_num - 1;
+       *rx_frames_high =
+               (dsaf_dev->desc_num - 1 > HNS_RCB_MAX_COALESCED_FRAMES) ?
+                HNS_RCB_MAX_COALESCED_FRAMES : dsaf_dev->desc_num - 1;
+       *tx_usecs_low   = 0;
+       *rx_usecs_low   = 0;
+       *tx_usecs_high  = HNS_RCB_MAX_COALESCED_USECS;
+       *rx_usecs_high  = HNS_RCB_MAX_COALESCED_USECS;
+}
+
 void hns_ae_update_stats(struct hnae_handle *handle,
                         struct net_device_stats *net_stats)
 {
@@ -798,6 +822,7 @@ static struct hnae_ae_ops hns_dsaf_ops = {
        .get_rx_max_coalesced_frames = hns_ae_get_rx_max_coalesced_frames,
        .set_coalesce_usecs = hns_ae_set_coalesce_usecs,
        .set_coalesce_frames = hns_ae_set_coalesce_frames,
+       .get_coalesce_range = hns_ae_get_coalesce_range,
        .set_promisc_mode = hns_ae_set_promisc_mode,
        .set_mac_addr = hns_ae_set_mac_address,
        .set_mc_addr = hns_ae_set_multicast_one,

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
index 564ae1ec6aa8813bfd9a96a78fb5d234690f640c..a395ca1405c3e437317702df66a614167efabaf1 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
@@ -751,6 +751,16 @@ static int hns_get_coalesce(struct net_device *net_dev,
                &ec->tx_max_coalesced_frames,
                &ec->rx_max_coalesced_frames);
 
+       ops->get_coalesce_range(priv->ae_handle,
+                               &ec->tx_max_coalesced_frames_low,
+                               &ec->rx_max_coalesced_frames_low,
+                               &ec->tx_max_coalesced_frames_high,
+                               &ec->rx_max_coalesced_frames_high,
+                               &ec->tx_coalesce_usecs_low,
+                               &ec->rx_coalesce_usecs_low,
+                               &ec->tx_coalesce_usecs_high,
+                               &ec->rx_coalesce_usecs_high);
+
        return 0;
 }