Commit 66aeec85 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hns3-next' 



Guangbin Huang says:

====================
net: hns3: updates for -next

This series includes some optimization in IO path for the HNS3 ethernet
driver.
====================

Cc: Loic Poulain <loic.poulain@linaro.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarStephan Gerhold <stephan@gerhold.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a078d981 99f6b5fb

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

+1 −7
Original line number Diff line number Diff line
@@ -159,13 +159,6 @@ enum HNAE3_PF_CAP_BITS { 
#define ring_ptr_move_bw(ring, p) \

	((ring)->p = ((ring)->p - 1 + (ring)->desc_num) % (ring)->desc_num)



enum hns_desc_type {

	DESC_TYPE_UNKNOWN,

	DESC_TYPE_SKB,

	DESC_TYPE_FRAGLIST_SKB,

	DESC_TYPE_PAGE,

};



struct hnae3_handle;



struct hnae3_queue {
@@ -767,6 +760,7 @@ struct hnae3_knic_private_info { 
	u16 rx_buf_len;

	u16 num_tx_desc;

	u16 num_rx_desc;

	u32 tx_spare_buf_size;



	struct hnae3_tc_info tc_info;

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

+54 −0
Original line number Diff line number Diff line
@@ -392,6 +392,56 @@ static void hns3_dbg_fill_content(char *content, u16 len, 
	*pos++ = '\0';

}



static const struct hns3_dbg_item tx_spare_info_items[] = {

	{ "QUEUE_ID", 2 },

	{ "COPYBREAK", 2 },

	{ "LEN", 7 },

	{ "NTU", 4 },

	{ "NTC", 4 },

	{ "LTC", 4 },

	{ "DMA", 17 },

};



static void hns3_dbg_tx_spare_info(struct hns3_enet_ring *ring, char *buf,

				   int len, u32 ring_num, int *pos)

{

	char data_str[ARRAY_SIZE(tx_spare_info_items)][HNS3_DBG_DATA_STR_LEN];

	struct hns3_tx_spare *tx_spare = ring->tx_spare;

	char *result[ARRAY_SIZE(tx_spare_info_items)];

	char content[HNS3_DBG_INFO_LEN];

	u32 i, j;



	if (!tx_spare) {

		*pos += scnprintf(buf + *pos, len - *pos,

				  "tx spare buffer is not enabled\n");

		return;

	}



	for (i = 0; i < ARRAY_SIZE(tx_spare_info_items); i++)

		result[i] = &data_str[i][0];



	*pos += scnprintf(buf + *pos, len - *pos, "tx spare buffer info\n");

	hns3_dbg_fill_content(content, sizeof(content), tx_spare_info_items,

			      NULL, ARRAY_SIZE(tx_spare_info_items));

	*pos += scnprintf(buf + *pos, len - *pos, "%s", content);



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

		j = 0;

		sprintf(result[j++], "%8u", i);

		sprintf(result[j++], "%9u", ring->tx_copybreak);

		sprintf(result[j++], "%3u", tx_spare->len);

		sprintf(result[j++], "%3u", tx_spare->next_to_use);

		sprintf(result[j++], "%3u", tx_spare->next_to_clean);

		sprintf(result[j++], "%3u", tx_spare->last_to_clean);

		sprintf(result[j++], "%pad", &tx_spare->dma);

		hns3_dbg_fill_content(content, sizeof(content),

				      tx_spare_info_items,

				      (const char **)result,

				      ARRAY_SIZE(tx_spare_info_items));

		*pos += scnprintf(buf + *pos, len - *pos, "%s", content);

	}

}



static const struct hns3_dbg_item rx_queue_info_items[] = {

	{ "QUEUE_ID", 2 },

	{ "BD_NUM", 2 },
@@ -400,6 +450,7 @@ static const struct hns3_dbg_item rx_queue_info_items[] = { 
	{ "HEAD", 2 },

	{ "FBDNUM", 2 },

	{ "PKTNUM", 2 },

	{ "COPYBREAK", 2 },

	{ "RING_EN", 2 },

	{ "RX_RING_EN", 2 },

	{ "BASE_ADDR", 10 },
@@ -431,6 +482,7 @@ static void hns3_dump_rx_queue_info(struct hns3_enet_ring *ring, 


	sprintf(result[j++], "%6u", readl_relaxed(ring->tqp->io_base +

		HNS3_RING_RX_RING_PKTNUM_RECORD_REG));

	sprintf(result[j++], "%9u", ring->rx_copybreak);



	sprintf(result[j++], "%7s", readl_relaxed(ring->tqp->io_base +

		HNS3_RING_EN_REG) ? "on" : "off");
@@ -593,6 +645,8 @@ static int hns3_dbg_tx_queue_info(struct hnae3_handle *h, 
		pos += scnprintf(buf + pos, len - pos, "%s", content);

	}



	hns3_dbg_tx_spare_info(ring, buf, len, h->kinfo.num_tqps, &pos);



	return 0;

}

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

+492 −83

File changed.

Preview size limit exceeded, changes collapsed.

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

+49 −9

File changed.

Preview size limit exceeded, changes collapsed.

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

+66 −0

File changed.

Preview size limit exceeded, changes collapsed.