Commit 2a0bfc36 authored by Huazhong Tan's avatar Huazhong Tan Committed by David S. Miller

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: 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 bd9109c9
...@@ -2902,7 +2902,8 @@ static int hclge_notify_roce_client(struct hclge_dev *hdev, ...@@ -2902,7 +2902,8 @@ static int hclge_notify_roce_client(struct hclge_dev *hdev,
int ret = 0; int ret = 0;
u16 i; u16 i;
if (!client) if (!test_bit(HCLGE_STATE_ROCE_REGISTERED, &hdev->state) ||
!client)
return 0; return 0;
if (!client->ops->reset_notify) if (!client->ops->reset_notify)
...@@ -8205,6 +8206,8 @@ static int hclge_init_client_instance(struct hnae3_client *client, ...@@ -8205,6 +8206,8 @@ static int hclge_init_client_instance(struct hnae3_client *client,
if (ret) if (ret)
goto clear_roce; goto clear_roce;
set_bit(HCLGE_STATE_ROCE_REGISTERED,
&hdev->state);
hnae3_set_client_init_flag(hdev->roce_client, hnae3_set_client_init_flag(hdev->roce_client,
ae_dev, 1); ae_dev, 1);
} }
...@@ -8236,6 +8239,8 @@ static int hclge_init_client_instance(struct hnae3_client *client, ...@@ -8236,6 +8239,8 @@ static int hclge_init_client_instance(struct hnae3_client *client,
if (ret) if (ret)
goto clear_roce; goto clear_roce;
set_bit(HCLGE_STATE_ROCE_REGISTERED,
&hdev->state);
hnae3_set_client_init_flag(client, ae_dev, 1); hnae3_set_client_init_flag(client, ae_dev, 1);
} }
...@@ -8267,6 +8272,7 @@ static void hclge_uninit_client_instance(struct hnae3_client *client, ...@@ -8267,6 +8272,7 @@ static void hclge_uninit_client_instance(struct hnae3_client *client,
for (i = 0; i < hdev->num_vmdq_vport + 1; i++) { for (i = 0; i < hdev->num_vmdq_vport + 1; i++) {
vport = &hdev->vport[i]; vport = &hdev->vport[i];
if (hdev->roce_client) { if (hdev->roce_client) {
clear_bit(HCLGE_STATE_ROCE_REGISTERED, &hdev->state);
hdev->roce_client->ops->uninit_instance(&vport->roce, hdev->roce_client->ops->uninit_instance(&vport->roce,
0); 0);
hdev->roce_client = NULL; hdev->roce_client = NULL;
......
...@@ -202,6 +202,7 @@ enum HCLGE_DEV_STATE { ...@@ -202,6 +202,7 @@ enum HCLGE_DEV_STATE {
HCLGE_STATE_DISABLED, HCLGE_STATE_DISABLED,
HCLGE_STATE_REMOVING, HCLGE_STATE_REMOVING,
HCLGE_STATE_NIC_REGISTERED, HCLGE_STATE_NIC_REGISTERED,
HCLGE_STATE_ROCE_REGISTERED,
HCLGE_STATE_SERVICE_INITED, HCLGE_STATE_SERVICE_INITED,
HCLGE_STATE_SERVICE_SCHED, HCLGE_STATE_SERVICE_SCHED,
HCLGE_STATE_RST_SERVICE_SCHED, HCLGE_STATE_RST_SERVICE_SCHED,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment