Commit 4e9d9d1f authored by Dan Carpenter's avatar Dan Carpenter Committed by Jakub Kicinski

net: phy: icplus: call phy_restore_page() when phy_select_page() fails

The comments to phy_select_page() say that "phy_restore_page() must
always be called after this, irrespective of success or failure of this
call."  If we don't call phy_restore_page() then we are still holding
the phy_lock_mdio_bus() so it eventually leads to a dead lock.

Fixes: 32ab60e5 ("net: phy: icplus: add MDI/MDIX support for IP101A/G")
Fixes: f9bc51e6 ("net: phy: icplus: fix paged register access")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarMichael Walle <michael@walle.cc>
Reviewed-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/YC+OpFGsDPXPnXM5@mwandaSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 0a8a8000
...@@ -239,7 +239,7 @@ static int ip101a_g_config_intr_pin(struct phy_device *phydev) ...@@ -239,7 +239,7 @@ static int ip101a_g_config_intr_pin(struct phy_device *phydev)
oldpage = phy_select_page(phydev, IP101G_DEFAULT_PAGE); oldpage = phy_select_page(phydev, IP101G_DEFAULT_PAGE);
if (oldpage < 0) if (oldpage < 0)
return oldpage; goto out;
/* configure the RXER/INTR_32 pin of the 32-pin IP101GR if needed: */ /* configure the RXER/INTR_32 pin of the 32-pin IP101GR if needed: */
switch (priv->sel_intr32) { switch (priv->sel_intr32) {
...@@ -314,7 +314,7 @@ static int ip101a_g_read_status(struct phy_device *phydev) ...@@ -314,7 +314,7 @@ static int ip101a_g_read_status(struct phy_device *phydev)
oldpage = phy_select_page(phydev, IP101G_DEFAULT_PAGE); oldpage = phy_select_page(phydev, IP101G_DEFAULT_PAGE);
if (oldpage < 0) if (oldpage < 0)
return oldpage; goto out;
ret = __phy_read(phydev, IP10XX_SPEC_CTRL_STATUS); ret = __phy_read(phydev, IP10XX_SPEC_CTRL_STATUS);
if (ret < 0) if (ret < 0)
...@@ -349,7 +349,8 @@ static int ip101a_g_read_status(struct phy_device *phydev) ...@@ -349,7 +349,8 @@ static int ip101a_g_read_status(struct phy_device *phydev)
static int ip101a_g_config_mdix(struct phy_device *phydev) static int ip101a_g_config_mdix(struct phy_device *phydev)
{ {
u16 ctrl = 0, ctrl2 = 0; u16 ctrl = 0, ctrl2 = 0;
int oldpage, ret; int oldpage;
int ret = 0;
switch (phydev->mdix_ctrl) { switch (phydev->mdix_ctrl) {
case ETH_TP_MDI: case ETH_TP_MDI:
...@@ -367,7 +368,7 @@ static int ip101a_g_config_mdix(struct phy_device *phydev) ...@@ -367,7 +368,7 @@ static int ip101a_g_config_mdix(struct phy_device *phydev)
oldpage = phy_select_page(phydev, IP101G_DEFAULT_PAGE); oldpage = phy_select_page(phydev, IP101G_DEFAULT_PAGE);
if (oldpage < 0) if (oldpage < 0)
return oldpage; goto out;
ret = __phy_modify(phydev, IP10XX_SPEC_CTRL_STATUS, ret = __phy_modify(phydev, IP10XX_SPEC_CTRL_STATUS,
IP101A_G_AUTO_MDIX_DIS, ctrl); IP101A_G_AUTO_MDIX_DIS, ctrl);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment