From: Roger Quadros <rogerq@ti.com>
To: <f.fainelli@gmail.com>
Cc: <andrew@lunn.ch>, <davem@davemloft.net>, <kyle.roeschley@ni.com>,
<nsekhar@ti.com>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, Roger Quadros <rogerq@ti.com>,
"stable # v4 . 9+" <stable@vger.kernel.org>
Subject: [PATCH v2 2/2] net: phy: Don't miss phy_suspend() on PHY_HALTED for PHYs with interrupts
Date: Wed, 22 Mar 2017 13:02:04 +0200 [thread overview]
Message-ID: <1490180524-28675-3-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1490180524-28675-1-git-send-email-rogerq@ti.com>
phy_suspend() doesn't get called as part of phy_stop() for PHYs
using interrupts because the phy state machine is never triggered
after a phy_stop().
Explicitly trigger the PHY state machine in phy_stop() so that it can
see the new PHY state (HALTED) and suspend the PHY.
As most PHYLIB consumers will call phy_stop() with rtnl_lock() held
from ndo_close() so we use don't wait for workqueue cancellation in
phy_trigger_machine() by passing false for the 'sync' argument.
Fixes: 3c293f4e08b5 ("net: phy: Trigger state machine on state change and not polling.")
Cc: stable <stable@vger.kernel.org> # v4.9+
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
drivers/net/phy/phy.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 49dedf8..ab14e7b 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -907,6 +907,7 @@ void phy_stop(struct phy_device *phydev)
* of rtnl_lock(), but PHY_HALTED shall guarantee phy_change()
* will not reenable interrupts.
*/
+ phy_trigger_machine(phydev, false);
}
EXPORT_SYMBOL(phy_stop);
--
2.7.4
next prev parent reply other threads:[~2017-03-22 11:22 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-22 11:02 [PATCH v2 0/2] net: phy: state machine fixes for interrupt driven PHYs Roger Quadros
2017-03-22 11:02 ` [PATCH v2 1/2] net: phy: Fix PHY AN done state machine " Roger Quadros
2017-03-23 9:52 ` Sergei Shtylyov
2017-03-27 11:50 ` Roger Quadros
2017-03-27 11:59 ` [PATCH v3 " Roger Quadros
2017-03-28 10:05 ` Roger Quadros
2017-04-11 11:17 ` Roger Quadros
2017-04-19 16:28 ` Florian Fainelli
2017-03-30 12:59 ` Madalin-Cristian Bucur
2017-03-30 20:02 ` Florian Fainelli
2017-03-31 9:19 ` Roger Quadros
2017-03-22 11:02 ` Roger Quadros [this message]
2017-04-19 16:31 ` [PATCH v2 2/2] net: phy: Don't miss phy_suspend() on PHY_HALTED for PHYs with interrupts Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1490180524-28675-3-git-send-email-rogerq@ti.com \
--to=rogerq@ti.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kyle.roeschley@ni.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nsekhar@ti.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).