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

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

net: hns3: add support for multiple media type 



Previously, we can only identify copper and fiber type, the
supported link modes of port information are always showing
SR type. This patch adds support for multiple media types,
include SR, LR CR, KR. Driver needs to query the media type
from firmware periodicly, and updates the port information.

The new port information looks like this:
Settings for eth0:
        Supported ports: [ FIBRE ]
        Supported link modes:   25000baseCR/Full
                                25000baseSR/Full
                                1000baseX/Full
                                10000baseCR/Full
                                10000baseSR/Full
                                10000baseLR/Full
        Supported pause frame use: Symmetric
        Supports auto-negotiation: No
        Supported FEC modes: None BaseR
        Advertised link modes:  Not reported
        Advertised pause frame use: No
        Advertised auto-negotiation: No
        Advertised FEC modes: Not reported
        Speed: 10000Mb/s
        Duplex: Full
        Port: FIBRE
        PHYAD: 0
        Transceiver: internal
        Auto-negotiation: off
        Current message level: 0x00000036 (54)
                               probe link ifdown ifup
        Link detected: yes

In order to be compatible with old firmware which only support
sfp speed, we remained using the same query command, and kept
the former logic.

Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e28441e2

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

+14 −4
Original line number Diff line number Diff line
@@ -120,6 +120,18 @@ enum hnae3_media_type { 
	HNAE3_MEDIA_TYPE_NONE,

};



/* must be consistent with definition in firmware */

enum hnae3_module_type {

	HNAE3_MODULE_TYPE_UNKNOWN	= 0x00,

	HNAE3_MODULE_TYPE_FIBRE_LR	= 0x01,

	HNAE3_MODULE_TYPE_FIBRE_SR	= 0x02,

	HNAE3_MODULE_TYPE_AOC		= 0x03,

	HNAE3_MODULE_TYPE_CR		= 0x04,

	HNAE3_MODULE_TYPE_KR		= 0x05,

	HNAE3_MODULE_TYPE_TP		= 0x06,



};



enum hnae3_reset_notify_type {

	HNAE3_UP_CLIENT,

