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

Merge branch 'hns3-fixes-next' 



Peng Li says:

====================
fix some bugs for HNS3

This patchset fixes some bugs for HNS3 driver:
[Patch 1/5 - 2/5] fix 2 return vlaue issues.
[Patch 3/5 - 4/5] fix 2 comments reported by code review.
[Ptach 5/5] avoid sending message to IMP because IMP will not
handle any message when it is resetting.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0c29ba1b b50ae26c

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

+1 −1
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ static void hns3_set_txbd_baseinfo(u16 *bdtp_fe_sc_vld_ra_ri, int frag_end) 
{

	/* Config bd buffer end */

	hnae_set_field(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_BDTYPE_M,

		       HNS3_TXD_BDTYPE_M, 0);

		       HNS3_TXD_BDTYPE_S, 0);

	hnae_set_bit(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_FE_B, !!frag_end);

	hnae_set_bit(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_VLD_B, 1);

	hnae_set_field(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_SC_M, HNS3_TXD_SC_S, 0);

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

+2 −2
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ static u32 hns3_get_rss_key_size(struct net_device *netdev) 


	if (!h->ae_algo || !h->ae_algo->ops ||

	    !h->ae_algo->ops->get_rss_key_size)

		return -EOPNOTSUPP;

		return 0;



	return h->ae_algo->ops->get_rss_key_size(h);

}
@@ -649,7 +649,7 @@ static u32 hns3_get_rss_indir_size(struct net_device *netdev) 


	if (!h->ae_algo || !h->ae_algo->ops ||

	    !h->ae_algo->ops->get_rss_indir_size)

		return -EOPNOTSUPP;

		return 0;



	return h->ae_algo->ops->get_rss_indir_size(h);

}

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

+20 −7
Original line number Diff line number Diff line
@@ -3466,8 +3466,6 @@ static void hclge_rss_init_cfg(struct hclge_dev *hdev) 
	struct hclge_vport *vport = hdev->vport;

	int i;



	netdev_rss_key_fill(vport->rss_hash_key, HCLGE_RSS_KEY_SIZE);



	for (i = 0; i < hdev->num_vmdq_vport + 1; i++) {

		vport[i].rss_tuple_sets.ipv4_tcp_en =

			HCLGE_RSS_INPUT_TUPLE_OTHER;
@@ -3487,6 +3485,8 @@ static void hclge_rss_init_cfg(struct hclge_dev *hdev) 
			HCLGE_RSS_INPUT_TUPLE_OTHER;



		vport[i].rss_algo = HCLGE_RSS_HASH_ALGO_TOEPLITZ;



		netdev_rss_key_fill(vport[i].rss_hash_key, HCLGE_RSS_KEY_SIZE);

	}



	hclge_rss_indir_init_cfg(hdev);
@@ -3584,6 +3584,9 @@ static int hclge_unmap_ring_frm_vector(struct hnae3_handle *handle, 
	struct hclge_dev *hdev = vport->back;

	int vector_id, ret;



	if (test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state))

		return 0;



	vector_id = hclge_get_vector_index(hdev, vector);

	if (vector_id < 0) {

		dev_err(&handle->pdev->dev,
@@ -3781,13 +3784,16 @@ static int hclge_ae_start(struct hnae3_handle *handle) 
	clear_bit(HCLGE_STATE_DOWN, &hdev->state);

	mod_timer(&hdev->service_timer, jiffies + HZ);



	/* reset tqp stats */

	hclge_reset_tqp_stats(handle);



	if (test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state))

		return 0;



	ret = hclge_mac_start_phy(hdev);

	if (ret)

		return ret;



	/* reset tqp stats */

	hclge_reset_tqp_stats(handle);



	return 0;

}
@@ -3797,6 +3803,12 @@ static void hclge_ae_stop(struct hnae3_handle *handle) 
	struct hclge_dev *hdev = vport->back;

	int i;



	del_timer_sync(&hdev->service_timer);

	cancel_work_sync(&hdev->service_task);



	if (test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state))

		return;



	for (i = 0; i < vport->alloc_tqps; i++)

		hclge_tqp_enable(hdev, i, 0, false);
@@ -3807,8 +3819,6 @@ static void hclge_ae_stop(struct hnae3_handle *handle) 


	/* reset tqp stats */

	hclge_reset_tqp_stats(handle);

	del_timer_sync(&hdev->service_timer);

	cancel_work_sync(&hdev->service_task);

	hclge_update_link_status(hdev);

}
@@ -4940,6 +4950,9 @@ void hclge_reset_tqp(struct hnae3_handle *handle, u16 queue_id) 
	u16 queue_gid;

	int ret;



	if (test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state))

		return;



	queue_gid = hclge_covert_handle_qid_global(handle, queue_id);



	ret = hclge_tqp_enable(hdev, queue_id, 0, false);

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

+6 −0
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ static int hclge_mdio_write(struct mii_bus *bus, int phyid, int regnum, 
	struct hclge_desc desc;

	int ret;



	if (test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state))

		return 0;



	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_MDIO_CONFIG, false);



	mdio_cmd = (struct hclge_mdio_cfg_cmd *)desc.data;
@@ -95,6 +98,9 @@ static int hclge_mdio_read(struct mii_bus *bus, int phyid, int regnum) 
	struct hclge_desc desc;

	int ret;



	if (test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state))

		return 0;



	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_MDIO_CONFIG, true);



	mdio_cmd = (struct hclge_mdio_cfg_cmd *)desc.data;

CRA Git | Maintained and supported by SUSTech CRA and CCSE