LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: Song Yoong Siang <yoong.siang.song@intel.com> To: "Russell King" <linux@armlinux.org.uk>, "Marek Behún" <kabel@kernel.org>, "Andrew Lunn" <andrew@lunn.ch>, "Heiner Kallweit" <hkallweit1@gmail.com>, "David S . Miller" <davem@davemloft.net>, "Jakub Kicinski" <kuba@kernel.org> Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Song Yoong Siang <yoong.siang.song@intel.com> Subject: [PATCH net-next 1/1] net: phy: marvell10g: Add WAKE_PHY support to WOL event Date: Fri, 13 Aug 2021 16:45:36 +0800 [thread overview] Message-ID: <20210813084536.182381-1-yoong.siang.song@intel.com> (raw) Add Wake-on-PHY feature support by enabling the Link Status Changed interrupt. Signed-off-by: Song Yoong Siang <yoong.siang.song@intel.com> --- drivers/net/phy/marvell10g.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c index 0b7cae118ad7..d46761c225f0 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -76,6 +76,11 @@ enum { MV_PCS_CSSR1_SPD2_2500 = 0x0004, MV_PCS_CSSR1_SPD2_10000 = 0x0000, + /* Copper Specific Interrupt registers */ + MV_PCS_INTR_ENABLE = 0x8010, + MV_PCS_INTR_ENABLE_LSC = BIT(10), + MV_PCS_INTR_STS = 0x8011, + /* Temperature read register (88E2110 only) */ MV_PCS_TEMP = 0x8042, @@ -1036,7 +1041,7 @@ static void mv3110_get_wol(struct phy_device *phydev, { int ret; - wol->supported = WAKE_MAGIC; + wol->supported = WAKE_MAGIC | WAKE_PHY; wol->wolopts = 0; ret = phy_read_mmd(phydev, MDIO_MMD_VEND2, MV_V2_WOL_CTRL); @@ -1045,6 +1050,13 @@ static void mv3110_get_wol(struct phy_device *phydev, if (ret & MV_V2_WOL_CTRL_MAGIC_PKT_EN) wol->wolopts |= WAKE_MAGIC; + + ret = phy_read_mmd(phydev, MDIO_MMD_PCS, MV_PCS_INTR_ENABLE); + if (ret < 0) + return; + + if (ret & MV_PCS_INTR_ENABLE_LSC) + wol->wolopts |= WAKE_PHY; } static int mv3110_set_wol(struct phy_device *phydev, @@ -1099,6 +1111,25 @@ static int mv3110_set_wol(struct phy_device *phydev, return ret; } + if (wol->wolopts & WAKE_PHY) { + /* Enable the link status changed interrupt */ + ret = phy_set_bits_mmd(phydev, MDIO_MMD_PCS, + MV_PCS_INTR_ENABLE, + MV_PCS_INTR_ENABLE_LSC); + if (ret < 0) + return ret; + + /* Clear the interrupt status register */ + ret = phy_read_mmd(phydev, MDIO_MMD_PCS, MV_PCS_INTR_STS); + } else { + /* Disable the link status changed interrupt */ + ret = phy_clear_bits_mmd(phydev, MDIO_MMD_PCS, + MV_PCS_INTR_ENABLE, + MV_PCS_INTR_ENABLE_LSC); + if (ret < 0) + return ret; + } + /* Reset the clear WOL status bit as it does not self-clear */ return phy_clear_bits_mmd(phydev, MDIO_MMD_VEND2, MV_V2_WOL_CTRL, -- 2.25.1
next reply other threads:[~2021-08-13 8:52 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-13 8:45 Song Yoong Siang [this message] 2021-08-14 17:19 ` [PATCH net-next 1/1] net: phy: marvell10g: Add WAKE_PHY support to WOL event Marek Behún 2021-08-14 17:26 ` Russell King (Oracle) 2021-08-14 18:04 ` Andrew Lunn 2021-08-14 19:49 ` Russell King (Oracle) 2021-08-16 3:52 ` Song, Yoong Siang 2021-08-16 4:15 ` Andrew Lunn 2021-08-16 5:40 ` Song, Yoong Siang 2021-08-16 7:14 ` Russell King (Oracle) 2021-08-16 8:03 ` Song, Yoong Siang 2021-08-16 8:18 ` Russell King (Oracle) 2021-08-16 8:56 ` Song, Yoong Siang 2021-08-16 9:54 ` Marek Behún 2021-08-16 15:02 ` Song, Yoong Siang 2021-08-16 15:27 ` Andrew Lunn 2021-08-20 1:22 ` Song, Yoong Siang 2021-08-16 3:19 ` Song, Yoong Siang 2021-08-16 4:10 ` Andrew Lunn
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=20210813084536.182381-1-yoong.siang.song@intel.com \ --to=yoong.siang.song@intel.com \ --cc=andrew@lunn.ch \ --cc=davem@davemloft.net \ --cc=hkallweit1@gmail.com \ --cc=kabel@kernel.org \ --cc=kuba@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).