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

Commit b2641e2a authored by Yunsheng Lin's avatar Yunsheng Lin Committed by David S. Miller
Browse files

net: hns3: Add support of hardware rx-vlan-offload to HNS3 VF driver 



This patch adds support of hardware rx-vlan-offload to VF driver.
VF uses mailbox to convey PF to configure the hardware.

Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3e50d2da

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+1 −7
Original line number Diff line number Diff line
@@ -1626,8 +1626,6 @@ static struct pci_driver hns3_driver = { 
/* set default feature to hns3 */

static void hns3_set_default_feature(struct net_device *netdev)

{

	struct hnae3_handle *h = hns3_get_handle(netdev);



	netdev->priv_flags |= IFF_UNICAST_FLT;



	netdev->hw_enc_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
@@ -1656,15 +1654,11 @@ static void hns3_set_default_feature(struct net_device *netdev) 
		NETIF_F_GSO_UDP_TUNNEL_CSUM;



	netdev->hw_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |

		NETIF_F_HW_VLAN_CTAG_TX |

		NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |

		NETIF_F_RXCSUM | NETIF_F_SG | NETIF_F_GSO |

		NETIF_F_GRO | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_GSO_GRE |

		NETIF_F_GSO_GRE_CSUM | NETIF_F_GSO_UDP_TUNNEL |

		NETIF_F_GSO_UDP_TUNNEL_CSUM;



	if (!(h->flags & HNAE3_SUPPORT_VF))

		netdev->hw_features |=

			NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_HW_VLAN_CTAG_RX;

}



static int hns3_alloc_buffer(struct hns3_enet_ring *ring,

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

+1 −1
Original line number Diff line number Diff line
@@ -4862,7 +4862,7 @@ static int hclge_init_vlan_config(struct hclge_dev *hdev) 
	return hclge_set_vlan_filter(handle, htons(ETH_P_8021Q), 0, false);

}



static int hclge_en_hw_strip_rxvtag(struct hnae3_handle *handle, bool enable)

int hclge_en_hw_strip_rxvtag(struct hnae3_handle *handle, bool enable)

{

	struct hclge_vport *vport = hclge_get_vport(handle);

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

+1 −0
Original line number Diff line number Diff line
@@ -652,6 +652,7 @@ static inline int hclge_get_queue_id(struct hnae3_queue *queue) 
int hclge_cfg_mac_speed_dup(struct hclge_dev *hdev, int speed, u8 duplex);

int hclge_set_vlan_filter(struct hnae3_handle *handle, __be16 proto,

			  u16 vlan_id, bool is_kill);

int hclge_en_hw_strip_rxvtag(struct hnae3_handle *handle, bool enable);



int hclge_buffer_alloc(struct hclge_dev *hdev);

int hclge_rss_init_hw(struct hclge_dev *hdev);

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

+5 −0
Original line number Diff line number Diff line
@@ -276,6 +276,11 @@ static int hclge_set_vf_vlan_cfg(struct hclge_vport *vport, 
		memcpy(&proto, &mbx_req->msg[5], sizeof(proto));

		status = hclge_set_vlan_filter(handle, cpu_to_be16(proto),

					       vlan, is_kill);

	} else if (mbx_req->msg[1] == HCLGE_MBX_VLAN_RX_OFF_CFG) {

		struct hnae3_handle *handle = &vport->nic;

		bool en = mbx_req->msg[2] ? true : false;



		status = hclge_en_hw_strip_rxvtag(handle, en);

	}



	if (gen_resp)

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

+12 −0
Original line number Diff line number Diff line
@@ -830,6 +830,17 @@ static int hclgevf_set_vlan_filter(struct hnae3_handle *handle, 
				    HCLGEVF_VLAN_MBX_MSG_LEN, false, NULL, 0);

}



static int hclgevf_en_hw_strip_rxvtag(struct hnae3_handle *handle, bool enable)

{

	struct hclgevf_dev *hdev = hclgevf_ae_get_hdev(handle);

	u8 msg_data;



	msg_data = enable ? 1 : 0;

	return hclgevf_send_mbx_msg(hdev, HCLGE_MBX_SET_VLAN,

				    HCLGE_MBX_VLAN_RX_OFF_CFG, &msg_data,

				    1, false, NULL, 0);

}



static void hclgevf_reset_tqp(struct hnae3_handle *handle, u16 queue_id)

{

	struct hclgevf_dev *hdev = hclgevf_ae_get_hdev(handle);
@@ -1825,6 +1836,7 @@ static const struct hnae3_ae_ops hclgevf_ops = { 
	.get_tc_size = hclgevf_get_tc_size,

	.get_fw_version = hclgevf_get_fw_version,

	.set_vlan_filter = hclgevf_set_vlan_filter,

	.enable_hw_strip_rxvtag = hclgevf_en_hw_strip_rxvtag,

	.reset_event = hclgevf_reset_event,

	.get_channels = hclgevf_get_channels,

	.get_tqps_and_rss_info = hclgevf_get_tqps_and_rss_info,