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

Commit 48cb27f2 authored by Chinh Cao's avatar Chinh Cao Committed by Jeff Kirsher
Browse files

ice: Implement handlers for ethtool PHY/link operations 



This patch implements handlers for ethtool get_link_ksettings and
set_link_ksettings. Helper functions use by these handlers are also
introduced in this patch.

Signed-off-by: default avatarChinh Cao <chinh.t.cao@intel.com>
Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 0f9d5027

drivers/net/ethernet/intel/ice/ice_adminq_cmd.h

+5 −3
Original line number Diff line number Diff line
@@ -922,7 +922,9 @@ struct ice_aqc_set_phy_cfg_data { 
#define ICE_AQ_PHY_ENA_RX_PAUSE_ABILITY		BIT(1)

#define ICE_AQ_PHY_ENA_LOW_POWER	BIT(2)

#define ICE_AQ_PHY_ENA_LINK		BIT(3)

#define ICE_AQ_PHY_ENA_ATOMIC_LINK		BIT(5)

#define ICE_AQ_PHY_ENA_AUTO_LINK_UPDT	BIT(5)

#define ICE_AQ_PHY_ENA_LESM		BIT(6)

#define ICE_AQ_PHY_ENA_AUTO_FEC		BIT(7)

	u8 low_power_ctrl;

	__le16 eee_cap; /* Value from ice_aqc_get_phy_caps */

	__le16 eeer_value;

drivers/net/ethernet/intel/ice/ice_common.c

+112 −9
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ ice_aq_manage_mac_read(struct ice_hw *hw, void *buf, u16 buf_size, 
 *

 * Returns the various PHY capabilities supported on the Port (0x0600)

 */

static enum ice_status

enum ice_status

ice_aq_get_phy_caps(struct ice_port_info *pi, bool qual_mods, u8 report_mode,

		    struct ice_aqc_get_phy_caps_data *pcaps,

		    struct ice_sq_cd *cd)
@@ -1408,6 +1408,110 @@ void ice_clear_pxe_mode(struct ice_hw *hw) 
		ice_aq_clear_pxe_mode(hw);

}



/**

 * ice_get_link_speed_based_on_phy_type - returns link speed

 * @phy_type_low: lower part of phy_type

 *

 * This helper function will convert a phy_type_low to its corresponding link

 * speed.

 * Note: In the structure of phy_type_low, there should be one bit set, as

 * this function will convert one phy type to its speed.

 * If no bit gets set, ICE_LINK_SPEED_UNKNOWN will be returned

 * If more than one bit gets set, ICE_LINK_SPEED_UNKNOWN will be returned

 */

static u16

ice_get_link_speed_based_on_phy_type(u64 phy_type_low)

{

	u16 speed_phy_type_low = ICE_AQ_LINK_SPEED_UNKNOWN;



	switch (phy_type_low) {

	case ICE_PHY_TYPE_LOW_100BASE_TX:

	case ICE_PHY_TYPE_LOW_100M_SGMII:

		speed_phy_type_low = ICE_AQ_LINK_SPEED_100MB;

		break;

	case ICE_PHY_TYPE_LOW_1000BASE_T:

	case ICE_PHY_TYPE_LOW_1000BASE_SX:

	case ICE_PHY_TYPE_LOW_1000BASE_LX:

	case ICE_PHY_TYPE_LOW_1000BASE_KX:

	case ICE_PHY_TYPE_LOW_1G_SGMII:

		speed_phy_type_low = ICE_AQ_LINK_SPEED_1000MB;

		break;

	case ICE_PHY_TYPE_LOW_2500BASE_T:

	case ICE_PHY_TYPE_LOW_2500BASE_X:

	case ICE_PHY_TYPE_LOW_2500BASE_KX:

		speed_phy_type_low = ICE_AQ_LINK_SPEED_2500MB;

		break;

	case ICE_PHY_TYPE_LOW_5GBASE_T:

	case ICE_PHY_TYPE_LOW_5GBASE_KR:

		speed_phy_type_low = ICE_AQ_LINK_SPEED_5GB;

		break;

	case ICE_PHY_TYPE_LOW_10GBASE_T:

	case ICE_PHY_TYPE_LOW_10G_SFI_DA:

	case ICE_PHY_TYPE_LOW_10GBASE_SR:

	case ICE_PHY_TYPE_LOW_10GBASE_LR:

	case ICE_PHY_TYPE_LOW_10GBASE_KR_CR1:

	case ICE_PHY_TYPE_LOW_10G_SFI_AOC_ACC:

	case ICE_PHY_TYPE_LOW_10G_SFI_C2C:

		speed_phy_type_low = ICE_AQ_LINK_SPEED_10GB;

		break;

	case ICE_PHY_TYPE_LOW_25GBASE_T:

	case ICE_PHY_TYPE_LOW_25GBASE_CR:

	case ICE_PHY_TYPE_LOW_25GBASE_CR_S:

	case ICE_PHY_TYPE_LOW_25GBASE_CR1:

	case ICE_PHY_TYPE_LOW_25GBASE_SR:

	case ICE_PHY_TYPE_LOW_25GBASE_LR:

	case ICE_PHY_TYPE_LOW_25GBASE_KR:

	case ICE_PHY_TYPE_LOW_25GBASE_KR_S:

	case ICE_PHY_TYPE_LOW_25GBASE_KR1:

	case ICE_PHY_TYPE_LOW_25G_AUI_AOC_ACC:

	case ICE_PHY_TYPE_LOW_25G_AUI_C2C:

		speed_phy_type_low = ICE_AQ_LINK_SPEED_25GB;

		break;

	case ICE_PHY_TYPE_LOW_40GBASE_CR4:

	case ICE_PHY_TYPE_LOW_40GBASE_SR4:

	case ICE_PHY_TYPE_LOW_40GBASE_LR4:

	case ICE_PHY_TYPE_LOW_40GBASE_KR4:

	case ICE_PHY_TYPE_LOW_40G_XLAUI_AOC_ACC:

	case ICE_PHY_TYPE_LOW_40G_XLAUI:

		speed_phy_type_low = ICE_AQ_LINK_SPEED_40GB;

		break;

	default:

		speed_phy_type_low = ICE_AQ_LINK_SPEED_UNKNOWN;

		break;

	}



	return speed_phy_type_low;

}



/**

 * ice_update_phy_type

 * @phy_type_low: pointer to the lower part of phy_type

 * @link_speeds_bitmap: targeted link speeds bitmap

 *

 * Note: For the link_speeds_bitmap structure, you can check it at

 * [ice_aqc_get_link_status->link_speed]. Caller can pass in

 * link_speeds_bitmap include multiple speeds.

 *

 * The value of phy_type_low will present a certain link speed. This helper

 * function will turn on bits in the phy_type_low based on the value of

 * link_speeds_bitmap input parameter.

 */

void ice_update_phy_type(u64 *phy_type_low, u16 link_speeds_bitmap)

{

	u16 speed = ICE_AQ_LINK_SPEED_UNKNOWN;

	u64 pt_low;

	int index;



	/* We first check with low part of phy_type */

	for (index = 0; index <= ICE_PHY_TYPE_LOW_MAX_INDEX; index++) {

		pt_low = BIT_ULL(index);

		speed = ice_get_link_speed_based_on_phy_type(pt_low);



		if (link_speeds_bitmap & speed)

			*phy_type_low |= BIT_ULL(index);

	}

}



/**

 * ice_aq_set_phy_cfg

 * @hw: pointer to the hw struct
@@ -1420,19 +1524,18 @@ void ice_clear_pxe_mode(struct ice_hw *hw) 
 * mode as the PF may not have the privilege to set some of the PHY Config

 * parameters. This status will be indicated by the command response (0x0601).

 */

static enum ice_status

enum ice_status

ice_aq_set_phy_cfg(struct ice_hw *hw, u8 lport,

		   struct ice_aqc_set_phy_cfg_data *cfg, struct ice_sq_cd *cd)

{

	struct ice_aqc_set_phy_cfg *cmd;

	struct ice_aq_desc desc;



	if (!cfg)

		return ICE_ERR_PARAM;



	cmd = &desc.params.set_phy;

	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_set_phy_cfg);

	cmd->lport_num = lport;

	desc.params.set_phy.lport_num = lport;

	desc.flags |= cpu_to_le16(ICE_AQ_FLAG_RD);



	return ice_aq_send_cmd(hw, &desc, cfg, sizeof(*cfg), cd);

}
@@ -1481,12 +1584,12 @@ ice_update_link_info(struct ice_port_info *pi) 
 * ice_set_fc

 * @pi: port information structure

 * @aq_failures: pointer to status code, specific to ice_set_fc routine

 * @atomic_restart: enable automatic link update

 * @ena_auto_link_update: enable automatic link update

 *

 * Set the requested flow control mode.

 */

