lkml.org 
[lkml]   [2021]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 094/125] phy: phy_start_aneg: Add an unlocked version
    Date
    From: Andrew Lunn <andrew@lunn.ch>

    commit 707293a56f95f8e7e0cfae008010c7933fb68973 upstream.

    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: 2d55173e71b0 ("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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/phy/phy.c | 30 ++++++++++++++++++++++++------
    1 file changed, 24 insertions(+), 6 deletions(-)

    --- a/drivers/net/phy/phy.c
    +++ b/drivers/net/phy/phy.c
    @@ -700,7 +700,7 @@ static int phy_check_link_status(struct
    }

    /**
    - * 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
    *
    * Description: Sanitizes the settings (if we're not autonegotiating
    @@ -708,25 +708,43 @@ static int phy_check_link_status(struct
    * If the PHYCONTROL Layer is operating, we change the state to
    * reflect the beginning of Auto-negotiation or forcing.
    */
    -int phy_start_aneg(struct phy_device *phydev)
    +static int _phy_start_aneg(struct phy_device *phydev)
    {
    int err;

    + lockdep_assert_held(&phydev->lock);
    +
    if (!phydev->drv)
    return -EIO;

    - mutex_lock(&phydev->lock);
    -
    if (AUTONEG_DISABLE == phydev->autoneg)
    phy_sanitize_settings(phydev);

    err = phy_config_aneg(phydev);
    if (err < 0)
    - goto out_unlock;
    + return err;

    if (phy_is_started(phydev))
    err = phy_check_link_status(phydev);
    -out_unlock:
    +
    + return err;
    +}
    +
    +/**
    + * 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.
    + */
    +int phy_start_aneg(struct phy_device *phydev)
    +{
    + int err;
    +
    + mutex_lock(&phydev->lock);
    + err = _phy_start_aneg(phydev);
    mutex_unlock(&phydev->lock);

    return err;

    \
     
     \ /
      Last update: 2021-11-01 10:52    [W:4.107 / U:0.300 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site