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

Commit 34f9199c authored by sudarsana.kalluru@cavium.com's avatar sudarsana.kalluru@cavium.com Committed by David S. Miller
Browse files

qed: Fix overriding of supported autoneg value. 



Driver currently uses advertised-autoneg value to populate the
supported-autoneg field. When advertised field is updated, user gets
the same value for supported field. Supported-autoneg value need to be
populated from the link capabilities value returned by the MFW.

Signed-off-by: default avatarSudarsana Reddy Kalluru <Sudarsana.Kalluru@cavium.com>
Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f870a3c6

drivers/net/ethernet/qlogic/qed/qed_dev.c

+3 −0
Original line number Diff line number Diff line
@@ -2536,6 +2536,9 @@ static int qed_hw_get_nvm_info(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) 
		DP_NOTICE(p_hwfn, "Unknown Speed in 0x%08x\n", link_temp);

	}



	p_hwfn->mcp_info->link_capabilities.default_speed_autoneg =

		link->speed.autoneg;



	link_temp &= NVM_CFG1_PORT_DRV_FLOW_CONTROL_MASK;

	link_temp >>= NVM_CFG1_PORT_DRV_FLOW_CONTROL_OFFSET;

	link->pause.autoneg = !!(link_temp &

drivers/net/ethernet/qlogic/qed/qed_main.c

+5 −1
Original line number Diff line number Diff line
@@ -1372,7 +1372,7 @@ static void qed_fill_link(struct qed_hwfn *hwfn, 


	/* TODO - at the moment assume supported and advertised speed equal */

	if_link->supported_caps = QED_LM_FIBRE_BIT;

	if (params.speed.autoneg)

	if (link_caps.default_speed_autoneg)

		if_link->supported_caps |= QED_LM_Autoneg_BIT;

	if (params.pause.autoneg ||

	    (params.pause.forced_rx && params.pause.forced_tx))
@@ -1382,6 +1382,10 @@ static void qed_fill_link(struct qed_hwfn *hwfn, 
		if_link->supported_caps |= QED_LM_Pause_BIT;



	if_link->advertised_caps = if_link->supported_caps;

	if (params.speed.autoneg)

		if_link->advertised_caps |= QED_LM_Autoneg_BIT;

	else

		if_link->advertised_caps &= ~QED_LM_Autoneg_BIT;

	if (params.speed.advertised_speeds &

	    NVM_CFG1_PORT_DRV_SPEED_CAPABILITY_MASK_1G)

		if_link->advertised_caps |= QED_LM_1000baseT_Half_BIT |

drivers/net/ethernet/qlogic/qed/qed_mcp.h

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ struct qed_mcp_link_params { 


struct qed_mcp_link_capabilities {

	u32 speed_capabilities;

	bool default_speed_autoneg;

};



struct qed_mcp_link_state {