[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <36d359f3-6dc5-1e2c-c788-30d680ed7e98@free.fr>
Date: Fri, 28 Jul 2017 21:53:51 +0200
From: Marc Gonzalez <marc_gonzalez@...madesigns.com>
To: Florian Fainelli <f.fainelli@...il.com>,
netdev <netdev@...r.kernel.org>
Cc: "David S. Miller" <davem@...emloft.net>,
Andrew Lunn <andrew@...n.ch>,
Russell King <rmk@...linux.org.uk>, Mason <slash.tmp@...e.fr>
Subject: Re: [PATCH net v2] net: phy: Correctly process PHY_HALTED in
phy_stop_machine()
On 28/07/2017 20:58, Florian Fainelli wrote:
> Marc reported that he was not getting the PHY library adjust_link()
> callback function to run when calling phy_stop() + phy_disconnect()
> which does not indeed happen because we set the state machine to
> PHY_HALTED but we don't get to run it to process this state past that
> point.
>
> Fix this with a synchronous call to phy_state_machine() in order to have
> the state machine actually act on PHY_HALTED, set the PHY device's link
> down, turn the network device's carrier off and finally call the
> adjust_link() function.
>
> Reported-by: Marc Gonzalez <marc_gonzalez@...madesigns.com>
> Fixes: a390d1f379cf ("phylib: convert state_queue work to delayed_work")
> Signed-off-by: Florian Fainelli <f.fainelli@...il.com>
> ---
> Changes in v2:
>
> - reword subject and commit message based on changes
> - dropped flush_scheduled_work() since it is redundant
>
> drivers/net/phy/phy.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
> index d0626bf5c540..5068c582d502 100644
> --- a/drivers/net/phy/phy.c
> +++ b/drivers/net/phy/phy.c
> @@ -749,6 +749,9 @@ void phy_stop_machine(struct phy_device *phydev)
> if (phydev->state > PHY_UP && phydev->state != PHY_HALTED)
> phydev->state = PHY_UP;
> mutex_unlock(&phydev->lock);
> +
> + /* Now we can run the state machine synchronously */
> + phy_state_machine(&phydev->state_queue.work);
> }
>
> /**
Signed-off-by: Marc Gonzalez <marc_gonzalez@...madesigns.com>
Regards.
Powered by blists - more mailing lists