Commit 73a1dd8c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-hns3-add-some-cleanups-and-optimizations' 



Huazhong Tan says:

====================
net: hns3: add some cleanups and optimizations

This patch-set includes cleanups, optimizations and bugfix for
the HNS3 ethernet controller driver.

[patch 01/12] adds code optimization for debugfs command "dump reg".

[patch 02/12] fixes magic number issues.

[patch 03/12] modifies some parameters about hclge_dbg_dump_tm_map().

[patch 04/12] removes some unused parameters.

[patch 05/12] refactors some logs to make them more readable.

[patch 06/12] makes some resusable codes into functions.

[patch 07/12] fixes some type errors.

[patch 08/12] reduces the waiting time for per TQP reset.

[patch 09/12] implements .process_hw_error for hns3 client.

[patch 10/12] adds phy selftest for HNS3 driver.

[patch 11/12] adds checking for reset interrupt status when reset fails.

[patch 12/12] prevents SSU loopback when running ethtool -t.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8eb3cef8 dd2956ea

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

+8 −1
Original line number Diff line number Diff line
@@ -146,6 +146,12 @@ enum hnae3_reset_notify_type { 
	HNAE3_RESTORE_CLIENT,

};



enum hnae3_hw_error_type {

	HNAE3_PPU_POISON_ERROR,

	HNAE3_CMDQ_ECC_ERROR,

	HNAE3_IMP_RD_POISON_ERROR,

};



enum hnae3_reset_type {

	HNAE3_VF_RESET,

	HNAE3_VF_FUNC_RESET,
@@ -210,7 +216,8 @@ struct hnae3_client_ops { 
	int (*setup_tc)(struct hnae3_handle *handle, u8 tc);

	int (*reset_notify)(struct hnae3_handle *handle,

			    enum hnae3_reset_notify_type type);

	enum hnae3_reset_type (*process_hw_error)(struct hnae3_handle *handle);

	void (*process_hw_error)(struct hnae3_handle *handle,

				 enum hnae3_hw_error_type);

};



#define HNAE3_CLIENT_NAME_LENGTH 16

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

+13 −12
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static int hns3_dbg_queue_info(struct hnae3_handle *h, 


	if (queue_num >= h->kinfo.num_tqps) {

		dev_err(&h->pdev->dev,

			"Queue number(%u) is out of range(%u)\n", queue_num,

			"Queue number(%u) is out of range(0-%u)\n", queue_num,

			h->kinfo.num_tqps - 1);

		return -EINVAL;

	}
@@ -177,7 +177,7 @@ static int hns3_dbg_bd_info(struct hnae3_handle *h, const char *cmd_buf) 
	}



