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

Merge branch 'hns3-next' 



Huazhong Tan says:

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

This series includes some misc updates for the HNS3 ethernet driver.

[patch 1] adds a limitation for the error log in the
hns3_clean_tx_ring().
[patch 2] adds a check for pfmemalloc flag before reusing pages
since these pages may be used some special case.
[patch 3] assigns a default reset type 'HNAE3_NONE_RESET' to
VF's reset_type after initializing or reset.
[patch 4] unifies macro HCLGE_DFX_REG_TYPE_CNT's definition into
header file.
[patch 5] refines the parameter 'size' of snprintf() in the
hns3_init_module().
[patch 6] rewrites a debug message in hclge_put_vector().
[patch 7~9] adds some cleanups related to coding style.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 953c4a08 60df7e91

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

+13 −9
Original line number Diff line number Diff line
@@ -2094,10 +2094,8 @@ static int hns3_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	int ret;



	ae_dev = devm_kzalloc(&pdev->dev, sizeof(*ae_dev), GFP_KERNEL);

	if (!ae_dev) {

		ret = -ENOMEM;

		return ret;

	}

	if (!ae_dev)

		return -ENOMEM;



	ae_dev->pdev = pdev;

	ae_dev->flag = ent->driver_data;
@@ -2540,7 +2538,7 @@ void hns3_clean_tx_ring(struct hns3_enet_ring *ring) 
	rmb(); /* Make sure head is ready before touch any data */



	if (unlikely(!is_valid_clean_head(ring, head))) {

		netdev_err(netdev, "wrong head (%d, %d-%d)\n", head,

		hns3_rl_err(netdev, "wrong head (%d, %d-%d)\n", head,

			    ring->next_to_use, ring->next_to_clean);



		u64_stats_update_begin(&ring->syncp);
@@ -2627,6 +2625,12 @@ static void hns3_nic_alloc_rx_buffers(struct hns3_enet_ring *ring, 
	writel_relaxed(i, ring->tqp->io_base + HNS3_RING_RX_RING_HEAD_REG);

}



static bool hns3_page_is_reusable(struct page *page)

{

	return page_to_nid(page) == numa_mem_id() &&

		!page_is_pfmemalloc(page);

}



static void hns3_nic_reuse_page(struct sk_buff *skb, int i,

				struct hns3_enet_ring *ring, int pull_len,

				struct hns3_desc_cb *desc_cb)
@@ -2641,7 +2645,7 @@ static void hns3_nic_reuse_page(struct sk_buff *skb, int i, 
	/* Avoid re-using remote pages, or the stack is still using the page

	 * when page_offset rollback to zero, flag default unreuse

	 */

	if (unlikely(page_to_nid(desc_cb->priv) != numa_mem_id()) ||

	if (unlikely(!hns3_page_is_reusable(desc_cb->priv)) ||

	    (!desc_cb->page_offset && page_count(desc_cb->priv) > 1))

		return;
@@ -2860,7 +2864,7 @@ static int hns3_alloc_skb(struct hns3_enet_ring *ring, unsigned int length, 
		memcpy(__skb_put(skb, length), va, ALIGN(length, sizeof(long)));



		/* We can reuse buffer as-is, just make sure it is local */

		if (likely(page_to_nid(desc_cb->priv) == numa_mem_id()))

		if (likely(hns3_page_is_reusable(desc_cb->priv)))

			desc_cb->reuse_flag = 1;

		else /* This page cannot be reused so discard it */

			put_page(desc_cb->priv);
@@ -4710,7 +4714,7 @@ static int __init hns3_init_module(void) 
	pr_info("%s: %s\n", hns3_driver_name, hns3_copyright);



	client.type = HNAE3_CLIENT_KNIC;

	snprintf(client.name, HNAE3_CLIENT_NAME_LENGTH - 1, "%s",

	snprintf(client.name, HNAE3_CLIENT_NAME_LENGTH, "%s",

		 hns3_driver_name);



	client.ops = &client_ops;

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

+0 −2
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ static struct hclge_dbg_reg_type_info hclge_dbg_reg_info[] = { 


static int hclge_dbg_get_dfx_bd_num(struct hclge_dev *hdev, int offset)

{

#define HCLGE_GET_DFX_REG_TYPE_CNT	4



	struct hclge_desc desc[HCLGE_GET_DFX_REG_TYPE_CNT];

	int entries_per_desc;

	int index;

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

+2 −4
Original line number Diff line number Diff line
@@ -1898,10 +1898,8 @@ static int hclge_handle_all_hw_msix_error(struct hclge_dev *hdev, 


	bd_num = max_t(u32, mpf_bd_num, pf_bd_num);

	desc = kcalloc(bd_num, sizeof(struct hclge_desc), GFP_KERNEL);

	if (!desc) {

		ret = -ENOMEM;

		goto out;

	}

	if (!desc)

		return -ENOMEM;



	ret = hclge_handle_mpf_msix_error(hdev, desc, mpf_bd_num,

					  reset_requests);

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

+26 −65
Original line number Diff line number Diff line
@@ -862,9 +862,7 @@ static int hclge_query_function_status(struct hclge_dev *hdev) 
		usleep_range(1000, 2000);

	} while (timeout++ < HCLGE_QUERY_MAX_CNT);



	ret = hclge_parse_func_status(hdev, req);



	return ret;

	return hclge_parse_func_status(hdev, req);

}



static int hclge_query_pf_resource(struct hclge_dev *hdev)
@@ -882,12 +880,12 @@ static int hclge_query_pf_resource(struct hclge_dev *hdev) 
	}



	req = (struct hclge_pf_res_cmd *)desc.data;

	hdev->num_tqps = __le16_to_cpu(req->tqp_num);

	hdev->pkt_buf_size = __le16_to_cpu(req->buf_size) << HCLGE_BUF_UNIT_S;

	hdev->num_tqps = le16_to_cpu(req->tqp_num);

	hdev->pkt_buf_size = le16_to_cpu(req->buf_size) << HCLGE_BUF_UNIT_S;



	if (req->tx_buf_size)

		hdev->tx_buf_size =

			__le16_to_cpu(req->tx_buf_size) << HCLGE_BUF_UNIT_S;

			le16_to_cpu(req->tx_buf_size) << HCLGE_BUF_UNIT_S;

	else

		hdev->tx_buf_size = HCLGE_DEFAULT_TX_BUF;
@@ -895,7 +893,7 @@ static int hclge_query_pf_resource(struct hclge_dev *hdev) 


	if (req->dv_buf_size)

		hdev->dv_buf_size =

			__le16_to_cpu(req->dv_buf_size) << HCLGE_BUF_UNIT_S;

			le16_to_cpu(req->dv_buf_size) << HCLGE_BUF_UNIT_S;

	else

		hdev->dv_buf_size = HCLGE_DEFAULT_DV;
@@ -903,10 +901,10 @@ static int hclge_query_pf_resource(struct hclge_dev *hdev) 


	if (hnae3_dev_roce_supported(hdev)) {

		hdev->roce_base_msix_offset =

		hnae3_get_field(__le16_to_cpu(req->msixcap_localid_ba_rocee),

		hnae3_get_field(le16_to_cpu(req->msixcap_localid_ba_rocee),

				HCLGE_MSIX_OFT_ROCEE_M, HCLGE_MSIX_OFT_ROCEE_S);

		hdev->num_roce_msi =

		hnae3_get_field(__le16_to_cpu(req->pf_intr_vector_number),

		hnae3_get_field(le16_to_cpu(req->pf_intr_vector_number),

				HCLGE_PF_VEC_NUM_M, HCLGE_PF_VEC_NUM_S);



		/* nic's msix numbers is always equals to the roce's. */
@@ -919,7 +917,7 @@ static int hclge_query_pf_resource(struct hclge_dev *hdev) 
				hdev->roce_base_msix_offset;

	} else {

		hdev->num_msi =

		hnae3_get_field(__le16_to_cpu(req->pf_intr_vector_number),

		hnae3_get_field(le16_to_cpu(req->pf_intr_vector_number),

				HCLGE_PF_VEC_NUM_M, HCLGE_PF_VEC_NUM_S);



		hdev->num_nic_msi = hdev->num_msi;
@@ -1333,11 +1331,7 @@ static int hclge_get_cap(struct hclge_dev *hdev) 
	}



	/* get pf resource */

	ret = hclge_query_pf_resource(hdev);

	if (ret)

		dev_err(&hdev->pdev->dev, "query pf resource error %d.\n", ret);



	return ret;

	return hclge_query_pf_resource(hdev);

}



static void hclge_init_kdump_kernel_config(struct hclge_dev *hdev)
@@ -2621,31 +2615,22 @@ static int hclge_mac_init(struct hclge_dev *hdev) 
	hdev->hw.mac.duplex = HCLGE_MAC_FULL;

	ret = hclge_cfg_mac_speed_dup_hw(hdev, hdev->hw.mac.speed,

					 hdev->hw.mac.duplex);

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"Config mac speed dup fail ret=%d\n", ret);

	if (ret)

		return ret;

	}



	if (hdev->hw.mac.support_autoneg) {

		ret = hclge_set_autoneg_en(hdev, hdev->hw.mac.autoneg);

		if (ret) {

			dev_err(&hdev->pdev->dev,

				"Config mac autoneg fail ret=%d\n", ret);

		if (ret)

			return ret;

	}

	}



	mac->link = 0;



	if (mac->user_fec_mode & BIT(HNAE3_FEC_USER_DEF)) {

		ret = hclge_set_fec_hw(hdev, mac->user_fec_mode);

		if (ret) {

			dev_err(&hdev->pdev->dev,

				"Fec mode init fail, ret = %d\n", ret);

		if (ret)

			return ret;

	}

	}



	ret = hclge_set_mac_mtu(hdev, hdev->mps);

	if (ret) {
@@ -2916,7 +2901,7 @@ static int hclge_get_status(struct hnae3_handle *handle) 


static struct hclge_vport *hclge_get_vf_vport(struct hclge_dev *hdev, int vf)

{

	if (pci_num_vf(hdev->pdev) == 0) {

	if (!pci_num_vf(hdev->pdev)) {

		dev_err(&hdev->pdev->dev,

			"SRIOV is disabled, can not get vport(%d) info.\n", vf);

		return NULL;
@@ -4101,7 +4086,7 @@ static int hclge_put_vector(struct hnae3_handle *handle, int vector) 
	vector_id = hclge_get_vector_index(hdev, vector);

	if (vector_id < 0) {

		dev_err(&hdev->pdev->dev,

			"Get vector index fail. vector_id =%d\n", vector_id);

			"Get vector index fail. vector = %d\n", vector);

		return vector_id;

	}
@@ -6584,7 +6569,7 @@ static int hclge_set_serdes_loopback(struct hclge_dev *hdev, bool en, 


	hclge_cfg_mac_mode(hdev, en);



	ret = hclge_mac_phy_link_status_wait(hdev, en, FALSE);

	ret = hclge_mac_phy_link_status_wait(hdev, en, false);

	if (ret)

		dev_err(&hdev->pdev->dev,

			"serdes loopback config mac mode timeout\n");
@@ -6642,7 +6627,7 @@ static int hclge_set_phy_loopback(struct hclge_dev *hdev, bool en) 


	hclge_cfg_mac_mode(hdev, en);



	ret = hclge_mac_phy_link_status_wait(hdev, en, TRUE);

	ret = hclge_mac_phy_link_status_wait(hdev, en, true);

	if (ret)

		dev_err(&hdev->pdev->dev,

			"phy loopback config mac mode timeout\n");
@@ -9394,17 +9379,13 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) 
	sema_init(&hdev->reset_sem, 1);



	ret = hclge_pci_init(hdev);

	if (ret) {

		dev_err(&pdev->dev, "PCI init failed\n");

	if (ret)

		goto out;

	}



	/* Firmware command queue initialize */

	ret = hclge_cmd_queue_init(hdev);

	if (ret) {

		dev_err(&pdev->dev, "Cmd queue init failed, ret = %d.\n", ret);

	if (ret)

		goto err_pci_uninit;

	}



	/* Firmware command initialize */

	ret = hclge_cmd_init(hdev);
@@ -9412,11 +9393,8 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) 
		goto err_cmd_uninit;



	ret = hclge_get_cap(hdev);

	if (ret) {

		dev_err(&pdev->dev, "get hw capability error, ret = %d.\n",

			ret);

	if (ret)

		goto err_cmd_uninit;

	}



	ret = hclge_configure(hdev);

	if (ret) {
@@ -9431,12 +9409,8 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) 
	}



	ret = hclge_misc_irq_init(hdev);

	if (ret) {

		dev_err(&pdev->dev,

			"Misc IRQ(vector0) init error, ret = %d.\n",

			ret);

	if (ret)

		goto err_msi_uninit;

	}



	ret = hclge_alloc_tqps(hdev);

	if (ret) {
@@ -9445,31 +9419,22 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) 
	}



	ret = hclge_alloc_vport(hdev);

	if (ret) {

		dev_err(&pdev->dev, "Allocate vport error, ret = %d.\n", ret);

	if (ret)

		goto err_msi_irq_uninit;

	}



	ret = hclge_map_tqp(hdev);

	if (ret) {

		dev_err(&pdev->dev, "Map tqp error, ret = %d.\n", ret);

	if (ret)

		goto err_msi_irq_uninit;

	}



	if (hdev->hw.mac.media_type == HNAE3_MEDIA_TYPE_COPPER) {

		ret = hclge_mac_mdio_config(hdev);

		if (ret) {

			dev_err(&hdev->pdev->dev,

				"mdio config fail ret=%d\n", ret);

		if (ret)

			goto err_msi_irq_uninit;

	}

	}



	ret = hclge_init_umv_space(hdev);

	if (ret) {

		dev_err(&pdev->dev, "umv space init error, ret=%d.\n", ret);

	if (ret)

		goto err_mdiobus_unreg;

	}



	ret = hclge_mac_init(hdev);

	if (ret) {
@@ -10204,10 +10169,8 @@ static int hclge_get_dfx_reg_bd_num(struct hclge_dev *hdev, 
				    int *bd_num_list,

				    u32 type_num)

{

#define HCLGE_DFX_REG_BD_NUM	4



	u32 entries_per_desc, desc_index, index, offset, i;

	struct hclge_desc desc[HCLGE_DFX_REG_BD_NUM];

	struct hclge_desc desc[HCLGE_GET_DFX_REG_TYPE_CNT];

	int ret;



	ret = hclge_query_bd_num_cmd_send(hdev, desc);
@@ -10320,10 +10283,8 @@ static int hclge_get_dfx_reg(struct hclge_dev *hdev, void *data) 


	buf_len = sizeof(*desc_src) * bd_num_max;

	desc_src = kzalloc(buf_len, GFP_KERNEL);

	if (!desc_src) {

		dev_err(&hdev->pdev->dev, "%s kzalloc failed\n", __func__);

	if (!desc_src)

		return -ENOMEM;

	}



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

		bd_num = bd_num_list[i];

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

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ 
#define HCLGE_PHY_MDIX_STATUS_B		6

#define HCLGE_PHY_SPEED_DUP_RESOLVE_B	11



#define HCLGE_GET_DFX_REG_TYPE_CNT	4



/* Factor used to calculate offset and bitmap of VF num */

#define HCLGE_VF_NUM_PER_CMD           64

CRA Git | Maintained and supported by SUSTech CRA and CCSE