enum ice_status

ice_set_fc(struct ice_port_info *pi, u8 *aq_failures, bool atomic_restart)

ice_set_fc(struct ice_port_info *pi, u8 *aq_failures, bool ena_auto_link_update)

{

	struct ice_aqc_set_phy_cfg_data cfg = { 0 };

	struct ice_aqc_get_phy_caps_data *pcaps;
@@ -1536,8 +1639,8 @@ ice_set_fc(struct ice_port_info *pi, u8 *aq_failures, bool atomic_restart) 
		int retry_count, retry_max = 10;



		/* Auto restart link so settings take effect */

		if (atomic_restart)

			cfg.caps |= ICE_AQ_PHY_ENA_ATOMIC_LINK;

		if (ena_auto_link_update)

			cfg.caps |= ICE_AQ_PHY_ENA_AUTO_LINK_UPDT;

		/* Copy over all the old settings */

		cfg.phy_type_low = pcaps->phy_type_low;

		cfg.low_power_ctrl = pcaps->low_power_ctrl;

drivers/net/ethernet/intel/ice/ice_common.h

+13 −1
Original line number Diff line number Diff line
@@ -58,12 +58,24 @@ enum ice_status 
ice_aq_send_cmd(struct ice_hw *hw, struct ice_aq_desc *desc,

		void *buf, u16 buf_size, struct ice_sq_cd *cd);

enum ice_status ice_aq_get_fw_ver(struct ice_hw *hw, struct ice_sq_cd *cd);



enum ice_status

ice_aq_get_phy_caps(struct ice_port_info *pi, bool qual_mods, u8 report_mode,

		    struct ice_aqc_get_phy_caps_data *caps,

		    struct ice_sq_cd *cd);

void

ice_update_phy_type(u64 *phy_type_low, u16 link_speeds_bitmap);

enum ice_status

ice_aq_manage_mac_write(struct ice_hw *hw, u8 *mac_addr, u8 flags,

			struct ice_sq_cd *cd);

enum ice_status ice_clear_pf_cfg(struct ice_hw *hw);

enum ice_status

ice_set_fc(struct ice_port_info *pi, u8 *aq_failures, bool atomic_restart);

ice_aq_set_phy_cfg(struct ice_hw *hw, u8 lport,

		   struct ice_aqc_set_phy_cfg_data *cfg, struct ice_sq_cd *cd);

enum ice_status

ice_set_fc(struct ice_port_info *pi, u8 *aq_failures,

	   bool ena_auto_link_update);



enum ice_status

ice_aq_set_link_restart_an(struct ice_port_info *pi, bool ena_link,

			   struct ice_sq_cd *cd);

drivers/net/ethernet/intel/ice/ice_ethtool.c

+761 −40

File changed.

Preview size limit exceeded, changes collapsed.