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: Huazhong Tan <tanhuazh...@huawei.com>
Signed-off-by: Peng Li <lipeng...@huawei.com>
---
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 6 ++++++
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 1 +
 2 files changed, 7 insertions(+)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c 
b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index fb0dc18..87c5cb0 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -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;
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h 
b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
index c770390..43901ff 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
@@ -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,
-- 
2.7.4

Reply via email to