lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 14 Mar 2018 21:16:16 +0100 From: Heiner Kallweit <hkallweit1@...il.com> To: Florian Fainelli <f.fainelli@...il.com>, Andrew Lunn <andrew@...n.ch> Cc: Geert Uytterhoeven <geert+renesas@...der.be>, "netdev@...r.kernel.org" <netdev@...r.kernel.org> Subject: [PATCH RFC 1/7] net: phy: unconditionally resume and re-enable interrupts, in phy_start In subsequent patches of this series interrupts will be disabled during system suspend, also we will have to resume the PHY in states other than PHY_HALTED. To prepare for this unconditionally resume and re-enable interrupts in phy_start(). Signed-off-by: Heiner Kallweit <hkallweit1@...il.com> --- drivers/net/phy/phy.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 05c1e8ef1..0aef35efd 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -791,10 +791,16 @@ EXPORT_SYMBOL(phy_stop); */ void phy_start(struct phy_device *phydev) { - int err = 0; + /* if phy was suspended, bring the physical link up again */ + phy_resume(phydev); - mutex_lock(&phydev->lock); + /* make sure interrupts are re-enabled for the PHY */ + if (phy_interrupt_is_valid(phydev) && phy_enable_interrupts(phydev)) { + phy_error(phydev); + return; + } + mutex_lock(&phydev->lock); switch (phydev->state) { case PHY_STARTING: phydev->state = PHY_PENDING; @@ -803,16 +809,6 @@ void phy_start(struct phy_device *phydev) phydev->state = PHY_UP; break; case PHY_HALTED: - /* if phy was suspended, bring the physical link up again */ - __phy_resume(phydev); - - /* make sure interrupts are re-enabled for the PHY */ - if (phy_interrupt_is_valid(phydev)) { - err = phy_enable_interrupts(phydev); - if (err < 0) - break; - } - phydev->state = PHY_RESUMING; break; default: -- 2.16.2
Powered by blists - more mailing lists