From: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
To: Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
"David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Jingju Hou <Jingju.Hou@synaptics.com>
Subject: [PATCH] net: phy: marvell: clear wol event before setting it
Date: Thu, 19 Apr 2018 16:02:32 +0800 [thread overview]
Message-ID: <20180419160232.519d15be@xhacker.debian> (raw)
From: Jingju Hou <Jingju.Hou@synaptics.com>
If WOL event happened once, the LED[2] interrupt pin will not be
cleared unless reading the CSISR register. So clear the WOL event
before enabling it.
Signed-off-by: Jingju Hou <Jingju.Hou@synaptics.com>
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
---
drivers/net/phy/marvell.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index c22e8e383247..b6abe1cbc84b 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -115,6 +115,9 @@
/* WOL Event Interrupt Enable */
#define MII_88E1318S_PHY_CSIER_WOL_EIE BIT(7)
+/* Copper Specific Interrupt Status Register */
+#define MII_88E1318S_PHY_CSISR 0x13
+
/* LED Timer Control Register */
#define MII_88E1318S_PHY_LED_TCR 0x12
#define MII_88E1318S_PHY_LED_TCR_FORCE_INT BIT(15)
@@ -1393,6 +1396,12 @@ 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 reading the CSISR register.
+ * So clear the WOL event first before enabling it.
+ */
+ phy_read(phydev, MII_88E1318S_PHY_CSISR);
+
/* Enable the WOL interrupt */
err = __phy_modify(phydev, MII_88E1318S_PHY_CSIER, 0,
MII_88E1318S_PHY_CSIER_WOL_EIE);
--
2.17.0
next reply other threads:[~2018-04-19 8:03 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-19 8:02 Jisheng Zhang [this message]
2018-04-19 8:38 ` [PATCH] net: phy: marvell: clear wol event before setting it Bhadram Varka
2018-04-19 8:53 ` Jisheng Zhang
2018-04-19 9:00 ` Bhadram Varka
2018-04-19 9:09 ` Jisheng Zhang
2018-04-19 10:05 ` Bhadram Varka
2018-04-19 11:33 ` Andrew Lunn
2018-04-19 12:18 ` Andrew Lunn
2018-04-26 5:40 ` Bhadram Varka
2018-04-26 6:15 ` Jisheng Zhang
2018-04-26 6:26 ` Bhadram Varka
2018-04-26 7:09 ` Bhadram Varka
2018-04-27 7:25 ` Jisheng Zhang
2018-04-30 13:17 ` Andrew Lunn
2018-04-26 7:56 ` Jisheng Zhang
2018-04-26 12:40 ` Andrew Lunn
2018-04-27 3:52 ` Bhadram Varka
2018-04-27 7:23 ` Jisheng Zhang
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=20180419160232.519d15be@xhacker.debian \
--to=jisheng.zhang@synaptics.com \
--cc=Jingju.Hou@synaptics.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.