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

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

net: hns3: use HCLGE_STATE_NIC_REGISTERED to indicate PF NIC client has registered 



When PF NIC client's init_instance() succeeds, it means this client
has been registered successfully, so we use HCLGE_STATE_NIC_REGISTERED
to indicate that. And before calling PF NIC client's uninit_instance(),
we clear this state.

So any operation of PF NIC client from HCLGE is not allowed if this
state is not set.

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

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

+6 −0
Original line number Diff line number Diff line
@@ -2873,6 +2873,10 @@ int hclge_notify_client(struct hclge_dev *hdev, 
	struct hnae3_client *client = hdev->nic_client;

	u16 i;



	if (!test_bit(HCLGE_STATE_NIC_REGISTERED, &hdev->state) ||

	    !client)

		return 0;



	if (!client->ops->reset_notify)

		return -EOPNOTSUPP;
@@ -8184,6 +8188,7 @@ static int hclge_init_client_instance(struct hnae3_client *client, 
				goto clear_nic;



			hnae3_set_client_init_flag(client, ae_dev, 1);

			set_bit(HCLGE_STATE_NIC_REGISTERED, &hdev->state);



			if (netif_msg_drv(&hdev->vport->nic))

				hclge_info_show(hdev);
@@ -8270,6 +8275,7 @@ static void hclge_uninit_client_instance(struct hnae3_client *client, 
		if (client->type == HNAE3_CLIENT_ROCE)

			return;

		if (hdev->nic_client && client->ops->uninit_instance) {

			clear_bit(HCLGE_STATE_NIC_REGISTERED, &hdev->state);

			client->ops->uninit_instance(&vport->nic, 0);

			hdev->nic_client = NULL;

			vport->nic.client = NULL;

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

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ enum HCLGE_DEV_STATE { 
	HCLGE_STATE_DOWN,

	HCLGE_STATE_DISABLED,

	HCLGE_STATE_REMOVING,

	HCLGE_STATE_NIC_REGISTERED,

	HCLGE_STATE_SERVICE_INITED,

	HCLGE_STATE_SERVICE_SCHED,

	HCLGE_STATE_RST_SERVICE_SCHED,