Commit 35244430 authored by Jian Shen's avatar Jian Shen Committed by David S. Miller
Browse files

net: hns3: refine the struct hane3_tc_info 



Currently, there are multiple members related to tc information
in struct hnae3_knic_private_info. Merge them into a new struct
hnae3_tc_info.

Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c0ead555

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

+8 −9
Original line number Diff line number Diff line
@@ -659,15 +659,16 @@ struct hnae3_ae_algo { 
#define HNAE3_INT_NAME_LEN        32

#define HNAE3_ITR_COUNTDOWN_START 100



#define HNAE3_MAX_TC		8

#define HNAE3_MAX_USER_PRIO	8

struct hnae3_tc_info {

	u16	tqp_offset;	/* TQP offset from base TQP */

	u16	tqp_count;	/* Total TQPs */

	u8	tc;		/* TC index */

	bool	enable;		/* If this TC is enable or not */

	u8 prio_tc[HNAE3_MAX_USER_PRIO]; /* TC indexed by prio */

	u16 tqp_count[HNAE3_MAX_TC];

	u16 tqp_offset[HNAE3_MAX_TC];

	unsigned long tc_en; /* bitmap of TC enabled */

	u8 num_tc; /* Total number of enabled TCs */

};



#define HNAE3_MAX_TC		8

#define HNAE3_MAX_USER_PRIO	8

struct hnae3_knic_private_info {

	struct net_device *netdev; /* Set by KNIC client when init instance */

	u16 rss_size;		   /* Allocated RSS queues */
@@ -676,9 +677,7 @@ struct hnae3_knic_private_info { 
	u16 num_tx_desc;

	u16 num_rx_desc;



	u8 num_tc;		   /* Total number of enabled TCs */

	u8 prio_tc[HNAE3_MAX_USER_PRIO];  /* TC indexed by prio */

	struct hnae3_tc_info tc_info[HNAE3_MAX_TC]; /* Idx of array is HW TC */

	struct hnae3_tc_info tc_info;



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

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

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

+2 −1
Original line number Diff line number Diff line
@@ -385,7 +385,8 @@ static void hns3_dbg_dev_specs(struct hnae3_handle *h) 
	dev_info(priv->dev, "RX buffer length: %u\n", kinfo->rx_buf_len);

	dev_info(priv->dev, "Desc num per TX queue: %u\n", kinfo->num_tx_desc);

	dev_info(priv->dev, "Desc num per RX queue: %u\n", kinfo->num_rx_desc);

	dev_info(priv->dev, "Total number of enabled TCs: %u\n", kinfo->num_tc);

	dev_info(priv->dev, "Total number of enabled TCs: %u\n",

		 kinfo->tc_info.num_tc);

	dev_info(priv->dev, "MAX INT QL: %u\n", dev_specs->int_ql_max);

	dev_info(priv->dev, "MAX INT GL: %u\n", dev_specs->max_int_gl);

}

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

+16 −17
Original line number Diff line number Diff line
@@ -323,13 +323,14 @@ static int hns3_nic_set_real_num_queue(struct net_device *netdev) 
{

	struct hnae3_handle *h = hns3_get_handle(netdev);

	struct hnae3_knic_private_info *kinfo = &h->kinfo;

	unsigned int queue_size = kinfo->rss_size * kinfo->num_tc;

	struct hnae3_tc_info *tc_info = &kinfo->tc_info;

	unsigned int queue_size = kinfo->rss_size * tc_info->num_tc;

	int i, ret;



	if (kinfo->num_tc <= 1) {

	if (tc_info->num_tc <= 1) {

		netdev_reset_tc(netdev);

	} else {

		ret = netdev_set_num_tc(netdev, kinfo->num_tc);

		ret = netdev_set_num_tc(netdev, tc_info->num_tc);

		if (ret) {

			netdev_err(netdev,

				   "netdev_set_num_tc fail, ret=%d!\n", ret);
@@ -337,13 +338,11 @@ static int hns3_nic_set_real_num_queue(struct net_device *netdev) 
		}



		for (i = 0; i < HNAE3_MAX_TC; i++) {

			if (!kinfo->tc_info[i].enable)

			if (!test_bit(i, &tc_info->tc_en))

				continue;



			netdev_set_tc_queue(netdev,

					    kinfo->tc_info[i].tc,

					    kinfo->tc_info[i].tqp_count,

					    kinfo->tc_info[i].tqp_offset);

			netdev_set_tc_queue(netdev, i, tc_info->tqp_count[i],

					    tc_info->tqp_offset[i]);

		}

	}
@@ -369,7 +368,7 @@ static u16 hns3_get_max_available_channels(struct hnae3_handle *h) 
	u16 alloc_tqps, max_rss_size, rss_size;



	h->ae_algo->ops->get_tqps_and_rss_info(h, &alloc_tqps, &max_rss_size);

	rss_size = alloc_tqps / h->kinfo.num_tc;

	rss_size = alloc_tqps / h->kinfo.tc_info.num_tc;



	return min_t(u16, rss_size, max_rss_size);

}
@@ -508,7 +507,7 @@ static int hns3_nic_net_open(struct net_device *netdev) 


	kinfo = &h->kinfo;

	for (i = 0; i < HNAE3_MAX_USER_PRIO; i++)

		netdev_set_prio_tc_map(netdev, i, kinfo->prio_tc[i]);

		netdev_set_prio_tc_map(netdev, i, kinfo->tc_info.prio_tc[i]);



	if (h->ae_algo->ops->set_timer_task)

		h->ae_algo->ops->set_timer_task(priv->ae_handle, true);
@@ -3980,21 +3979,20 @@ static void hns3_init_ring_hw(struct hns3_enet_ring *ring) 
static void hns3_init_tx_ring_tc(struct hns3_nic_priv *priv)

{

	struct hnae3_knic_private_info *kinfo = &priv->ae_handle->kinfo;

	struct hnae3_tc_info *tc_info = &kinfo->tc_info;

	int i;



	for (i = 0; i < HNAE3_MAX_TC; i++) {

		struct hnae3_tc_info *tc_info = &kinfo->tc_info[i];

		int j;



		if (!tc_info->enable)

		if (!test_bit(i, &tc_info->tc_en))

			continue;



		for (j = 0; j < tc_info->tqp_count; j++) {

		for (j = 0; j < tc_info->tqp_count[i]; j++) {

			struct hnae3_queue *q;



			q = priv->ring[tc_info->tqp_offset + j].tqp;

			hns3_write_dev(q, HNS3_RING_TX_RING_TC_REG,

				       tc_info->tc);

			q = priv->ring[tc_info->tqp_offset[i] + j].tqp;

			hns3_write_dev(q, HNS3_RING_TX_RING_TC_REG, i);

		}

	}

}
@@ -4121,7 +4119,8 @@ static void hns3_info_show(struct hns3_nic_priv *priv) 
	dev_info(priv->dev, "RX buffer length: %u\n", kinfo->rx_buf_len);

	dev_info(priv->dev, "Desc num per TX queue: %u\n", kinfo->num_tx_desc);

	dev_info(priv->dev, "Desc num per RX queue: %u\n", kinfo->num_rx_desc);

	dev_info(priv->dev, "Total number of enabled TCs: %u\n", kinfo->num_tc);

	dev_info(priv->dev, "Total number of enabled TCs: %u\n",

		 kinfo->tc_info.num_tc);

	dev_info(priv->dev, "Max mtu size: %u\n", priv->netdev->max_mtu);

}

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1454,7 +1454,7 @@ static void hclge_dbg_dump_qs_shaper_all(struct hclge_dev *hdev) 


		dev_info(&hdev->pdev->dev, "qs cfg of vport%d:\n", vport_id);



		for (i = 0; i < kinfo->num_tc; i++) {

		for (i = 0; i < kinfo->tc_info.num_tc; i++) {

			u16 qsid = vport->qs_offset + i;



			hclge_dbg_dump_qs_shaper_single(hdev, qsid);

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+2 −2
Original line number Diff line number Diff line
@@ -10699,7 +10699,7 @@ static u32 hclge_get_max_channels(struct hnae3_handle *handle) 
	struct hclge_dev *hdev = vport->back;



	return min_t(u32, hdev->rss_size_max,

		     vport->alloc_tqps / kinfo->num_tc);

		     vport->alloc_tqps / kinfo->tc_info.num_tc);

}



static void hclge_get_channels(struct hnae3_handle *handle,
@@ -10786,7 +10786,7 @@ out: 
		dev_info(&hdev->pdev->dev,

			 "Channels changed, rss_size from %u to %u, tqps from %u to %u",

			 cur_rss_size, kinfo->rss_size,

			 cur_tqps, kinfo->rss_size * kinfo->num_tc);

			 cur_tqps, kinfo->rss_size * kinfo->tc_info.num_tc);



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE