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

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

Merge branch 'hns3-next' 



Huazhong Tan says:

====================
net: hns3: add a feature & bugfixes & cleanups

This patch-set includes a VF feature, bugfixes and cleanups for the HNS3
ethernet controller driver.

[patch 01/07] adds ethtool_ops.set_channels support for HNS3 VF driver

[patch 02/07] adds a recovery for setting channel fail.

[patch 03/07] fixes an error related to shaper parameter algorithm.

[patch 04/07] fixes an error related to ksetting.

[patch 05/07] adds cleanups for some log pinting.

[patch 06/07] adds a NULL pointer check before function calling.

[patch 07/07] adds some debugging information for reset issue.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 074be7fd 0ecf1f7b

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

+5 −2
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ static int hns3_dbg_bd_info(struct hnae3_handle *h, const char *cmd_buf) 
	struct hns3_enet_ring *ring;

	u32 tx_index, rx_index;

	u32 q_num, value;

	dma_addr_t addr;

	int cnt;



	cnt = sscanf(&cmd_buf[8], "%u %u", &q_num, &tx_index);
@@ -194,8 +195,9 @@ static int hns3_dbg_bd_info(struct hnae3_handle *h, const char *cmd_buf) 
	}



	tx_desc = &ring->desc[tx_index];

	addr = le64_to_cpu(tx_desc->addr);

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

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

	dev_info(dev, "(TX)addr: %pad\n", &addr);

	dev_info(dev, "(TX)vlan_tag: %u\n", tx_desc->tx.vlan_tag);

	dev_info(dev, "(TX)send_size: %u\n", tx_desc->tx.send_size);

	dev_info(dev, "(TX)vlan_tso: %u\n", tx_desc->tx.type_cs_vlan_tso);
@@ -217,8 +219,9 @@ static int hns3_dbg_bd_info(struct hnae3_handle *h, const char *cmd_buf) 
	rx_index = (cnt == 1) ? value : tx_index;

	rx_desc	 = &ring->desc[rx_index];



	addr = le64_to_cpu(rx_desc->addr);

	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)addr: %pad\n", &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);

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

+39 −15
Original line number Diff line number Diff line
@@ -2006,7 +2006,8 @@ static pci_ers_result_t hns3_slot_reset(struct pci_dev *pdev) 


	ops = ae_dev->ops;

	/* request the reset */

	if (ops->reset_event && ops->get_reset_level) {

	if (ops->reset_event && ops->get_reset_level &&

	    ops->set_default_reset_request) {

		if (ae_dev->hw_err_reset_req) {

			reset_type = ops->get_reset_level(ae_dev,

						&ae_dev->hw_err_reset_req);
@@ -4410,6 +4411,30 @@ static int hns3_reset_notify(struct hnae3_handle *handle, 
	return ret;

}



static int hns3_change_channels(struct hnae3_handle *handle, u32 new_tqp_num,

				bool rxfh_configured)

{

	int ret;



	ret = handle->ae_algo->ops->set_channels(handle, new_tqp_num,

						 rxfh_configured);

	if (ret) {

		dev_err(&handle->pdev->dev,

			"Change tqp num(%u) fail.\n", new_tqp_num);

		return ret;

	}



	ret = hns3_reset_notify(handle, HNAE3_INIT_CLIENT);

	if (ret)

		return ret;



	ret =  hns3_reset_notify(handle, HNAE3_UP_CLIENT);

	if (ret)

		hns3_reset_notify(handle, HNAE3_UNINIT_CLIENT);



	return ret;

}



int hns3_set_channels(struct net_device *netdev,

		      struct ethtool_channels *ch)

{
@@ -4450,24 +4475,23 @@ int hns3_set_channels(struct net_device *netdev, 
		return ret;



	org_tqp_num = h->kinfo.num_tqps;

	ret = h->ae_algo->ops->set_channels(h, new_tqp_num, rxfh_configured);

	if (ret) {

		ret = h->ae_algo->ops->set_channels(h, org_tqp_num,

						    rxfh_configured);

	ret = hns3_change_channels(h, new_tqp_num, rxfh_configured);

	if (ret) {

			/* If revert to old tqp failed, fatal error occurred */

			dev_err(&netdev->dev,

				"Revert to old tqp num fail, ret=%d", ret);

			return ret;

		}

		dev_info(&netdev->dev,

			 "Change tqp num fail, Revert to old tqp num");

		int ret1;



		netdev_warn(netdev,

			    "Change channels fail, revert to old value\n");

		ret1 = hns3_change_channels(h, org_tqp_num, rxfh_configured);

		if (ret1) {

			netdev_err(netdev,

				   "revert to old channel fail\n");

			return ret1;

		}

	ret = hns3_reset_notify(h, HNAE3_INIT_CLIENT);

	if (ret)



		return ret;

	}



	return hns3_reset_notify(h, HNAE3_UP_CLIENT);

	return 0;

}



static const struct hns3_hw_error_info hns3_hw_err[] = {

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

+16 −0
Original line number Diff line number Diff line
@@ -726,6 +726,12 @@ static int hns3_check_ksettings_param(const struct net_device *netdev, 
	u8 duplex;

	int ret;



	/* hw doesn't support use specified speed and duplex to negotiate,

	 * unnecessary to check them when autoneg on.

	 */

	if (cmd->base.autoneg)

		return 0;



	if (ops->get_ksettings_an_result) {

		ops->get_ksettings_an_result(handle, &autoneg, &speed, &duplex);

		if (cmd->base.autoneg == autoneg && cmd->base.speed == speed &&
@@ -787,6 +793,15 @@ static int hns3_set_link_ksettings(struct net_device *netdev, 
			return ret;

	}



	/* hw doesn't support use specified speed and duplex to negotiate,

	 * ignore them when autoneg on.

	 */

	if (cmd->base.autoneg) {

		netdev_info(netdev,

			    "autoneg is on, ignore the speed and duplex\n");

		return 0;

	}



	if (ops->cfg_mac_speed_dup_h)

		ret = ops->cfg_mac_speed_dup_h(handle, cmd->base.speed,

					       cmd->base.duplex);
@@ -1397,6 +1412,7 @@ static const struct ethtool_ops hns3vf_ethtool_ops = { 
	.set_rxfh = hns3_set_rss,

	.get_link_ksettings = hns3_get_link_ksettings,

	.get_channels = hns3_get_channels,

	.set_channels = hns3_set_channels,

	.get_coalesce = hns3_get_coalesce,

	.set_coalesce = hns3_set_coalesce,

	.get_regs_len = hns3_get_regs_len,

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

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static int hclge_ieee_setpfc(struct hnae3_handle *h, struct ieee_pfc *pfc) 
	hdev->tm_info.pfc_en = pfc->pfc_en;



	netif_dbg(h, drv, netdev,

		  "set pfc: pfc_en=%u, pfc_map=%u, num_tc=%u\n",

		  "set pfc: pfc_en=%x, pfc_map=%x, num_tc=%u\n",

		  pfc->pfc_en, pfc_map, hdev->tm_info.num_tc);



	hclge_tm_pfc_info_update(hdev);

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

+23 −9
Original line number Diff line number Diff line
@@ -931,22 +931,36 @@ static void hclge_dbg_fd_tcam(struct hclge_dev *hdev) 


static void hclge_dbg_dump_rst_info(struct hclge_dev *hdev)

{

	dev_info(&hdev->pdev->dev, "PF reset count: %d\n",

	dev_info(&hdev->pdev->dev, "PF reset count: %u\n",

		 hdev->rst_stats.pf_rst_cnt);

	dev_info(&hdev->pdev->dev, "FLR reset count: %d\n",

	dev_info(&hdev->pdev->dev, "FLR reset count: %u\n",

		 hdev->rst_stats.flr_rst_cnt);

	dev_info(&hdev->pdev->dev, "CORE reset count: %d\n",

		 hdev->rst_stats.core_rst_cnt);

	dev_info(&hdev->pdev->dev, "GLOBAL reset count: %d\n",

	dev_info(&hdev->pdev->dev, "GLOBAL reset count: %u\n",

		 hdev->rst_stats.global_rst_cnt);

	dev_info(&hdev->pdev->dev, "IMP reset count: %d\n",

	dev_info(&hdev->pdev->dev, "IMP reset count: %u\n",

		 hdev->rst_stats.imp_rst_cnt);

	dev_info(&hdev->pdev->dev, "reset done count: %d\n",

	dev_info(&hdev->pdev->dev, "reset done count: %u\n",

		 hdev->rst_stats.reset_done_cnt);

	dev_info(&hdev->pdev->dev, "HW reset done count: %d\n",

	dev_info(&hdev->pdev->dev, "HW reset done count: %u\n",

		 hdev->rst_stats.hw_reset_done_cnt);

	dev_info(&hdev->pdev->dev, "reset count: %d\n",

	dev_info(&hdev->pdev->dev, "reset count: %u\n",

		 hdev->rst_stats.reset_cnt);

	dev_info(&hdev->pdev->dev, "reset count: %u\n",

		 hdev->rst_stats.reset_cnt);

	dev_info(&hdev->pdev->dev, "reset fail count: %u\n",

		 hdev->rst_stats.reset_fail_cnt);

	dev_info(&hdev->pdev->dev, "vector0 interrupt enable status: 0x%x\n",

		 hclge_read_dev(&hdev->hw, HCLGE_MISC_VECTOR_REG_BASE));

	dev_info(&hdev->pdev->dev, "reset interrupt source: 0x%x\n",

		 hclge_read_dev(&hdev->hw, HCLGE_MISC_RESET_STS_REG));

	dev_info(&hdev->pdev->dev, "reset interrupt status: 0x%x\n",

		 hclge_read_dev(&hdev->hw, HCLGE_MISC_VECTOR_INT_STS));

	dev_info(&hdev->pdev->dev, "hardware reset status: 0x%x\n",

		 hclge_read_dev(&hdev->hw, HCLGE_GLOBAL_RESET_REG));

	dev_info(&hdev->pdev->dev, "handshake status: 0x%x\n",

		 hclge_read_dev(&hdev->hw, HCLGE_NIC_CSQ_DEPTH_REG));

	dev_info(&hdev->pdev->dev, "function reset status: 0x%x\n",

		 hclge_read_dev(&hdev->hw, HCLGE_FUN_RST_ING));

}



static void hclge_dbg_get_m7_stats_info(struct hclge_dev *hdev)