	HNAE3_DOWN_CLIENT,
@@ -230,8 +242,6 @@ struct hnae3_ae_dev { 
 *   non-ok

 * get_ksettings_an_result()

 *   Get negotiation status,speed and duplex

 * update_speed_duplex_h()

 *   Update hardware speed and duplex

 * get_media_type()

 *   Get media type of MAC

 * adjust_link()
@@ -340,11 +350,11 @@ struct hnae3_ae_ops { 
	void (*get_ksettings_an_result)(struct hnae3_handle *handle,

					u8 *auto_neg, u32 *speed, u8 *duplex);



	int (*update_speed_duplex_h)(struct hnae3_handle *handle);

	int (*cfg_mac_speed_dup_h)(struct hnae3_handle *handle, int speed,

				   u8 duplex);



	void (*get_media_type)(struct hnae3_handle *handle, u8 *media_type);

	void (*get_media_type)(struct hnae3_handle *handle, u8 *media_type,

			       u8 *module_type);

	void (*adjust_link)(struct hnae3_handle *handle, int speed, int duplex);

	int (*set_loopback)(struct hnae3_handle *handle,

			    enum hnae3_loop loop_mode, bool en);

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

+11 −2
Original line number Diff line number Diff line
@@ -604,6 +604,7 @@ static int hns3_get_link_ksettings(struct net_device *netdev, 
{

	struct hnae3_handle *h = hns3_get_handle(netdev);

	const struct hnae3_ae_ops *ops;

	u8 module_type;

	u8 media_type;

	u8 link_stat;
@@ -612,7 +613,7 @@ static int hns3_get_link_ksettings(struct net_device *netdev, 


	ops = h->ae_algo->ops;

	if (ops->get_media_type)

		ops->get_media_type(h, &media_type);

		ops->get_media_type(h, &media_type, &module_type);

	else

		return -EOPNOTSUPP;
@@ -622,7 +623,15 @@ static int hns3_get_link_ksettings(struct net_device *netdev, 
		hns3_get_ksettings(h, cmd);

		break;

	case HNAE3_MEDIA_TYPE_FIBER:

		if (module_type == HNAE3_MODULE_TYPE_CR)

			cmd->base.port = PORT_DA;

		else

			cmd->base.port = PORT_FIBRE;



		hns3_get_ksettings(h, cmd);

		break;

	case HNAE3_MEDIA_TYPE_BACKPLANE:

		cmd->base.port = PORT_NONE;

		hns3_get_ksettings(h, cmd);

		break;

	case HNAE3_MEDIA_TYPE_COPPER:

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

+10 −4
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ enum hclge_opcode_type { 
	HCLGE_OPC_QUERY_NCL_CONFIG	= 0x7011,



	/* SFP command */

	HCLGE_OPC_SFP_GET_SPEED		= 0x7104,

	HCLGE_OPC_GET_SFP_INFO		= 0x7104,



	/* Error INT commands */

	HCLGE_MAC_COMMON_INT_EN		= 0x030E,
@@ -599,9 +599,15 @@ struct hclge_config_auto_neg_cmd { 
	u8      rsv[20];

};



struct hclge_sfp_speed_cmd {

	__le32	sfp_speed;

	u32	rsv[5];

struct hclge_sfp_info_cmd {

	__le32 speed;

	u8 query_type; /* 0: sfp speed, 1: active speed */

	u8 active_fec;

	u8 autoneg; /* autoneg state */

	u8 autoneg_ability; /* whether support autoneg */

	__le32 speed_ability; /* speed ability for current media */

	__le32 module_type;

	u8 rsv[8];

};



#define HCLGE_MAC_UPLINK_PORT		0x100

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

+186 −44
Original line number Diff line number Diff line
@@ -845,33 +845,110 @@ static int hclge_parse_speed(int speed_cmd, int *speed) 
	return 0;

}



static void hclge_parse_fiber_link_mode(struct hclge_dev *hdev,

					u8 speed_ability)

static void hclge_convert_setting_sr(struct hclge_mac *mac, u8 speed_ability)

{

	unsigned long *supported = hdev->hw.mac.supported;



	if (speed_ability & HCLGE_SUPPORT_1G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,

				 supported);



	if (speed_ability & HCLGE_SUPPORT_10G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseSR_Full_BIT,

				 supported);

				 mac->supported);

	if (speed_ability & HCLGE_SUPPORT_25G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_25000baseSR_Full_BIT,

				 mac->supported);

	if (speed_ability & HCLGE_SUPPORT_40G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_40000baseSR4_Full_BIT,

				 mac->supported);

	if (speed_ability & HCLGE_SUPPORT_50G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT,

				 mac->supported);

	if (speed_ability & HCLGE_SUPPORT_100G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT,

				 mac->supported);

}



static void hclge_convert_setting_lr(struct hclge_mac *mac, u8 speed_ability)

{

	if (speed_ability & HCLGE_SUPPORT_10G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseLR_Full_BIT,

				 mac->supported);

	if (speed_ability & HCLGE_SUPPORT_25G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_25000baseSR_Full_BIT,

				 supported);

				 mac->supported);

	if (speed_ability & HCLGE_SUPPORT_50G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_50000baseLR_ER_FR_Full_BIT,

				 mac->supported);

	if (speed_ability & HCLGE_SUPPORT_40G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_40000baseLR4_Full_BIT,

				 mac->supported);

	if (speed_ability & HCLGE_SUPPORT_100G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT,

				 mac->supported);

}



static void hclge_convert_setting_cr(struct hclge_mac *mac, u8 speed_ability)

{

	if (speed_ability & HCLGE_SUPPORT_10G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseCR_Full_BIT,

				 mac->supported);

	if (speed_ability & HCLGE_SUPPORT_25G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_25000baseCR_Full_BIT,

				 mac->supported);

	if (speed_ability & HCLGE_SUPPORT_40G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT,

				 mac->supported);

	if (speed_ability & HCLGE_SUPPORT_50G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT,

				 supported);

		linkmode_set_bit(ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT,

				 mac->supported);

	if (speed_ability & HCLGE_SUPPORT_100G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT,

				 mac->supported);

}



static void hclge_convert_setting_kr(struct hclge_mac *mac, u8 speed_ability)

{

	if (speed_ability & HCLGE_SUPPORT_1G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseKX_Full_BIT,

				 mac->supported);

	if (speed_ability & HCLGE_SUPPORT_10G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseKR_Full_BIT,

				 mac->supported);

	if (speed_ability & HCLGE_SUPPORT_25G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_25000baseKR_Full_BIT,

				 mac->supported);

	if (speed_ability & HCLGE_SUPPORT_40G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_40000baseKR4_Full_BIT,

				 mac->supported);

	if (speed_ability & HCLGE_SUPPORT_50G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT,

				 mac->supported);

	if (speed_ability & HCLGE_SUPPORT_100G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT,

				 supported);

		linkmode_set_bit(ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT,

				 mac->supported);

}



	linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, supported);

	linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, supported);

static void hclge_parse_fiber_link_mode(struct hclge_dev *hdev,

					u8 speed_ability)

{

	struct hclge_mac *mac = &hdev->hw.mac;



	if (speed_ability & HCLGE_SUPPORT_1G_BIT)

		linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,

				 mac->supported);



	hclge_convert_setting_sr(mac, speed_ability);

	hclge_convert_setting_lr(mac, speed_ability);

	hclge_convert_setting_cr(mac, speed_ability);



	linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, mac->supported);

	linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, mac->supported);

}



static void hclge_parse_backplane_link_mode(struct hclge_dev *hdev,

					    u8 speed_ability)

{

	struct hclge_mac *mac = &hdev->hw.mac;



	hclge_convert_setting_kr(mac, speed_ability);

	linkmode_set_bit(ETHTOOL_LINK_MODE_Backplane_BIT, mac->supported);

	linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, mac->supported);

}



