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

Commit af013903 authored by Huazhong Tan's avatar Huazhong Tan Committed by David S. Miller
Browse files

net: hns3: do reinitialization while ETS configuration changed 



When the ETS information is changed, the network device needs to be
re-initialized, otherwise the information such as the receiving queue
will be incorrect.

Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c3b9c50d

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

+1 −13
Original line number Diff line number Diff line
@@ -3728,7 +3728,6 @@ static int hns3_client_setup_tc(struct hnae3_handle *handle, u8 tc) 
{

	struct hnae3_knic_private_info *kinfo = &handle->kinfo;

	struct net_device *ndev = kinfo->netdev;

	bool if_running;

	int ret;



	if (tc > HNAE3_MAX_TC)
@@ -3737,24 +3736,13 @@ static int hns3_client_setup_tc(struct hnae3_handle *handle, u8 tc) 
	if (!ndev)

		return -ENODEV;



	if_running = netif_running(ndev);



	if (if_running) {

		(void)hns3_nic_net_stop(ndev);

		msleep(100);

	}



	ret = (kinfo->dcb_ops && kinfo->dcb_ops->map_update) ?

		kinfo->dcb_ops->map_update(handle) : -EOPNOTSUPP;

	if (ret)

		goto err_out;

		return ret;



	ret = hns3_nic_set_real_num_queue(ndev);



err_out:

	if (if_running)

		(void)hns3_nic_net_open(ndev);



	return ret;

}

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

+17 −0
Original line number Diff line number Diff line
@@ -222,6 +222,16 @@ static int hclge_ieee_setets(struct hnae3_handle *h, struct ieee_ets *ets) 
	if (ret)

		return ret;



	if (map_changed) {

		ret = hclge_notify_client(hdev, HNAE3_DOWN_CLIENT);

		if (ret)

			return ret;



		ret = hclge_notify_client(hdev, HNAE3_UNINIT_CLIENT);

		if (ret)

			return ret;

	}



	hclge_tm_schd_info_update(hdev, num_tc);



	ret = hclge_ieee_ets_to_tm_info(hdev, ets);
@@ -232,6 +242,13 @@ static int hclge_ieee_setets(struct hnae3_handle *h, struct ieee_ets *ets) 
		ret = hclge_client_setup_tc(hdev);

		if (ret)

			return ret;

		ret = hclge_notify_client(hdev, HNAE3_INIT_CLIENT);

		if (ret)

			return ret;



		ret = hclge_notify_client(hdev, HNAE3_UP_CLIENT);

		if (ret)

			return ret;

	}



	return hclge_tm_dwrr_cfg(hdev);

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

+2 −2
Original line number Diff line number Diff line
@@ -2401,7 +2401,7 @@ static void hclge_misc_irq_uninit(struct hclge_dev *hdev) 
	hclge_free_vector(hdev, 0);

}



static int hclge_notify_client(struct hclge_dev *hdev,

int hclge_notify_client(struct hclge_dev *hdev,

			enum hnae3_reset_notify_type type)

{

	struct hnae3_client *client = hdev->nic_client;

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

+2 −0
Original line number Diff line number Diff line
@@ -878,4 +878,6 @@ void hclge_vport_stop(struct hclge_vport *vport); 
int hclge_set_vport_mtu(struct hclge_vport *vport, int new_mtu);

int hclge_dbg_run_cmd(struct hnae3_handle *handle, char *cmd_buf);

u16 hclge_covert_handle_qid_global(struct hnae3_handle *handle, u16 queue_id);

int hclge_notify_client(struct hclge_dev *hdev,

			enum hnae3_reset_notify_type type);

#endif