lkml.org 
[lkml]   [2017]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 46/95] net: phy: handle state correctly in phy_stop_machine
    3.2.91-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Nathan Sullivan <nathan.sullivan@ni.com>

    commit 49d52e8108a21749dc2114b924c907db43358984 upstream.

    If the PHY is halted on stop, then do not set the state to PHY_UP. This
    ensures the phy will be restarted later in phy_start when the machine is
    started again.

    Fixes: 00db8189d984 ("This patch adds a PHY Abstraction Layer to the Linux Kernel, enabling ethernet drivers to remain as ignorant as is reasonable of the connected PHY's design and operation details.")
    Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
    Signed-off-by: Brad Mouring <brad.mouring@ni.com>
    Acked-by: Xander Huff <xander.huff@ni.com>
    Acked-by: Kyle Roeschley <kyle.roeschley@ni.com>
    Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/net/phy/phy.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/net/phy/phy.c
    +++ b/drivers/net/phy/phy.c
    @@ -453,7 +453,7 @@ void phy_stop_machine(struct phy_device
    cancel_delayed_work_sync(&phydev->state_queue);

    mutex_lock(&phydev->lock);
    - if (phydev->state > PHY_UP)
    + if (phydev->state > PHY_UP && phydev->state != PHY_HALTED)
    phydev->state = PHY_UP;
    mutex_unlock(&phydev->lock);

    \
     
     \ /
      Last update: 2017-07-16 16:49    [W:4.078 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site