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

Commit 8109e123 authored by Catherine Sullivan's avatar Catherine Sullivan Committed by Jeff Kirsher
Browse files

i40e/i40evf: Add new HW link info variable an_enabled and function update_link_info 



Add a new variable, hw.phy.link_info.an_enabled, to track whether autoneg is
enabled.  Also add a new function update_link_info that will update that
variable as well as calling get_link_info to update the rest of the link info.
Also add get_phy_capabilities to support this.

Change-ID: I5157ef03492b6dd8ec5e608ba0cf9b0db9c01710
Signed-off-by: default avatarCatherine Sullivan <catherine.sullivan@intel.com>
Tested-by: default avatarJim Young <jamesx.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 4e91bcd5

drivers/net/ethernet/intel/i40e/i40e_common.c

+75 −0
Original line number Diff line number Diff line
@@ -1036,6 +1036,52 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink) 


/* Admin command wrappers */



/**

 * i40e_aq_get_phy_capabilities

 * @hw: pointer to the hw struct

 * @abilities: structure for PHY capabilities to be filled

 * @qualified_modules: report Qualified Modules

 * @report_init: report init capabilities (active are default)

 * @cmd_details: pointer to command details structure or NULL

 *

 * Returns the various PHY abilities supported on the Port.

 **/

i40e_status i40e_aq_get_phy_capabilities(struct i40e_hw *hw,

			bool qualified_modules, bool report_init,

			struct i40e_aq_get_phy_abilities_resp *abilities,

			struct i40e_asq_cmd_details *cmd_details)

{

	struct i40e_aq_desc desc;

	i40e_status status;

	u16 abilities_size = sizeof(struct i40e_aq_get_phy_abilities_resp);



	if (!abilities)

		return I40E_ERR_PARAM;



	i40e_fill_default_direct_cmd_desc(&desc,

					  i40e_aqc_opc_get_phy_abilities);



	desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_BUF);

	if (abilities_size > I40E_AQ_LARGE_BUF)

		desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_LB);



	if (qualified_modules)

		desc.params.external.param0 |=

			cpu_to_le32(I40E_AQ_PHY_REPORT_QUALIFIED_MODULES);



	if (report_init)

		desc.params.external.param0 |=

			cpu_to_le32(I40E_AQ_PHY_REPORT_INITIAL_VALUES);



	status = i40e_asq_send_command(hw, &desc, abilities, abilities_size,

				       cmd_details);



	if (hw->aq.asq_last_status == I40E_AQ_RC_EIO)

		status = I40E_ERR_UNKNOWN_PHY;



	return status;

}



/**

 * i40e_aq_clear_pxe_mode

 * @hw: pointer to the hw struct
@@ -1162,6 +1208,35 @@ i40e_status i40e_aq_get_link_info(struct i40e_hw *hw, 
	return status;

}



/**

 * i40e_update_link_info

 * @hw: pointer to the hw struct

 * @enable_lse: enable/disable LinkStatusEvent reporting

 *

 * Returns the link status of the adapter

 **/

i40e_status i40e_update_link_info(struct i40e_hw *hw, bool enable_lse)

{

	struct i40e_aq_get_phy_abilities_resp abilities;

	i40e_status status;



	status = i40e_aq_get_link_info(hw, enable_lse, NULL, NULL);

	if (status)

		return status;



	status = i40e_aq_get_phy_capabilities(hw, false, false,

					      &abilities, NULL);

	if (status)

		return status;



	if (abilities.abilities & I40E_AQ_PHY_AN_ENABLED)

		hw->phy.link_info.an_enabled = true;

	else

		hw->phy.link_info.an_enabled = false;



	return status;

}



/**

 * i40e_aq_add_vsi

 * @hw: pointer to the hw struct

drivers/net/ethernet/intel/i40e/i40e_main.c

+2 −2
Original line number Diff line number Diff line
@@ -5292,7 +5292,7 @@ static void i40e_handle_link_event(struct i40e_pf *pf, 
	 * then see if the status changed while processing the

	 * initial event.

	 */

	i40e_aq_get_link_info(&pf->hw, true, NULL, NULL);

	i40e_update_link_info(&pf->hw, true);

	i40e_link_event(pf);

}
@@ -8337,7 +8337,7 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit) 
		i40e_config_rss(pf);



	/* fill in link information and enable LSE reporting */

	i40e_aq_get_link_info(&pf->hw, true, NULL, NULL);

	i40e_update_link_info(&pf->hw, true);

	i40e_link_event(pf);



	/* Initialize user-specific link properties */

drivers/net/ethernet/intel/i40e/i40e_prototype.h

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ i40e_status i40e_aq_set_link_restart_an(struct i40e_hw *hw, 
i40e_status i40e_aq_get_link_info(struct i40e_hw *hw,

				bool enable_lse, struct i40e_link_status *link,

				struct i40e_asq_cmd_details *cmd_details);

i40e_status i40e_update_link_info(struct i40e_hw *hw, bool enable_lse);

i40e_status i40e_aq_set_local_advt_reg(struct i40e_hw *hw,

				u64 advt_reg,

				struct i40e_asq_cmd_details *cmd_details);

drivers/net/ethernet/intel/i40e/i40e_type.h

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ struct i40e_link_status { 
	u8 an_info;

	u8 ext_info;

	u8 loopback;

	bool an_enabled;

	/* is Link Status Event notification to SW enabled */

	bool lse_enable;

	u16 max_frame_size;

drivers/net/ethernet/intel/i40evf/i40e_type.h

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ struct i40e_link_status { 
	u8 an_info;

	u8 ext_info;

	u8 loopback;

	bool an_enabled;

	/* is Link Status Event notification to SW enabled */

	bool lse_enable;

	u16 max_frame_size;