	if (q_num >= h->kinfo.num_tqps) {

		dev_err(dev, "Queue number(%u) is out of range(%u)\n", q_num,

		dev_err(dev, "Queue number(%u) is out of range(0-%u)\n", q_num,

			h->kinfo.num_tqps - 1);

		return -EINVAL;

	}
@@ -188,7 +188,7 @@ static int hns3_dbg_bd_info(struct hnae3_handle *h, const char *cmd_buf) 
	tx_index = (cnt == 1) ? value : tx_index;



	if (tx_index >= ring->desc_num) {

		dev_err(dev, "bd index (%u) is out of range(%u)\n", tx_index,

		dev_err(dev, "bd index(%u) is out of range(0-%u)\n", tx_index,

			ring->desc_num - 1);

		return -EINVAL;

	}
@@ -219,6 +219,7 @@ static int hns3_dbg_bd_info(struct hnae3_handle *h, const char *cmd_buf) 


	dev_info(dev, "RX Queue Num: %u, BD Index: %u\n", q_num, rx_index);

	dev_info(dev, "(RX)addr: 0x%llx\n", rx_desc->addr);

	dev_info(dev, "(RX)l234_info: %u\n", rx_desc->rx.l234_info);

	dev_info(dev, "(RX)pkt_len: %u\n", rx_desc->rx.pkt_len);

	dev_info(dev, "(RX)size: %u\n", rx_desc->rx.size);

	dev_info(dev, "(RX)rss_hash: %u\n", rx_desc->rx.rss_hash);
@@ -238,16 +239,16 @@ static void hns3_dbg_help(struct hnae3_handle *h) 
	char printf_buf[HNS3_DBG_BUF_LEN];



	dev_info(&h->pdev->dev, "available commands\n");

	dev_info(&h->pdev->dev, "queue info [number]\n");

	dev_info(&h->pdev->dev, "queue info <number>\n");

	dev_info(&h->pdev->dev, "queue map\n");

	dev_info(&h->pdev->dev, "bd info [q_num] <bd index>\n");

	dev_info(&h->pdev->dev, "bd info <q_num> <bd index>\n");



	if (!hns3_is_phys_func(h->pdev))

		return;



	dev_info(&h->pdev->dev, "dump fd tcam\n");

	dev_info(&h->pdev->dev, "dump tc\n");

	dev_info(&h->pdev->dev, "dump tm map [q_num]\n");

	dev_info(&h->pdev->dev, "dump tm map <q_num>\n");

	dev_info(&h->pdev->dev, "dump tm\n");

	dev_info(&h->pdev->dev, "dump qos pause cfg\n");

	dev_info(&h->pdev->dev, "dump qos pri map\n");
@@ -259,20 +260,20 @@ static void hns3_dbg_help(struct hnae3_handle *h) 
	dev_info(&h->pdev->dev, "dump mac tnl status\n");



	memset(printf_buf, 0, HNS3_DBG_BUF_LEN);

	strncat(printf_buf, "dump reg [[bios common] [ssu <prt_id>]",

	strncat(printf_buf, "dump reg [[bios common] [ssu <port_id>]",

		HNS3_DBG_BUF_LEN - 1);

	strncat(printf_buf + strlen(printf_buf),

		" [igu egu <prt_id>] [rpu <tc_queue_num>]",

		" [igu egu <port_id>] [rpu <tc_queue_num>]",

		HNS3_DBG_BUF_LEN - strlen(printf_buf) - 1);

	strncat(printf_buf + strlen(printf_buf),

		" [rtc] [ppp] [rcb] [tqp <q_num>]]\n",

		" [rtc] [ppp] [rcb] [tqp <queue_num>]]\n",

		HNS3_DBG_BUF_LEN - strlen(printf_buf) - 1);

	dev_info(&h->pdev->dev, "%s", printf_buf);



	memset(printf_buf, 0, HNS3_DBG_BUF_LEN);

	strncat(printf_buf, "dump reg dcb [port_id] [pri_id] [pg_id]",

	strncat(printf_buf, "dump reg dcb <port_id> <pri_id> <pg_id>",

		HNS3_DBG_BUF_LEN - 1);

	strncat(printf_buf + strlen(printf_buf), " [rq_id] [nq_id] [qset_id]\n",

	strncat(printf_buf + strlen(printf_buf), " <rq_id> <nq_id> <qset_id>\n",

		HNS3_DBG_BUF_LEN - strlen(printf_buf) - 1);

	dev_info(&h->pdev->dev, "%s", printf_buf);

}

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

+24 −0
Original line number Diff line number Diff line
@@ -4470,12 +4470,36 @@ int hns3_set_channels(struct net_device *netdev, 
	return hns3_reset_notify(h, HNAE3_UP_CLIENT);

}



static const struct hns3_hw_error_info hns3_hw_err[] = {

	{ .type = HNAE3_PPU_POISON_ERROR,

	  .msg = "PPU poison" },

	{ .type = HNAE3_CMDQ_ECC_ERROR,

	  .msg = "IMP CMDQ error" },

	{ .type = HNAE3_IMP_RD_POISON_ERROR,

	  .msg = "IMP RD poison" },

};



static void hns3_process_hw_error(struct hnae3_handle *handle,

				  enum hnae3_hw_error_type type)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(hns3_hw_err); i++) {

		if (hns3_hw_err[i].type == type) {

			dev_err(&handle->pdev->dev, "Detected %s!\n",

				hns3_hw_err[i].msg);

			break;

		}

	}

}



static const struct hnae3_client_ops client_ops = {

	.init_instance = hns3_client_init,

	.uninit_instance = hns3_client_uninit,

	.link_status_change = hns3_link_status_change,

	.setup_tc = hns3_client_setup_tc,

	.reset_notify = hns3_reset_notify,

	.process_hw_error = hns3_process_hw_error,

};



/* hns3_init_module - Driver registration routine

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

+5 −0
Original line number Diff line number Diff line
@@ -552,6 +552,11 @@ union l4_hdr_info { 
	unsigned char *hdr;

};



struct hns3_hw_error_info {

	enum hnae3_hw_error_type type;

	const char *msg;

};



static inline int ring_space(struct hns3_enet_ring *ring)

{

	/* This smp_load_acquire() pairs with smp_store_release() in

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

+13 −3
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static const struct hns3_stats hns3_rxq_stats[] = { 


#define HNS3_TQP_STATS_COUNT (HNS3_TXQ_STATS_COUNT + HNS3_RXQ_STATS_COUNT)



#define HNS3_SELF_TEST_TYPE_NUM         3

#define HNS3_SELF_TEST_TYPE_NUM         4

#define HNS3_NIC_LB_TEST_PKT_NUM	1

#define HNS3_NIC_LB_TEST_RING_ID	0

#define HNS3_NIC_LB_TEST_PACKET_SIZE	128
@@ -89,6 +89,7 @@ static int hns3_lp_setup(struct net_device *ndev, enum hnae3_loop loop, bool en) 
	case HNAE3_LOOP_SERIAL_SERDES:

	case HNAE3_LOOP_PARALLEL_SERDES:

	case HNAE3_LOOP_APP:

	case HNAE3_LOOP_PHY:

		ret = h->ae_algo->ops->set_loopback(h, loop, en);

		break;

	default:
@@ -96,7 +97,7 @@ static int hns3_lp_setup(struct net_device *ndev, enum hnae3_loop loop, bool en) 
		break;

	}



	if (ret)

	if (ret || h->pdev->revision >= 0x21)

		return ret;



	if (en) {
@@ -143,7 +144,10 @@ static int hns3_lp_down(struct net_device *ndev, enum hnae3_loop loop_mode) 


static void hns3_lp_setup_skb(struct sk_buff *skb)

{

#define	HNS3_NIC_LB_DST_MAC_ADDR	0x1f



	struct net_device *ndev = skb->dev;

	struct hnae3_handle *handle;

	unsigned char *packet;

	struct ethhdr *ethh;

	unsigned int i;
@@ -159,7 +163,9 @@ static void hns3_lp_setup_skb(struct sk_buff *skb) 
	 * before the packet reaches mac or serdes, which will defect

	 * the purpose of mac or serdes selftest.

	 */

	ethh->h_dest[5] += 0x1f;

	handle = hns3_get_handle(ndev);

	if (handle->pdev->revision == 0x20)

		ethh->h_dest[5] += HNS3_NIC_LB_DST_MAC_ADDR;

	eth_zero_addr(ethh->h_source);

	ethh->h_proto = htons(ETH_P_ARP);

	skb_reset_mac_header(skb);
@@ -330,6 +336,10 @@ static void hns3_self_test(struct net_device *ndev, 
	st_param[HNAE3_LOOP_PARALLEL_SERDES][1] =

			h->flags & HNAE3_SUPPORT_SERDES_PARALLEL_LOOPBACK;



	st_param[HNAE3_LOOP_PHY][0] = HNAE3_LOOP_PHY;

	st_param[HNAE3_LOOP_PHY][1] =

			h->flags & HNAE3_SUPPORT_PHY_LOOPBACK;



	if (if_running)

		ndev->netdev_ops->ndo_stop(ndev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE