diff options
| author | Jingju Hou <Jingju.Hou@synaptics.com> | 2018-04-23 15:22:49 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-23 21:06:41 -0400 |
| commit | b6a930fa88083b41d26ddf1cab95cbd740936c22 (patch) | |
| tree | 70c953b6f2bafd81e1caf6cfbc5fc8b2a89cf128 /drivers/net/phy | |
| parent | 77621f024d6be732e43366a42203486b6ec89acd (diff) | |
| download | linux-b6a930fa88083b41d26ddf1cab95cbd740936c22.tar.gz linux-b6a930fa88083b41d26ddf1cab95cbd740936c22.tar.bz2 linux-b6a930fa88083b41d26ddf1cab95cbd740936c22.zip | |
net: phy: marvell: clear wol event before setting it
If WOL event happened once, the LED[2] interrupt pin will not be
cleared unless we read the CSISR register. If interrupts are in use,
the normal interrupt handling will clear the WOL event. Let's clear the
WOL event before enabling it if !phy_interrupt_is_valid().
Signed-off-by: Jingju Hou <Jingju.Hou@synaptics.com>
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/marvell.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index c22e8e383247..25e2a099b71c 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -1393,6 +1393,15 @@ static int m88e1318_set_wol(struct phy_device *phydev, if (err < 0) goto error; + /* If WOL event happened once, the LED[2] interrupt pin + * will not be cleared unless we reading the interrupt status + * register. If interrupts are in use, the normal interrupt + * handling will clear the WOL event. Clear the WOL event + * before enabling it if !phy_interrupt_is_valid() + */ + if (!phy_interrupt_is_valid(phydev)) + phy_read(phydev, MII_M1011_IEVENT); + /* Enable the WOL interrupt */ err = __phy_modify(phydev, MII_88E1318S_PHY_CSIER, 0, MII_88E1318S_PHY_CSIER_WOL_EIE); |