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

Commit 1f609492 authored by Yunsheng Lin's avatar Yunsheng Lin Committed by David S. Miller
Browse files

net: hns3: add HNAE3_RESTORE_CLIENT interface in enet module 



The HNAE3_INIT_CLIENT interface is also used when changing tc
configuration, vlan/mac hardware table does not need to be restored
when tc configuration changes.

This patch adds a HNAE3_RESTORE_CLIENT interface to restore the
vlan/mac hardware table when resetting.

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 af013903

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

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ enum hnae3_reset_notify_type { 
	HNAE3_DOWN_CLIENT,

	HNAE3_INIT_CLIENT,

	HNAE3_UNINIT_CLIENT,

	HNAE3_RESTORE_CLIENT,

};



enum hnae3_reset_type {

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

+34 −27
Original line number Diff line number Diff line
@@ -4004,35 +4004,8 @@ static int hns3_reset_notify_init_enet(struct hnae3_handle *handle) 
{

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

	struct hns3_nic_priv *priv = netdev_priv(netdev);

	bool vlan_filter_enable;

	int ret;



	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)) {

		ret = hns3_restore_vlan(netdev);

		if (ret)

			return ret;

	}



	ret = hns3_restore_fd_rules(netdev);

	if (ret)

		return ret;



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

	netif_carrier_off(netdev);
@@ -4070,6 +4043,37 @@ static int hns3_reset_notify_init_enet(struct hnae3_handle *handle) 
	return ret;

}



static int hns3_reset_notify_restore_enet(struct hnae3_handle *handle)

{

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

	bool vlan_filter_enable;

	int ret;



	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)) {

		ret = hns3_restore_vlan(netdev);

		if (ret)

			return ret;

	}



	return hns3_restore_fd_rules(netdev);

}



static int hns3_reset_notify_uninit_enet(struct hnae3_handle *handle)

{

	struct net_device *netdev = handle->kinfo.netdev;
@@ -4125,6 +4129,9 @@ static int hns3_reset_notify(struct hnae3_handle *handle, 
	case HNAE3_UNINIT_CLIENT:

		ret = hns3_reset_notify_uninit_enet(handle);

		break;

	case HNAE3_RESTORE_CLIENT:

		ret = hns3_reset_notify_restore_enet(handle);

		break;

	default:

		break;

	}

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

+4 −0
Original line number Diff line number Diff line
@@ -2866,6 +2866,10 @@ static void hclge_reset(struct hclge_dev *hdev) 
	if (ret)

		goto err_reset_lock;



	ret = hclge_notify_client(hdev, HNAE3_RESTORE_CLIENT);

	if (ret)

		goto err_reset_lock;



	hclge_clear_reset_cause(hdev);



	ret = hclge_reset_prepare_up(hdev);

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1264,7 +1264,7 @@ static int hclgevf_reset_stack(struct hclgevf_dev *hdev) 
	if (ret)

		return ret;



	return 0;

	return hclgevf_notify_client(hdev, HNAE3_RESTORE_CLIENT);

}



static int hclgevf_reset_prepare_wait(struct hclgevf_dev *hdev)