From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
davem@davemloft.net, andrew@lunn.ch, opendmb@gmail.com,
Marc Gonzalez <marc_gonzalez@sigmadesigns.com>,
slash.tmp@free.fr, david.daney@cavium.com,
geert+renesas@glider.be
Subject: [RFC net-next 3/4] net: phy: Force PHY_HALTED during phy_disconnect()
Date: Wed, 25 Oct 2017 16:21:23 -0700 [thread overview]
Message-ID: <20171025232124.14120-4-f.fainelli@gmail.com> (raw)
In-Reply-To: <20171025232124.14120-1-f.fainelli@gmail.com>
While debugging a crash reported by David Daney, we discovered that the
offending driver was calling phy_disconnect() without a prior call to
phy_stop() although it should have.
Add a WARN_ON() to catch such drivers, in order to invite their
maintainers to fix them, and also force the PHY state machine to
PHY_HALTED since we are about to disconnect anyway, there is nothing we
will be doing.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/phy/phy_device.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 67f25ac29025..69eb985c26fe 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -797,6 +797,11 @@ void phy_disconnect(struct phy_device *phydev)
if (phydev->irq > 0)
phy_stop_interrupts(phydev);
+ mutex_lock(&phydev->lock);
+ WARN_ON(phydev->state != PHY_HALTED);
+ phydev->state = PHY_HALTED;
+ mutex_unlock(&phydev->lock);
+
phy_stop_machine(phydev);
phydev->adjust_link = NULL;
--
2.9.3
next prev parent reply other threads:[~2017-10-25 23:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-25 23:21 [RFC net-next 0/4] net: phy: PHY_HALTED, the return of the state Florian Fainelli
2017-10-25 23:21 ` [RFC net-next 1/4] net: phy: Export phy_stop_machine() Florian Fainelli
2017-10-30 13:44 ` Geert Uytterhoeven
2017-10-25 23:21 ` [RFC net-next 2/4] net: smsc911x: Properly manage PHY during suspend/resume Florian Fainelli
2017-10-30 13:45 ` Geert Uytterhoeven
2017-10-25 23:21 ` Florian Fainelli [this message]
2017-10-25 23:21 ` [RFC net-next 4/4] net: phy: Correctly process PHY_HALTED in phy_stop_machine() Florian Fainelli
2017-10-30 13:56 ` Geert Uytterhoeven
2017-10-30 16:09 ` Florian Fainelli
2017-10-31 15:26 ` Geert Uytterhoeven
2017-10-31 16:33 ` Florian Fainelli
2017-11-06 15:50 ` Geert Uytterhoeven
2017-11-27 4:05 ` Florian Fainelli
2017-11-27 7:48 ` Geert Uytterhoeven
2017-12-04 15:08 ` Marc Gonzalez
2017-10-27 11:35 ` [RFC net-next 0/4] net: phy: PHY_HALTED, the return of the state Andrew Lunn
2017-10-30 15:44 ` Marc Gonzalez
2017-10-30 16:27 ` David Daney
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=20171025232124.14120-4-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=david.daney@cavium.com \
--cc=geert+renesas@glider.be \
--cc=marc_gonzalez@sigmadesigns.com \
--cc=netdev@vger.kernel.org \
--cc=opendmb@gmail.com \
--cc=slash.tmp@free.fr \
/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).