static void hclge_parse_copper_link_mode(struct hclge_dev *hdev,
@@ -912,8 +989,9 @@ static void hclge_parse_link_mode(struct hclge_dev *hdev, u8 speed_ability) 
		hclge_parse_fiber_link_mode(hdev, speed_ability);

	else if (media_type == HNAE3_MEDIA_TYPE_COPPER)

		hclge_parse_copper_link_mode(hdev, speed_ability);

	else if (media_type == HNAE3_MEDIA_TYPE_BACKPLANE)

		hclge_parse_backplane_link_mode(hdev, speed_ability);

}



static void hclge_parse_cfg(struct hclge_cfg *cfg, struct hclge_desc *desc)

{

	struct hclge_cfg_param_cmd *req;
@@ -2258,14 +2336,35 @@ static void hclge_update_link_status(struct hclge_dev *hdev) 
	}

}



static void hclge_update_port_capability(struct hclge_mac *mac)

{

	/* firmware can not identify back plane type, the media type

	 * read from configuration can help deal it

	 */

	if (mac->media_type == HNAE3_MEDIA_TYPE_BACKPLANE &&

	    mac->module_type == HNAE3_MODULE_TYPE_UNKNOWN)

		mac->module_type = HNAE3_MODULE_TYPE_KR;

	else if (mac->media_type == HNAE3_MEDIA_TYPE_COPPER)

		mac->module_type = HNAE3_MODULE_TYPE_TP;



	if (mac->support_autoneg == true) {

		linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, mac->supported);

		linkmode_copy(mac->advertising, mac->supported);

	} else {

		linkmode_clear_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,

				   mac->supported);

		linkmode_zero(mac->advertising);

	}

}



static int hclge_get_sfp_speed(struct hclge_dev *hdev, u32 *speed)

{

	struct hclge_sfp_speed_cmd *resp = NULL;

	struct hclge_sfp_info_cmd *resp = NULL;

	struct hclge_desc desc;

	int ret;



	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_SFP_GET_SPEED, true);

	resp = (struct hclge_sfp_speed_cmd *)desc.data;

	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_GET_SFP_INFO, true);

	resp = (struct hclge_sfp_info_cmd *)desc.data;

	ret = hclge_cmd_send(&hdev->hw, &desc, 1);

	if (ret == -EOPNOTSUPP) {

		dev_warn(&hdev->pdev->dev,
@@ -2276,28 +2375,67 @@ static int hclge_get_sfp_speed(struct hclge_dev *hdev, u32 *speed) 
		return ret;

	}



	*speed = resp->sfp_speed;

	*speed = le32_to_cpu(resp->speed);



	return 0;

}



static int hclge_update_speed_duplex(struct hclge_dev *hdev)

static int hclge_get_sfp_info(struct hclge_dev *hdev, struct hclge_mac *mac)

{

	struct hclge_mac mac = hdev->hw.mac;

	int speed;

	struct hclge_sfp_info_cmd *resp;

	struct hclge_desc desc;

	int ret;



	/* get the speed from SFP cmd when phy

	 * doesn't exit.

	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_GET_SFP_INFO, true);

	resp = (struct hclge_sfp_info_cmd *)desc.data;



	resp->query_type = QUERY_ACTIVE_SPEED;



	ret = hclge_cmd_send(&hdev->hw, &desc, 1);

	if (ret == -EOPNOTSUPP) {

		dev_warn(&hdev->pdev->dev,

			 "IMP does not support get SFP info %d\n", ret);

		return ret;

	} else if (ret) {

		dev_err(&hdev->pdev->dev, "get sfp info failed %d\n", ret);

		return ret;

	}



	mac->speed = le32_to_cpu(resp->speed);

	/* if resp->speed_ability is 0, it means it's an old version

	 * firmware, do not update these params

	 */

	if (mac.phydev)

	if (resp->speed_ability) {

		mac->module_type = le32_to_cpu(resp->module_type);

		mac->speed_ability = le32_to_cpu(resp->speed_ability);

		mac->autoneg = resp->autoneg;

		mac->support_autoneg = resp->autoneg_ability;

	} else {

		mac->speed_type = QUERY_SFP_SPEED;

	}



	return 0;

}



static int hclge_update_port_info(struct hclge_dev *hdev)

