Commit b60f9d2e authored by Jian Shen's avatar Jian Shen Committed by David S. Miller
Browse files

net: hns3: split function hclge_init_vlan_config() 



Currently the function hclge_init_vlan_config() is a bit long.
Split it to several small functions, to simplify code and
improve code readability.

Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a1cfb24d

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

+55 −42
Original line number Diff line number Diff line
@@ -10194,67 +10194,80 @@ static int hclge_set_vlan_protocol_type(struct hclge_dev *hdev) 
	return status;

}



static int hclge_init_vlan_config(struct hclge_dev *hdev)

static int hclge_init_vlan_filter(struct hclge_dev *hdev)

{

#define HCLGE_DEF_VLAN_TYPE		0x8100



	struct hnae3_handle *handle = &hdev->vport[0].nic;

	struct hclge_vport *vport;

	int ret;

	int i;



	if (hdev->ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V2) {

	if (hdev->ae_dev->dev_version < HNAE3_DEVICE_VERSION_V2)

		return hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_VF,

						  HCLGE_FILTER_FE_EGRESS_V1_B,

						  true, 0);



	/* for revision 0x21, vf vlan filter is per function */

	for (i = 0; i < hdev->num_alloc_vport; i++) {

		vport = &hdev->vport[i];

			ret = hclge_set_vlan_filter_ctrl(hdev,

							 HCLGE_FILTER_TYPE_VF,

							 HCLGE_FILTER_FE_EGRESS,

							 true,

		ret = hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_VF,

						 HCLGE_FILTER_FE_EGRESS, true,

						 vport->vport_id);

		if (ret)

			return ret;

		vport->cur_vlan_fltr_en = true;

	}



		ret = hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_PORT,

						 HCLGE_FILTER_FE_INGRESS, true,

						 0);

		if (ret)

			return ret;

	} else {

		ret = hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_VF,

						 HCLGE_FILTER_FE_EGRESS_V1_B,

						 true, 0);

	return hclge_set_vlan_filter_ctrl(hdev, HCLGE_FILTER_TYPE_PORT,

					  HCLGE_FILTER_FE_INGRESS, true, 0);

}



static int hclge_init_vlan_type(struct hclge_dev *hdev)

{

	hdev->vlan_type_cfg.rx_in_fst_vlan_type = ETH_P_8021Q;

	hdev->vlan_type_cfg.rx_in_sec_vlan_type = ETH_P_8021Q;

	hdev->vlan_type_cfg.rx_ot_fst_vlan_type = ETH_P_8021Q;

	hdev->vlan_type_cfg.rx_ot_sec_vlan_type = ETH_P_8021Q;

	hdev->vlan_type_cfg.tx_ot_vlan_type = ETH_P_8021Q;

	hdev->vlan_type_cfg.tx_in_vlan_type = ETH_P_8021Q;



	return hclge_set_vlan_protocol_type(hdev);

}



static int hclge_init_vport_vlan_offload(struct hclge_dev *hdev)

{

	struct hclge_port_base_vlan_config *cfg;

	struct hclge_vport *vport;

	int ret;

	int i;



	for (i = 0; i < hdev->num_alloc_vport; i++) {

		vport = &hdev->vport[i];

		cfg = &vport->port_base_vlan_cfg;



		ret = hclge_vlan_offload_cfg(vport, cfg->state,

					     cfg->vlan_info.vlan_tag,

					     cfg->vlan_info.qos);

		if (ret)

			return ret;

	}

	return 0;

}



	hdev->vlan_type_cfg.rx_in_fst_vlan_type = HCLGE_DEF_VLAN_TYPE;

	hdev->vlan_type_cfg.rx_in_sec_vlan_type = HCLGE_DEF_VLAN_TYPE;

	hdev->vlan_type_cfg.rx_ot_fst_vlan_type = HCLGE_DEF_VLAN_TYPE;

	hdev->vlan_type_cfg.rx_ot_sec_vlan_type = HCLGE_DEF_VLAN_TYPE;

	hdev->vlan_type_cfg.tx_ot_vlan_type = HCLGE_DEF_VLAN_TYPE;

	hdev->vlan_type_cfg.tx_in_vlan_type = HCLGE_DEF_VLAN_TYPE;

static int hclge_init_vlan_config(struct hclge_dev *hdev)

{

	struct hnae3_handle *handle = &hdev->vport[0].nic;

	int ret;



	ret = hclge_set_vlan_protocol_type(hdev);

	ret = hclge_init_vlan_filter(hdev);

	if (ret)

		return ret;



	for (i = 0; i < hdev->num_alloc_vport; i++) {

		u16 vlan_tag;

		u8 qos;



		vport = &hdev->vport[i];

		vlan_tag = vport->port_base_vlan_cfg.vlan_info.vlan_tag;

		qos = vport->port_base_vlan_cfg.vlan_info.qos;

	ret = hclge_init_vlan_type(hdev);

	if (ret)

		return ret;



		ret = hclge_vlan_offload_cfg(vport,

					     vport->port_base_vlan_cfg.state,

					     vlan_tag, qos);

	ret = hclge_init_vport_vlan_offload(hdev);

	if (ret)

		return ret;

	}



	return hclge_set_vlan_filter(handle, htons(ETH_P_8021Q), 0, false);

}