Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aebd17b7 authored by Xue Chaojing's avatar Xue Chaojing Committed by David S. Miller
Browse files

hinic: add vlan offload support 



This patch adds vlan offload support for the HINIC driver.

Signed-off-by: default avatarXue Chaojing <xuechaojing@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0a7960c7

drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ enum hinic_port_cmd { 


	HINIC_PORT_CMD_SET_RX_CSUM	= 26,



	HINIC_PORT_CMD_SET_RX_VLAN_OFFLOAD = 27,



	HINIC_PORT_CMD_GET_PORT_STATISTICS = 28,



	HINIC_PORT_CMD_CLEAR_PORT_STATISTICS = 29,

drivers/net/ethernet/huawei/hinic/hinic_hw_wqe.h

+15 −0
Original line number Diff line number Diff line
@@ -222,6 +222,8 @@ 


#define RQ_CQE_OFFOLAD_TYPE_PKT_TYPE_SHIFT		0

#define RQ_CQE_OFFOLAD_TYPE_PKT_TYPE_MASK		0xFFFU

#define RQ_CQE_OFFOLAD_TYPE_VLAN_EN_SHIFT		21

#define RQ_CQE_OFFOLAD_TYPE_VLAN_EN_MASK		0x1U



#define RQ_CQE_OFFOLAD_TYPE_GET(val, member)		(((val) >> \

				RQ_CQE_OFFOLAD_TYPE_##member##_SHIFT) & \
@@ -230,6 +232,19 @@ 
#define HINIC_GET_RX_PKT_TYPE(offload_type)	\

			RQ_CQE_OFFOLAD_TYPE_GET(offload_type, PKT_TYPE)



#define HINIC_GET_RX_VLAN_OFFLOAD_EN(offload_type)	\

			RQ_CQE_OFFOLAD_TYPE_GET(offload_type, VLAN_EN)



#define RQ_CQE_SGE_VLAN_MASK				0xFFFFU

#define RQ_CQE_SGE_VLAN_SHIFT				0



#define RQ_CQE_SGE_GET(val, member)			(((val) >> \

					RQ_CQE_SGE_##member##_SHIFT) & \

					RQ_CQE_SGE_##member##_MASK)



#define HINIC_GET_RX_VLAN_TAG(vlan_len)	\

		RQ_CQE_SGE_GET(vlan_len, VLAN)



#define HINIC_RSS_TYPE_VALID_SHIFT			23

#define HINIC_RSS_TYPE_TCP_IPV6_EXT_SHIFT		24

#define HINIC_RSS_TYPE_IPV6_EXT_SHIFT			25

drivers/net/ethernet/huawei/hinic/hinic_main.c

+7 −2
Original line number Diff line number Diff line
@@ -836,14 +836,14 @@ static const struct net_device_ops hinic_netdev_ops = { 
	.ndo_get_stats64 = hinic_get_stats64,

	.ndo_fix_features = hinic_fix_features,

	.ndo_set_features = hinic_set_features,



};



static void netdev_features_init(struct net_device *netdev)

{

	netdev->hw_features = NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM |

			      NETIF_F_IPV6_CSUM | NETIF_F_TSO | NETIF_F_TSO6 |

			      NETIF_F_RXCSUM | NETIF_F_LRO;

			      NETIF_F_RXCSUM | NETIF_F_LRO |

			      NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;



	netdev->vlan_features = netdev->hw_features;
@@ -923,6 +923,11 @@ static int set_features(struct hinic_dev *nic_dev, 
					     HINIC_LRO_MAX_WQE_NUM_DEFAULT);

	}



	if (changed & NETIF_F_HW_VLAN_CTAG_RX)

		err = hinic_set_rx_vlan_offload(nic_dev,

						!!(features &

						   NETIF_F_HW_VLAN_CTAG_RX));



	return err;

}

drivers/net/ethernet/huawei/hinic/hinic_port.c

+30 −0
Original line number Diff line number Diff line
@@ -431,6 +431,36 @@ int hinic_set_rx_csum_offload(struct hinic_dev *nic_dev, u32 en) 
	return 0;

}



int hinic_set_rx_vlan_offload(struct hinic_dev *nic_dev, u8 en)

{

	struct hinic_hwdev *hwdev = nic_dev->hwdev;

	struct hinic_vlan_cfg vlan_cfg;

	struct hinic_hwif *hwif;

	struct pci_dev *pdev;

	u16 out_size;

	int err;



	if (!hwdev)

		return -EINVAL;



	hwif = hwdev->hwif;

	pdev = hwif->pdev;

	vlan_cfg.func_id = HINIC_HWIF_FUNC_IDX(hwif);

	vlan_cfg.vlan_rx_offload = en;



	err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_SET_RX_VLAN_OFFLOAD,

				 &vlan_cfg, sizeof(vlan_cfg),

				 &vlan_cfg, &out_size);

	if (err || !out_size || vlan_cfg.status) {

		dev_err(&pdev->dev,

			"Failed to set rx vlan offload, err: %d, status: 0x%x, out size: 0x%x\n",

			err, vlan_cfg.status, out_size);

		return -EINVAL;

	}



	return 0;

}



int hinic_set_max_qnum(struct hinic_dev *nic_dev, u8 num_rqs)

{

	struct hinic_hwdev *hwdev = nic_dev->hwdev;

drivers/net/ethernet/huawei/hinic/hinic_port.h

+13 −0
Original line number Diff line number Diff line
@@ -223,6 +223,16 @@ struct hinic_lro_timer { 
	u32	timer;

};



struct hinic_vlan_cfg {

	u8      status;

	u8      version;

	u8      rsvd0[6];



	u16     func_id;

	u8      vlan_rx_offload;

	u8      rsvd1[5];

};



struct hinic_rss_template_mgmt {

	u8	status;

	u8	version;
@@ -558,4 +568,7 @@ int hinic_get_phy_port_stats(struct hinic_dev *nic_dev, 


int hinic_get_vport_stats(struct hinic_dev *nic_dev,

			  struct hinic_vport_stats *stats);



int hinic_set_rx_vlan_offload(struct hinic_dev *nic_dev, u8 en);



#endif