amd-xgbe: fix the false linkup in xgbe_phy_status
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: e57f7a3fea
("amd-xgbe: Prepare for working with more than one type of phy")
Co-developed-by: Sudheesh Mavila <sudheesh.mavila@amd.com>
Signed-off-by: Sudheesh Mavila <sudheesh.mavila@amd.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Acked-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Signed-off-by: Raju Rangoju <Raju.Rangoju@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
8a0d57df89
Коммит
dc362e20cd
|
@ -1329,7 +1329,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;
|
||||
|
@ -1367,8 +1367,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)
|
||||
|
@ -1398,7 +1403,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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче