[PATCH 1/2][SRU Xenial] net: phylib: fix interrupts re-enablement in phy_start

dann frazier dann.frazier at canonical.com
Tue Aug 7 19:21:25 UTC 2018


From: Shaohui Xie <Shaohui.Xie at nxp.com>

BugLink: https://bugs.launchpad.net/bugs/1785739

If phy was suspended and is starting, current driver always enable
phy's interrupts, if phy works in polling, phy can raise unexpected
interrupt which will not be handled, the interrupt will block system
enter suspend again. So interrupts should only be re-enabled if phy
works in interrupt.

Signed-off-by: Shaohui Xie <Shaohui.Xie at nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
(cherry picked from commit 84a527a41f38a80353f185d05e41b021e1ff672b)
Signed-off-by: dann frazier <dann.frazier at canonical.com>
---
 drivers/net/phy/phy.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 7d2cf015c5e76..6db20e2d1e1af 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -793,9 +793,11 @@ void phy_start(struct phy_device *phydev)
 		break;
 	case PHY_HALTED:
 		/* make sure interrupts are re-enabled for the PHY */
-		err = phy_enable_interrupts(phydev);
-		if (err < 0)
-			break;
+		if (phydev->irq != PHY_POLL) {
+			err = phy_enable_interrupts(phydev);
+			if (err < 0)
+				break;
+		}
 
 		phydev->state = PHY_RESUMING;
 		do_resume = true;
-- 
2.18.0





More information about the kernel-team mailing list