Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e96adc4 authored by Fuyun Liang's avatar Fuyun Liang Committed by David S. Miller
Browse files

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: default avatarFuyun Liang <liangfuyun1@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 27cdfed0

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -448,6 +448,8 @@ struct hnae3_knic_private_info { 
	u16 num_tqps;		  /* total number of TQPs in this handle */

	u16 num_tqps;		  /* total number of TQPs in this handle */

	struct hnae3_queue **tqp;  /* array base of all TQPs in this instance */

	struct hnae3_queue **tqp;  /* array base of all TQPs in this instance */

	const struct hnae3_dcb_ops *dcb_ops;

	const struct hnae3_dcb_ops *dcb_ops;



	u16 int_rl_setting;

};

};





struct hnae3_roce_private_info {

struct hnae3_roce_private_info {

drivers/net/ethernet/hisilicon/hns3/hns3_enet.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -464,6 +464,7 @@ struct hns3_enet_ring_group { 
	u16 count;

	u16 count;

	enum hns3_flow_level_range flow_level;

	enum hns3_flow_level_range flow_level;

	u16 int_gl;

	u16 int_gl;

	u8 gl_adapt_enable;

};

};





struct hns3_enet_tqp_vector {

struct hns3_enet_tqp_vector {

drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c

+37 −0
Original line number Original line Diff line number Diff line
@@ -887,6 +887,42 @@ static void hns3_get_channels(struct net_device *netdev, 
		h->ae_algo->ops->get_channels(h, ch);

		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 = {

static const struct ethtool_ops hns3vf_ethtool_ops = {

	.get_drvinfo = hns3_get_drvinfo,

	.get_drvinfo = hns3_get_drvinfo,

	.get_ringparam = hns3_get_ringparam,

	.get_ringparam = hns3_get_ringparam,
@@ -925,6 +961,7 @@ static const struct ethtool_ops hns3_ethtool_ops = { 
	.nway_reset = hns3_nway_reset,

	.nway_reset = hns3_nway_reset,

	.get_channels = hns3_get_channels,

	.get_channels = hns3_get_channels,

	.set_channels = hns3_set_channels,

	.set_channels = hns3_set_channels,

	.get_coalesce = hns3_get_coalesce,

};

};





void hns3_ethtool_set_ops(struct net_device *netdev)

void hns3_ethtool_set_ops(struct net_device *netdev)