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

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

net: hns3: fix incorrect return value/type of some functions 



There are some functions that, when they fail to send the command,
need to return the corresponding error value to its caller.

Fixes: 46a3df9f ("net: hns3: Add HNS3 Acceleration Engine & Compatibility Layer Support")
Fixes: 681ec399 ("net: hns3: fix for vlan table lost problem when resetting")
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1c124938

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

+3 −3
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ struct hnae3_ae_ops { 
	int (*set_loopback)(struct hnae3_handle *handle,

			    enum hnae3_loop loop_mode, bool en);



	void (*set_promisc_mode)(struct hnae3_handle *handle, bool en_uc_pmc,

	int (*set_promisc_mode)(struct hnae3_handle *handle, bool en_uc_pmc,

				bool en_mc_pmc);

	int (*set_mtu)(struct hnae3_handle *handle, int new_mtu);
@@ -391,7 +391,7 @@ struct hnae3_ae_ops { 
				      int vector_num,

				      struct hnae3_ring_chain_node *vr_chain);



	void (*reset_queue)(struct hnae3_handle *handle, u16 queue_id);

	int (*reset_queue)(struct hnae3_handle *handle, u16 queue_id);

	u32 (*get_fw_version)(struct hnae3_handle *handle);

	void (*get_mdix_mode)(struct hnae3_handle *handle,

			      u8 *tp_mdix_ctrl, u8 *tp_mdix);

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

+56 −24
Original line number Diff line number Diff line
@@ -509,16 +509,18 @@ static void hns3_nic_set_rx_mode(struct net_device *netdev) 
	h->netdev_flags = new_flags;

}



void hns3_update_promisc_mode(struct net_device *netdev, u8 promisc_flags)

int hns3_update_promisc_mode(struct net_device *netdev, u8 promisc_flags)

{

	struct hns3_nic_priv *priv = netdev_priv(netdev);

	struct hnae3_handle *h = priv->ae_handle;



	if (h->ae_algo->ops->set_promisc_mode) {

		h->ae_algo->ops->set_promisc_mode(h,

		return h->ae_algo->ops->set_promisc_mode(h,

						promisc_flags & HNAE3_UPE,

						promisc_flags & HNAE3_MPE);

	}



	return 0;

}



void hns3_enable_vlan_filter(struct net_device *netdev, bool enable)
@@ -1494,18 +1496,22 @@ static int hns3_vlan_rx_kill_vid(struct net_device *netdev, 
	return ret;

}



static void hns3_restore_vlan(struct net_device *netdev)

static int hns3_restore_vlan(struct net_device *netdev)

{

	struct hns3_nic_priv *priv = netdev_priv(netdev);

	int ret = 0;

	u16 vid;

	int ret;



	for_each_set_bit(vid, priv->active_vlans, VLAN_N_VID) {

		ret = hns3_vlan_rx_add_vid(netdev, htons(ETH_P_8021Q), vid);

		if (ret)

			netdev_warn(netdev, "Restore vlan: %d filter, ret:%d\n",

		if (ret) {

			netdev_err(netdev, "Restore vlan: %d filter, ret:%d\n",

				   vid, ret);

			return ret;

		}

	}



	return ret;

}



static int hns3_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan,
@@ -3257,11 +3263,12 @@ int hns3_uninit_all_ring(struct hns3_nic_priv *priv) 
}



/* Set mac addr if it is configured. or leave it to the AE driver */

static void hns3_init_mac_addr(struct net_device *netdev, bool init)

static int hns3_init_mac_addr(struct net_device *netdev, bool init)

{

	struct hns3_nic_priv *priv = netdev_priv(netdev);

	struct hnae3_handle *h = priv->ae_handle;

	u8 mac_addr_temp[ETH_ALEN];

	int ret = 0;



	if (h->ae_algo->ops->get_mac_addr && init) {

		h->ae_algo->ops->get_mac_addr(h, mac_addr_temp);
@@ -3276,8 +3283,9 @@ static void hns3_init_mac_addr(struct net_device *netdev, bool init) 
	}



	if (h->ae_algo->ops->set_mac_addr)

		h->ae_algo->ops->set_mac_addr(h, netdev->dev_addr, true);

		ret = h->ae_algo->ops->set_mac_addr(h, netdev->dev_addr, true);



	return ret;

}



static int hns3_restore_fd_rules(struct net_device *netdev)
@@ -3490,20 +3498,29 @@ static int hns3_client_setup_tc(struct hnae3_handle *handle, u8 tc) 
	return ret;

}



static void hns3_recover_hw_addr(struct net_device *ndev)

static int hns3_recover_hw_addr(struct net_device *ndev)

{

	struct netdev_hw_addr_list *list;

	struct netdev_hw_addr *ha, *tmp;

	int ret = 0;



	/* go through and sync uc_addr entries to the device */

	list = &ndev->uc;

	list_for_each_entry_safe(ha, tmp, &list->list, list)

		hns3_nic_uc_sync(ndev, ha->addr);

	list_for_each_entry_safe(ha, tmp, &list->list, list) {

		ret = hns3_nic_uc_sync(ndev, ha->addr);

		if (ret)

			return ret;

	}



	/* go through and sync mc_addr entries to the device */

	list = &ndev->mc;

	list_for_each_entry_safe(ha, tmp, &list->list, list)

		hns3_nic_mc_sync(ndev, ha->addr);

	list_for_each_entry_safe(ha, tmp, &list->list, list) {

		ret = hns3_nic_mc_sync(ndev, ha->addr);

		if (ret)

			return ret;

	}



	return ret;

}



static void hns3_remove_hw_addr(struct net_device *netdev)
@@ -3630,7 +3647,10 @@ int hns3_nic_reset_all_ring(struct hnae3_handle *h) 
	int ret;



	for (i = 0; i < h->kinfo.num_tqps; i++) {

		h->ae_algo->ops->reset_queue(h, i);

		ret = h->ae_algo->ops->reset_queue(h, i);

		if (ret)

			return ret;



		hns3_init_ring_hw(priv->ring_data[i].ring);



		/* We need to clear tx ring here because self test will
@@ -3722,18 +3742,30 @@ static int hns3_reset_notify_init_enet(struct hnae3_handle *handle) 
	bool vlan_filter_enable;

	int ret;



	hns3_init_mac_addr(netdev, false);

	hns3_recover_hw_addr(netdev);

	hns3_update_promisc_mode(netdev, handle->netdev_flags);

	ret = hns3_init_mac_addr(netdev, false);

	if (ret)

		return ret;



	ret = hns3_recover_hw_addr(netdev);

	if (ret)

		return ret;



	ret = hns3_update_promisc_mode(netdev, handle->netdev_flags);

	if (ret)

		return ret;



	vlan_filter_enable = netdev->flags & IFF_PROMISC ? false : true;

	hns3_enable_vlan_filter(netdev, vlan_filter_enable);





	/* Hardware table is only clear when pf resets */

	if (!(handle->flags & HNAE3_SUPPORT_VF))

		hns3_restore_vlan(netdev);

	if (!(handle->flags & HNAE3_SUPPORT_VF)) {

		ret = hns3_restore_vlan(netdev);

		return ret;

	}



	hns3_restore_fd_rules(netdev);

	ret = hns3_restore_fd_rules(netdev);

	if (ret)

		return ret;



	/* Carrier off reporting is important to ethtool even BEFORE open */

	netif_carrier_off(netdev);

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

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ void hns3_set_vector_coalesce_rl(struct hns3_enet_tqp_vector *tqp_vector, 
				 u32 rl_value);



void hns3_enable_vlan_filter(struct net_device *netdev, bool enable);

void hns3_update_promisc_mode(struct net_device *netdev, u8 promisc_flags);

int hns3_update_promisc_mode(struct net_device *netdev, u8 promisc_flags);



#ifdef CONFIG_HNS3_DCB

void hns3_dcbnl_setup(struct hnae3_handle *handle);

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

+17 −17
Original line number Diff line number Diff line
@@ -3314,7 +3314,7 @@ void hclge_promisc_param_init(struct hclge_promisc_param *param, bool en_uc, 
	param->vf_id = vport_id;

}



static void hclge_set_promisc_mode(struct hnae3_handle *handle, bool en_uc_pmc,

static int hclge_set_promisc_mode(struct hnae3_handle *handle, bool en_uc_pmc,

				  bool en_mc_pmc)

{

	struct hclge_vport *vport = hclge_get_vport(handle);
@@ -3323,7 +3323,7 @@ static void hclge_set_promisc_mode(struct hnae3_handle *handle, bool en_uc_pmc, 


	hclge_promisc_param_init(&param, en_uc_pmc, en_mc_pmc, true,

				 vport->vport_id);

	hclge_cmd_set_promisc_mode(hdev, &param);

	return hclge_cmd_set_promisc_mode(hdev, &param);

}



static int hclge_get_fd_mode(struct hclge_dev *hdev, u8 *fd_mode)
@@ -6107,28 +6107,28 @@ static u16 hclge_covert_handle_qid_global(struct hnae3_handle *handle, 
	return tqp->index;

}



void hclge_reset_tqp(struct hnae3_handle *handle, u16 queue_id)

int hclge_reset_tqp(struct hnae3_handle *handle, u16 queue_id)

{

	struct hclge_vport *vport = hclge_get_vport(handle);

	struct hclge_dev *hdev = vport->back;

	int reset_try_times = 0;

	int reset_status;

	u16 queue_gid;

	int ret;

	int ret = 0;



	queue_gid = hclge_covert_handle_qid_global(handle, queue_id);



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

	if (ret) {

		dev_warn(&hdev->pdev->dev, "Disable tqp fail, ret = %d\n", ret);

		return;

		dev_err(&hdev->pdev->dev, "Disable tqp fail, ret = %d\n", ret);

		return ret;

	}



	ret = hclge_send_reset_tqp_cmd(hdev, queue_gid, true);

	if (ret) {

		dev_warn(&hdev->pdev->dev,

		dev_err(&hdev->pdev->dev,

			"Send reset tqp cmd fail, ret = %d\n", ret);

		return;

		return ret;

	}



	reset_try_times = 0;
@@ -6141,16 +6141,16 @@ void hclge_reset_tqp(struct hnae3_handle *handle, u16 queue_id) 
	}



	if (reset_try_times >= HCLGE_TQP_RESET_TRY_TIMES) {

		dev_warn(&hdev->pdev->dev, "Reset TQP fail\n");

		return;

		dev_err(&hdev->pdev->dev, "Reset TQP fail\n");

		return ret;

	}



	ret = hclge_send_reset_tqp_cmd(hdev, queue_gid, false);

	if (ret) {

		dev_warn(&hdev->pdev->dev,

	if (ret)

		dev_err(&hdev->pdev->dev,

			"Deassert the soft reset fail, ret = %d\n", ret);

		return;

	}



	return ret;

}



void hclge_reset_vf_queue(struct hclge_vport *vport, u16 queue_id)

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

+1 −1
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ int hclge_rss_init_hw(struct hclge_dev *hdev); 
void hclge_rss_indir_init_cfg(struct hclge_dev *hdev);



void hclge_mbx_handler(struct hclge_dev *hdev);

void hclge_reset_tqp(struct hnae3_handle *handle, u16 queue_id);

int hclge_reset_tqp(struct hnae3_handle *handle, u16 queue_id);

void hclge_reset_vf_queue(struct hclge_vport *vport, u16 queue_id);

int hclge_cfg_flowctrl(struct hclge_dev *hdev);

int hclge_func_reset_cmd(struct hclge_dev *hdev, int func_id);