net: hns3: add reset check for VF updating port based VLAN (a6f7bfdc) · Commits · 戴 / test

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

+21 −9

Original line number	Diff line number	Diff line
		@@ -3439,23 +3439,35 @@ void hclgevf_update_port_base_vlan_info(struct hclgevf_dev *hdev, u16 state,
		{
		struct hnae3_handle *nic = &hdev->nic;
		struct hclge_vf_to_pf_msg send_msg;
		int ret;

		rtnl_lock();
		hclgevf_notify_client(hdev, HNAE3_DOWN_CLIENT);

		if (test_bit(HCLGEVF_STATE_RST_HANDLING, &hdev->state)) {
		dev_warn(&hdev->pdev->dev,
		"is resetting when updating port based vlan info\n");
		rtnl_unlock();
		return;
		}

		ret = hclgevf_notify_client(hdev, HNAE3_DOWN_CLIENT);
		if (ret) {
		rtnl_unlock();
		return;
		}

		/* send msg to PF and wait update port based vlan info */
		hclgevf_build_send_msg(&send_msg, HCLGE_MBX_SET_VLAN,
		HCLGE_MBX_PORT_BASE_VLAN_CFG);
		memcpy(send_msg.data, port_base_vlan_info, data_size);
		hclgevf_send_mbx_msg(hdev, &send_msg, false, NULL, 0);

		ret = hclgevf_send_mbx_msg(hdev, &send_msg, false, NULL, 0);
		if (!ret) {
		if (state == HNAE3_PORT_BASE_VLAN_DISABLE)
		nic->port_base_vlan_state = HNAE3_PORT_BASE_VLAN_DISABLE;
		nic->port_base_vlan_state = state;
		else
		nic->port_base_vlan_state = HNAE3_PORT_BASE_VLAN_ENABLE;
		}

		rtnl_lock();
		hclgevf_notify_client(hdev, HNAE3_UP_CLIENT);
		rtnl_unlock();
		}