Commit 74ba23a1 authored by Guangbin Huang's avatar Guangbin Huang Committed by David S. Miller
Browse files

net: hns3: use capability flag to indicate FEC 



Currently, the revision of the pci device is used to identify
whether FEC is supported, which is not good for maintainability
and compatibility. So use a capability flag to do that.

Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ca850f2b

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

+4 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#define HNAE3_ROCE_CLIENT_INITED_B		0x5

#define HNAE3_DEV_SUPPORT_FD_B			0x6

#define HNAE3_DEV_SUPPORT_GRO_B			0x7

#define HNAE3_DEV_SUPPORT_FEC_B			0x9



#define HNAE3_DEV_SUPPORT_ROCE_DCB_BITS (BIT(HNAE3_DEV_SUPPORT_DCB_B) |\

		BIT(HNAE3_DEV_SUPPORT_ROCE_B))
@@ -79,6 +80,9 @@ 
#define hnae3_dev_gro_supported(hdev) \

	hnae3_get_bit((hdev)->ae_dev->flag, HNAE3_DEV_SUPPORT_GRO_B)



#define hnae3_dev_fec_supported(hdev) \

	hnae3_get_bit((hdev)->ae_dev->flag, HNAE3_DEV_SUPPORT_FEC_B)



#define ring_ptr_move_fw(ring, p) \

	((ring)->p = ((ring)->p + 1) % (ring)->desc_num)

#define ring_ptr_move_bw(ring, p) \

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

+4 −2
Original line number Diff line number Diff line
@@ -1363,11 +1363,12 @@ static int hns3_get_fecparam(struct net_device *netdev, 
			     struct ethtool_fecparam *fec)

{

	struct hnae3_handle *handle = hns3_get_handle(netdev);

	struct hnae3_ae_dev *ae_dev = pci_get_drvdata(handle->pdev);

	const struct hnae3_ae_ops *ops = handle->ae_algo->ops;

	u8 fec_ability;

	u8 fec_mode;



	if (handle->pdev->revision == 0x20)

	if (!hnae3_get_bit(ae_dev->flag, HNAE3_DEV_SUPPORT_FEC_B))

		return -EOPNOTSUPP;



	if (!ops->get_fec)
@@ -1385,10 +1386,11 @@ static int hns3_set_fecparam(struct net_device *netdev, 
			     struct ethtool_fecparam *fec)

{

	struct hnae3_handle *handle = hns3_get_handle(netdev);

	struct hnae3_ae_dev *ae_dev = pci_get_drvdata(handle->pdev);

	const struct hnae3_ae_ops *ops = handle->ae_algo->ops;

	u32 fec_mode;



	if (handle->pdev->revision == 0x20)

	if (!hnae3_get_bit(ae_dev->flag, HNAE3_DEV_SUPPORT_FEC_B))

		return -EOPNOTSUPP;



	if (!ops->set_fec)

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

+1 −0
Original line number Diff line number Diff line
@@ -355,6 +355,7 @@ hclge_cmd_query_version_and_capability(struct hclge_dev *hdev) 
	    ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V2) {

		hnae3_set_bit(ae_dev->flag, HNAE3_DEV_SUPPORT_FD_B, 1);

		hnae3_set_bit(ae_dev->flag, HNAE3_DEV_SUPPORT_GRO_B, 1);

		hnae3_set_bit(ae_dev->flag, HNAE3_DEV_SUPPORT_FEC_B, 1);

	}



	return ret;

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

+2 −2
Original line number Diff line number Diff line
@@ -1157,7 +1157,7 @@ static void hclge_parse_fiber_link_mode(struct hclge_dev *hdev, 
	hclge_convert_setting_sr(mac, speed_ability);

	hclge_convert_setting_lr(mac, speed_ability);

	hclge_convert_setting_cr(mac, speed_ability);

	if (hdev->pdev->revision >= 0x21)

	if (hnae3_dev_fec_supported(hdev))

		hclge_convert_setting_fec(mac);



	linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, mac->supported);
@@ -1171,7 +1171,7 @@ static void hclge_parse_backplane_link_mode(struct hclge_dev *hdev, 
	struct hclge_mac *mac = &hdev->hw.mac;



	hclge_convert_setting_kr(mac, speed_ability);

	if (hdev->pdev->revision >= 0x21)

	if (hnae3_dev_fec_supported(hdev))

		hclge_convert_setting_fec(mac);

	linkmode_set_bit(ETHTOOL_LINK_MODE_Backplane_BIT, mac->supported);

	linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, mac->supported);