leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

phy: phy_start_aneg: Add an unlocked version

Browse Source 
Split phy_start_aneg into a wrapper which takes the PHY lock, and a
helper doing the real work. This will be needed when
phy_ethtook_ksettings_set takes the lock.

Fixes: 2d55173e71 ("phy: add generic function to support ksetting support")
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrew Lunn 2021-10-24 21:48:04 +02:00 committed by David S. Miller
parent 64cd92d5e8
commit 707293a56f
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/net/phy/phy.c
View File

@ -699,6 +699,37 @@ static int phy_check_link_status(struct phy_device *phydev)
return 0; return 0;
} }
/**
* _phy_start_aneg - start auto-negotiation for this PHY device
* @phydev: the phy_device struct
*
* Description: Sanitizes the settings (if we're not autonegotiating
* them), and then calls the driver's config_aneg function.
* If the PHYCONTROL Layer is operating, we change the state to
* reflect the beginning of Auto-negotiation or forcing.
*/
static int _phy_start_aneg(struct phy_device *phydev)
{
int err;
lockdep_assert_held(&phydev->lock);
if (!phydev->drv)
return -EIO;
if (AUTONEG_DISABLE == phydev->autoneg)
phy_sanitize_settings(phydev);
err = phy_config_aneg(phydev);
if (err < 0)
return err;
if (phy_is_started(phydev))
err = phy_check_link_status(phydev);
return err;
}
/** /**
* phy_start_aneg - start auto-negotiation for this PHY device * phy_start_aneg - start auto-negotiation for this PHY device
* @phydev: the phy_device struct * @phydev: the phy_device struct
@ -712,21 +743,8 @@ int phy_start_aneg(struct phy_device *phydev)
{ {
int err; int err;
if (!phydev->drv)
return -EIO;
mutex_lock(&phydev->lock); mutex_lock(&phydev->lock);
err = _phy_start_aneg(phydev);
if (AUTONEG_DISABLE == phydev->autoneg)
phy_sanitize_settings(phydev);
err = phy_config_aneg(phydev);
if (err < 0)
goto out_unlock;
if (phy_is_started(phydev))
err = phy_check_link_status(phydev);
out_unlock:
mutex_unlock(&phydev->lock); mutex_unlock(&phydev->lock);
return err; return err;