diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2019-02-12 19:56:15 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-02-13 20:44:12 -0800 |
| commit | b79555d5d8d32643e9d7193341dcaff13bf9ffcd (patch) | |
| tree | eba13e945a7e44d0cc6dc4dcacac39e306e2d22e /drivers/net/phy/phy.c | |
| parent | sctp: set stream ext to NULL after freeing it in sctp_stream_outq_migrate (diff) | |
| download | linux-dev-b79555d5d8d32643e9d7193341dcaff13bf9ffcd.tar.xz linux-dev-b79555d5d8d32643e9d7193341dcaff13bf9ffcd.zip | |
net: phy: fix interrupt handling in non-started states
phylib enables interrupts before phy_start() has been called, and if
we receive an interrupt in a non-started state, the interrupt handler
returns IRQ_NONE. This causes problems with at least one Marvell chip
as reported by Andrew.
Fix this by handling interrupts the same as in phy_mac_interrupt(),
basically always running the phylib state machine. It knows when it
has to do something and when not.
This change allows to handle interrupts gracefully even if they
occur in a non-started state.
Fixes: 2b3e88ea6528 ("net: phy: improve phy state checking")
Reported-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/phy.c')
| -rw-r--r-- | drivers/net/phy/phy.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 189cd2048c3a..ca5e0c0f018c 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -762,9 +762,6 @@ static irqreturn_t phy_interrupt(int irq, void *phy_dat) { struct phy_device *phydev = phy_dat; - if (!phy_is_started(phydev)) - return IRQ_NONE; /* It can't be ours. */ - if (phydev->drv->did_interrupt && !phydev->drv->did_interrupt(phydev)) return IRQ_NONE; |