netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] net: phy: fix PHY_RUNNING in phy_state_machine
@ 2015-08-14  4:23 shh.xie
  2015-08-14 17:01 ` Florian Fainelli
                   ` (2 more replies)
  0 siblings, 3 replies; 17+ messages in thread
From: shh.xie @ 2015-08-14  4:23 UTC (permalink / raw)
  To: netdev, davem; +Cc: Shaohui Xie

From: Shaohui Xie <Shaohui.Xie@freescale.com>

Currently, if phy state is PHY_RUNNING, we always register a CHANGE
when phy works in polling or interrupt ignored, this will make the
adjust_link being called even the phy link did Not changed.

checking the phy link to make sure the link did changed before we
register a CHANGE, if link did not changed, we do nothing.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
---
 drivers/net/phy/phy.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 84b1fba..d972851 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -814,6 +814,7 @@ void phy_state_machine(struct work_struct *work)
 	bool needs_aneg = false, do_suspend = false;
 	enum phy_state old_state;
 	int err = 0;
+	int old_link;
 
 	mutex_lock(&phydev->lock);
 
@@ -899,11 +900,18 @@ void phy_state_machine(struct work_struct *work)
 		phydev->adjust_link(phydev->attached_dev);
 		break;
 	case PHY_RUNNING:
-		/* Only register a CHANGE if we are
-		 * polling or ignoring interrupts
+		/* Only register a CHANGE if we are polling or ignoring
+		 * interrupts and link changed since latest checking.
 		 */
-		if (!phy_interrupt_is_valid(phydev))
-			phydev->state = PHY_CHANGELINK;
+		if (!phy_interrupt_is_valid(phydev)) {
+			old_link = phydev->link;
+			err = phy_read_status(phydev);
+			if (err)
+				break;
+
+			if (old_link != phydev->link)
+				phydev->state = PHY_CHANGELINK;
+		}
 		break;
 	case PHY_CHANGELINK:
 		err = phy_read_status(phydev);
-- 
2.1.0.27.g96db324

^ permalink raw reply related	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2016-03-17 15:33 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-14  4:23 [PATCH] net: phy: fix PHY_RUNNING in phy_state_machine shh.xie
2015-08-14 17:01 ` Florian Fainelli
2015-08-17  7:29   ` Shaohui Xie
2015-08-17  7:48   ` Shaohui Xie
2015-08-17 19:18 ` David Miller
2015-08-24  5:35   ` Andy Fleming
2016-03-16 15:59 ` Yegor Yefremov
2016-03-16 16:18   ` Andrew Lunn
2016-03-16 22:23     ` Yegor Yefremov
2016-03-16 23:05       ` Andrew Lunn
2016-03-17  8:14         ` Yegor Yefremov
2016-03-17 13:41           ` Andrew Lunn
2016-03-17 14:50             ` Yegor Yefremov
2016-03-17 15:12               ` Andrew Lunn
2016-03-17 15:21                 ` Yegor Yefremov
2016-03-17 15:28                   ` Andrew Lunn
2016-03-17 15:33                     ` Yegor Yefremov

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).