Commit 507e46ae authored by Guangbin Huang's avatar Guangbin Huang Committed by David S. Miller
Browse files

net: hns3: add getting capabilities of gro offload and fd from firmware 



As some new devices may not support GRO offload and flow table director,
to support these devices, driver needs to querying capabilities of GRO
offload and flow table director from firmware. Whether the driver
supports these two features depends on capabilities.

For old device of version HNAE3_DEVICE_VERSION_V2, driver sets their
capabilities of these two features to fixed value.

Setting default features of netdev and debugfs also need to identify
whether support these two features.

Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 39a7d726

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+4 −4
Original line number Diff line number Diff line
@@ -99,11 +99,11 @@ enum HNAE3_DEV_CAP_BITS { 
	HNAE3_DEV_SUPPORT_CQ_B,

};



#define hnae3_dev_fd_supported(hdev) \

	test_bit(HNAE3_DEV_SUPPORT_FD_B, (hdev)->ae_dev->caps)

#define hnae3_ae_dev_fd_supported(ae_dev) \

		test_bit(HNAE3_DEV_SUPPORT_FD_B, (ae_dev)->caps)



#define hnae3_dev_gro_supported(hdev) \

	test_bit(HNAE3_DEV_SUPPORT_GRO_B, (hdev)->ae_dev->caps)

#define hnae3_ae_dev_gro_supported(ae_dev) \

		test_bit(HNAE3_DEV_SUPPORT_GRO_B, (ae_dev)->caps)



#define hnae3_dev_fec_supported(hdev) \

	test_bit(HNAE3_DEV_SUPPORT_FEC_B, (hdev)->ae_dev->caps)

drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c

+8 −3
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ void hclge_comm_cmd_reuse_desc(struct hclge_desc *desc, bool is_read) 
static void hclge_comm_set_default_capability(struct hnae3_ae_dev *ae_dev,

					      bool is_pf)

{

	set_bit(HNAE3_DEV_SUPPORT_FD_B, ae_dev->caps);

	set_bit(HNAE3_DEV_SUPPORT_GRO_B, ae_dev->caps);

	if (is_pf && ae_dev->dev_version == HNAE3_DEVICE_VERSION_V2) {

	if (is_pf) {

		set_bit(HNAE3_DEV_SUPPORT_FD_B, ae_dev->caps);

		set_bit(HNAE3_DEV_SUPPORT_FEC_B, ae_dev->caps);

		set_bit(HNAE3_DEV_SUPPORT_PAUSE_B, ae_dev->caps);

	}
@@ -150,6 +150,8 @@ static const struct hclge_comm_caps_bit_map hclge_pf_cmd_caps[] = { 
	 HNAE3_DEV_SUPPORT_PORT_VLAN_BYPASS_B},

	{HCLGE_COMM_CAP_PORT_VLAN_BYPASS_B, HNAE3_DEV_SUPPORT_VLAN_FLTR_MDF_B},

	{HCLGE_COMM_CAP_CQ_B, HNAE3_DEV_SUPPORT_CQ_B},

	{HCLGE_COMM_CAP_GRO_B, HNAE3_DEV_SUPPORT_GRO_B},

	{HCLGE_COMM_CAP_FD_B, HNAE3_DEV_SUPPORT_FD_B},

};



static const struct hclge_comm_caps_bit_map hclge_vf_cmd_caps[] = {
@@ -162,6 +164,7 @@ static const struct hclge_comm_caps_bit_map hclge_vf_cmd_caps[] = { 
	{HCLGE_COMM_CAP_TX_PUSH_B, HNAE3_DEV_SUPPORT_TX_PUSH_B},

	{HCLGE_COMM_CAP_RXD_ADV_LAYOUT_B, HNAE3_DEV_SUPPORT_RXD_ADV_LAYOUT_B},

	{HCLGE_COMM_CAP_CQ_B, HNAE3_DEV_SUPPORT_CQ_B},

	{HCLGE_COMM_CAP_GRO_B, HNAE3_DEV_SUPPORT_GRO_B},

};



static void
@@ -220,8 +223,10 @@ int hclge_comm_cmd_query_version_and_capability(struct hnae3_ae_dev *ae_dev, 
					 HNAE3_PCI_REVISION_BIT_SIZE;

	ae_dev->dev_version |= ae_dev->pdev->revision;



	if (ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V2)

	if (ae_dev->dev_version == HNAE3_DEVICE_VERSION_V2) {

		hclge_comm_set_default_capability(ae_dev, is_pf);

		return 0;

	}



	hclge_comm_parse_capability(ae_dev, is_pf, resp);

drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h

+2 −0
Original line number Diff line number Diff line
@@ -339,6 +339,8 @@ enum HCLGE_COMM_CAP_BITS { 
	HCLGE_COMM_CAP_RXD_ADV_LAYOUT_B = 15,

	HCLGE_COMM_CAP_PORT_VLAN_BYPASS_B = 17,

	HCLGE_COMM_CAP_CQ_B = 18,

	HCLGE_COMM_CAP_GRO_B = 20,

	HCLGE_COMM_CAP_FD_B = 21,

};



enum HCLGE_COMM_API_CAP_BITS {

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

+3 −4
Original line number Diff line number Diff line
@@ -3271,12 +3271,11 @@ static void hns3_set_default_feature(struct net_device *netdev) 
		NETIF_F_GSO_GRE_CSUM | NETIF_F_GSO_UDP_TUNNEL |

		NETIF_F_SCTP_CRC | NETIF_F_FRAGLIST;



	if (ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V2) {

	if (hnae3_ae_dev_gro_supported(ae_dev))

		netdev->features |= NETIF_F_GRO_HW;



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

	if (hnae3_ae_dev_fd_supported(ae_dev))

		netdev->features |= NETIF_F_NTUPLE;

	}



	if (test_bit(HNAE3_DEV_SUPPORT_UDP_GSO_B, ae_dev->caps))

		netdev->features |= NETIF_F_GSO_UDP_L4;

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

+4 −1
Original line number Diff line number Diff line
@@ -1517,7 +1517,7 @@ static int hclge_dbg_dump_fd_tcam(struct hclge_dev *hdev, char *buf, int len) 
	char *tcam_buf;

	int pos = 0;



	if (!hnae3_dev_fd_supported(hdev)) {

	if (!hnae3_ae_dev_fd_supported(hdev->ae_dev)) {

		dev_err(&hdev->pdev->dev,

			"Only FD-supported dev supports dump fd tcam\n");

		return -EOPNOTSUPP;
@@ -1585,6 +1585,9 @@ static int hclge_dbg_dump_fd_counter(struct hclge_dev *hdev, char *buf, int len) 
	u64 cnt;

	u8 i;



	if (!hnae3_ae_dev_fd_supported(hdev->ae_dev))

		return -EOPNOTSUPP;



	pos += scnprintf(buf + pos, len - pos,

			 "func_id\thit_times\n");