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

Commit 89f411ec authored by Raju Rangoju's avatar Raju Rangoju Committed by Greg Kroah-Hartman
Browse files

amd-xgbe: fix the false linkup in xgbe_phy_status 



[ Upstream commit dc362e20cd6ab7a93d1b09669730c406f0910c35 ]

In the event of a change in XGBE mode, the current auto-negotiation
needs to be reset and the AN cycle needs to be re-triggerred. However,
the current code ignores the return value of xgbe_set_mode(), leading to
false information as the link is declared without checking the status
register.

Fix this by propagating the mode switch status information to
xgbe_phy_status().

Fixes: e57f7a3f ("amd-xgbe: Prepare for working with more than one type of phy")
Co-developed-by: default avatarSudheesh Mavila <sudheesh.mavila@amd.com>
Signed-off-by: default avatarSudheesh Mavila <sudheesh.mavila@amd.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Acked-by: default avatarShyam Sundar S K <Shyam-sundar.S-k@amd.com>
Signed-off-by: default avatarRaju Rangoju <Raju.Rangoju@amd.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 51bddc67

drivers/net/ethernet/amd/xgbe/xgbe-mdio.c

+9 −3
Original line number Diff line number Diff line
@@ -1312,7 +1312,7 @@ static enum xgbe_mode xgbe_phy_status_aneg(struct xgbe_prv_data *pdata) 
	return pdata->phy_if.phy_impl.an_outcome(pdata);

}



static void xgbe_phy_status_result(struct xgbe_prv_data *pdata)

static bool xgbe_phy_status_result(struct xgbe_prv_data *pdata)

{

	struct ethtool_link_ksettings *lks = &pdata->phy.lks;

	enum xgbe_mode mode;
@@ -1347,8 +1347,13 @@ static void xgbe_phy_status_result(struct xgbe_prv_data *pdata) 


	pdata->phy.duplex = DUPLEX_FULL;



	if (xgbe_set_mode(pdata, mode) && pdata->an_again)

	if (!xgbe_set_mode(pdata, mode))

		return false;



	if (pdata->an_again)

		xgbe_phy_reconfig_aneg(pdata);



	return true;

}



static void xgbe_phy_status(struct xgbe_prv_data *pdata)
@@ -1378,7 +1383,8 @@ static void xgbe_phy_status(struct xgbe_prv_data *pdata) 
			return;

		}



		xgbe_phy_status_result(pdata);

		if (xgbe_phy_status_result(pdata))

			return;



		if (test_bit(XGBE_LINK_INIT, &pdata->dev_state))

			clear_bit(XGBE_LINK_INIT, &pdata->dev_state);