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

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

net: hns3: adjust the location of clearing the table when doing reset 



When doing a function reset, the hardware table should be cleared
before the hardware reset. In current code, this clearing is done
in hns3_reset_notify_uninit_enet, but it is too late, because
the hardware reset is already done, hns3_reset_notify_down_enet
is more suitable to do that.

Fixes: bb6b94a8 ("net: hns3: Add reset interface implementation in client")
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4d60291b

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

+10 −10
Original line number Diff line number Diff line
@@ -3716,9 +3716,19 @@ static void hns3_restore_coal(struct hns3_nic_priv *priv) 


static int hns3_reset_notify_down_enet(struct hnae3_handle *handle)

{

	struct hnae3_ae_dev *ae_dev = pci_get_drvdata(handle->pdev);

	struct hnae3_knic_private_info *kinfo = &handle->kinfo;

	struct net_device *ndev = kinfo->netdev;



	/* it is cumbersome for hardware to pick-and-choose entries for deletion

	 * from table space. Hence, for function reset software intervention is

	 * required to delete the entries

	 */

	if (hns3_dev_ongoing_func_reset(ae_dev)) {

		hns3_remove_hw_addr(ndev);

		hns3_del_all_fd_rules(ndev, false);

	}



	if (!netif_running(ndev))

		return 0;
@@ -3797,7 +3807,6 @@ static int hns3_reset_notify_init_enet(struct hnae3_handle *handle) 


static int hns3_reset_notify_uninit_enet(struct hnae3_handle *handle)

{

	struct hnae3_ae_dev *ae_dev = pci_get_drvdata(handle->pdev);

	struct net_device *netdev = handle->kinfo.netdev;

	struct hns3_nic_priv *priv = netdev_priv(netdev);

	int ret;
@@ -3821,15 +3830,6 @@ static int hns3_reset_notify_uninit_enet(struct hnae3_handle *handle) 
	if (ret)

		netdev_err(netdev, "uninit ring error\n");



	/* it is cumbersome for hardware to pick-and-choose entries for deletion

	 * from table space. Hence, for function reset software intervention is

	 * required to delete the entries

	 */

	if (hns3_dev_ongoing_func_reset(ae_dev)) {

		hns3_remove_hw_addr(netdev);

		hns3_del_all_fd_rules(netdev, false);

	}



	clear_bit(HNS3_NIC_STATE_INITED, &priv->state);



	return ret;