{

	struct hclge_mac *mac = &hdev->hw.mac;

	int speed = HCLGE_MAC_SPEED_UNKNOWN;

	int ret;



	/* get the port info from SFP cmd if not copper port */

	if (mac->media_type == HNAE3_MEDIA_TYPE_COPPER)

		return 0;



	/* if IMP does not support get SFP/qSFP speed, return directly */

	/* if IMP does not support get SFP/qSFP info, return directly */

	if (!hdev->support_sfp_query)

		return 0;



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

		ret = hclge_get_sfp_info(hdev, mac);

	else

		ret = hclge_get_sfp_speed(hdev, &speed);



	if (ret == -EOPNOTSUPP) {

		hdev->support_sfp_query = false;

		return ret;
@@ -2305,19 +2443,20 @@ static int hclge_update_speed_duplex(struct hclge_dev *hdev) 
		return ret;

	}



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

		if (mac->speed_type == QUERY_ACTIVE_SPEED) {

			hclge_update_port_capability(mac);

			return 0;

		}

		return hclge_cfg_mac_speed_dup(hdev, mac->speed,

					       HCLGE_MAC_FULL);

	} else {

		if (speed == HCLGE_MAC_SPEED_UNKNOWN)

			return 0; /* do nothing if no SFP */



		/* must config full duplex for SFP */

		return hclge_cfg_mac_speed_dup(hdev, speed, HCLGE_MAC_FULL);

	}



static int hclge_update_speed_duplex_h(struct hnae3_handle *handle)

{

	struct hclge_vport *vport = hclge_get_vport(handle);

	struct hclge_dev *hdev = vport->back;



	return hclge_update_speed_duplex(hdev);

}



static int hclge_get_status(struct hnae3_handle *handle)
@@ -3209,7 +3348,7 @@ static void hclge_service_task(struct work_struct *work) 
		hdev->hw_stats.stats_timer = 0;

	}



	hclge_update_speed_duplex(hdev);

	hclge_update_port_info(hdev);

	hclge_update_link_status(hdev);

	hclge_update_vport_alive(hdev);

	hclge_service_complete(hdev);
@@ -7497,13 +7636,17 @@ static void hclge_get_ksettings_an_result(struct hnae3_handle *handle, 
		*auto_neg = hdev->hw.mac.autoneg;

}



static void hclge_get_media_type(struct hnae3_handle *handle, u8 *media_type)

static void hclge_get_media_type(struct hnae3_handle *handle, u8 *media_type,

				 u8 *module_type)

{

	struct hclge_vport *vport = hclge_get_vport(handle);

	struct hclge_dev *hdev = vport->back;



	if (media_type)

		*media_type = hdev->hw.mac.media_type;



	if (module_type)

		*module_type = hdev->hw.mac.module_type;

}



static void hclge_get_mdix_mode(struct hnae3_handle *handle,
@@ -8541,7 +8684,6 @@ static const struct hnae3_ae_ops hclge_ops = { 
	.client_stop = hclge_client_stop,

	.get_status = hclge_get_status,

	.get_ksettings_an_result = hclge_get_ksettings_an_result,

	.update_speed_duplex_h = hclge_update_speed_duplex_h,

	.cfg_mac_speed_dup_h = hclge_cfg_mac_speed_dup_h,

	.get_media_type = hclge_get_media_type,

	.get_rss_key_size = hclge_get_rss_key_size,

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

+10 −1
Original line number Diff line number Diff line
@@ -189,6 +189,8 @@ enum HLCGE_PORT_TYPE { 
#define HCLGE_SUPPORT_25G_BIT		BIT(2)

#define HCLGE_SUPPORT_50G_BIT		BIT(3)

#define HCLGE_SUPPORT_100G_BIT		BIT(4)

/* to be compatible with exsit board */

#define HCLGE_SUPPORT_40G_BIT		BIT(5)

#define HCLGE_SUPPORT_100M_BIT		BIT(6)

#define HCLGE_SUPPORT_10M_BIT		BIT(7)

#define HCLGE_SUPPORT_GE \
@@ -236,14 +238,21 @@ enum HCLGE_MAC_DUPLEX { 
	HCLGE_MAC_FULL

};



#define QUERY_SFP_SPEED		0

#define QUERY_ACTIVE_SPEED	1



struct hclge_mac {

	u8 phy_addr;

	u8 flag;

	u8 media_type;

	u8 media_type;	/* port media type, e.g. fibre/copper/backplane */

	u8 mac_addr[ETH_ALEN];

	u8 autoneg;

	u8 duplex;

	u8 support_autoneg;

	u8 speed_type;	/* 0: sfp speed, 1: active speed */

	u32 speed;

	u32 speed_ability; /* speed ability supported by current media */

	u32 module_type; /* sub media type, e.g. kr/cr/sr/lr */

	int link;	/* store the link status of mac & phy (if phy exit)*/

	struct phy_device *phydev;

	struct mii_bus *mdio_bus;