net: hns3: use HCLGE_STATE_ROCE_REGISTERED to indicate PF ROCE client has registered

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

So any operation of the ROCE client from HCLGE is not allowed if this
state is not set.

Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 87c5cb0f4c8ca2240c5036bf3c19ca96cef2dc59..02a06988cf5f2ec58be0cccd45f29b8ad6182ffd 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -2902,7 +2902,8 @@ static int hclge_notify_roce_client(struct hclge_dev *hdev,
        int ret = 0;
        u16 i;
 
-       if (!client)
+       if (!test_bit(HCLGE_STATE_ROCE_REGISTERED, &hdev->state) ||
+           !client)
                return 0;
 
        if (!client->ops->reset_notify)
@@ -8205,6 +8206,8 @@ static int hclge_init_client_instance(struct hnae3_client *client,
                                if (ret)
                                        goto clear_roce;
 
+                               set_bit(HCLGE_STATE_ROCE_REGISTERED,
+                                       &hdev->state);
                                hnae3_set_client_init_flag(hdev->roce_client,
                                                           ae_dev, 1);
                        }
@@ -8236,6 +8239,8 @@ static int hclge_init_client_instance(struct hnae3_client *client,
                                if (ret)
                                        goto clear_roce;
 
+                               set_bit(HCLGE_STATE_ROCE_REGISTERED,
+                                       &hdev->state);
                                hnae3_set_client_init_flag(client, ae_dev, 1);
                        }
 
@@ -8267,6 +8272,7 @@ static void hclge_uninit_client_instance(struct hnae3_client *client,
        for (i = 0; i < hdev->num_vmdq_vport + 1; i++) {
                vport = &hdev->vport[i];
                if (hdev->roce_client) {
+                       clear_bit(HCLGE_STATE_ROCE_REGISTERED, &hdev->state);
                        hdev->roce_client->ops->uninit_instance(&vport->roce,
                                                                0);
                        hdev->roce_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 43901ffeaf4e89a0c2e4ab2fa64e12d8f2c05986..2b3bc95ccbdfb892a53cd040127c470c84d30445 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
@@ -202,6 +202,7 @@ enum HCLGE_DEV_STATE {
        HCLGE_STATE_DISABLED,
        HCLGE_STATE_REMOVING,
        HCLGE_STATE_NIC_REGISTERED,
+       HCLGE_STATE_ROCE_REGISTERED,
        HCLGE_STATE_SERVICE_INITED,
        HCLGE_STATE_SERVICE_SCHED,
        HCLGE_STATE_RST_SERVICE_SCHED,