LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH net-next 1/1] net: phy: marvell: Add WAKE_PHY support to WOL event
@ 2021-08-13 8:45 Song Yoong Siang
2021-08-14 16:07 ` Andrew Lunn
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Song Yoong Siang @ 2021-08-13 8:45 UTC (permalink / raw)
To: Andrew Lunn, Heiner Kallweit, Russell King, David S . Miller,
Jakub Kicinski
Cc: netdev, linux-kernel, Song Yoong Siang
Add Wake-on-PHY feature support by enabling the Link Up Event.
Signed-off-by: Song Yoong Siang <yoong.siang.song@intel.com>
---
drivers/net/phy/marvell.c | 39 ++++++++++++++++++++++++++++++++++++---
1 file changed, 36 insertions(+), 3 deletions(-)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 3de93c9f2744..415e2a01c151 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -155,6 +155,7 @@
#define MII_88E1318S_PHY_WOL_CTRL 0x10
#define MII_88E1318S_PHY_WOL_CTRL_CLEAR_WOL_STATUS BIT(12)
+#define MII_88E1318S_PHY_WOL_CTRL_LINK_UP_ENABLE BIT(13)
#define MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE BIT(14)
#define MII_PHY_LED_CTRL 16
@@ -1746,13 +1747,19 @@ static void m88e1318_get_wol(struct phy_device *phydev,
{
int ret;
- wol->supported = WAKE_MAGIC;
+ wol->supported = WAKE_MAGIC | WAKE_PHY;
wol->wolopts = 0;
ret = phy_read_paged(phydev, MII_MARVELL_WOL_PAGE,
MII_88E1318S_PHY_WOL_CTRL);
- if (ret >= 0 && ret & MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE)
+ if (ret < 0)
+ return;
+
+ if (ret & MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE)
wol->wolopts |= WAKE_MAGIC;
+
+ if (ret & MII_88E1318S_PHY_WOL_CTRL_LINK_UP_ENABLE)
+ wol->wolopts |= WAKE_PHY;
}
static int m88e1318_set_wol(struct phy_device *phydev,
@@ -1764,7 +1771,7 @@ static int m88e1318_set_wol(struct phy_device *phydev,
if (oldpage < 0)
goto error;
- if (wol->wolopts & WAKE_MAGIC) {
+ if (wol->wolopts & (WAKE_MAGIC | WAKE_PHY)) {
/* Explicitly switch to page 0x00, just to be sure */
err = marvell_write_page(phydev, MII_MARVELL_COPPER_PAGE);
if (err < 0)
@@ -1796,7 +1803,9 @@ static int m88e1318_set_wol(struct phy_device *phydev,
MII_88E1318S_PHY_LED_TCR_INT_ACTIVE_LOW);
if (err < 0)
goto error;
+ }
+ if (wol->wolopts & WAKE_MAGIC) {
err = marvell_write_page(phydev, MII_MARVELL_WOL_PAGE);
if (err < 0)
goto error;
@@ -1837,6 +1846,30 @@ static int m88e1318_set_wol(struct phy_device *phydev,
goto error;
}
+ if (wol->wolopts & WAKE_PHY) {
+ err = marvell_write_page(phydev, MII_MARVELL_WOL_PAGE);
+ if (err < 0)
+ goto error;
+
+ /* Clear WOL status and enable link up event */
+ err = __phy_modify(phydev, MII_88E1318S_PHY_WOL_CTRL, 0,
+ MII_88E1318S_PHY_WOL_CTRL_CLEAR_WOL_STATUS |
+ MII_88E1318S_PHY_WOL_CTRL_LINK_UP_ENABLE);
+ if (err < 0)
+ goto error;
+ } else {
+ err = marvell_write_page(phydev, MII_MARVELL_WOL_PAGE);
+ if (err < 0)
+ goto error;
+
+ /* Clear WOL status and disable link up event */
+ err = __phy_modify(phydev, MII_88E1318S_PHY_WOL_CTRL,
+ MII_88E1318S_PHY_WOL_CTRL_LINK_UP_ENABLE,
+ MII_88E1318S_PHY_WOL_CTRL_CLEAR_WOL_STATUS);
+ if (err < 0)
+ goto error;
+ }
+
error:
return phy_restore_page(phydev, oldpage, err);
}
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net-next 1/1] net: phy: marvell: Add WAKE_PHY support to WOL event
2021-08-13 8:45 [PATCH net-next 1/1] net: phy: marvell: Add WAKE_PHY support to WOL event Song Yoong Siang
@ 2021-08-14 16:07 ` Andrew Lunn
2021-08-16 10:10 ` patchwork-bot+netdevbpf
2021-08-16 10:10 ` Russell King (Oracle)
2 siblings, 0 replies; 4+ messages in thread
From: Andrew Lunn @ 2021-08-14 16:07 UTC (permalink / raw)
To: Song Yoong Siang
Cc: Heiner Kallweit, Russell King, David S . Miller, Jakub Kicinski,
netdev, linux-kernel
On Fri, Aug 13, 2021 at 04:45:08PM +0800, Song Yoong Siang wrote:
> Add Wake-on-PHY feature support by enabling the Link Up Event.
>
> Signed-off-by: Song Yoong Siang <yoong.siang.song@intel.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net-next 1/1] net: phy: marvell: Add WAKE_PHY support to WOL event
2021-08-13 8:45 [PATCH net-next 1/1] net: phy: marvell: Add WAKE_PHY support to WOL event Song Yoong Siang
2021-08-14 16:07 ` Andrew Lunn
@ 2021-08-16 10:10 ` patchwork-bot+netdevbpf
2021-08-16 10:10 ` Russell King (Oracle)
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-08-16 10:10 UTC (permalink / raw)
To: Song, Yoong Siang
Cc: andrew, hkallweit1, linux, davem, kuba, netdev, linux-kernel
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
On Fri, 13 Aug 2021 16:45:08 +0800 you wrote:
> Add Wake-on-PHY feature support by enabling the Link Up Event.
>
> Signed-off-by: Song Yoong Siang <yoong.siang.song@intel.com>
> ---
> drivers/net/phy/marvell.c | 39 ++++++++++++++++++++++++++++++++++++---
> 1 file changed, 36 insertions(+), 3 deletions(-)
Here is the summary with links:
- [net-next,1/1] net: phy: marvell: Add WAKE_PHY support to WOL event
https://git.kernel.org/netdev/net-next/c/6164659ff7ac
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net-next 1/1] net: phy: marvell: Add WAKE_PHY support to WOL event
2021-08-13 8:45 [PATCH net-next 1/1] net: phy: marvell: Add WAKE_PHY support to WOL event Song Yoong Siang
2021-08-14 16:07 ` Andrew Lunn
2021-08-16 10:10 ` patchwork-bot+netdevbpf
@ 2021-08-16 10:10 ` Russell King (Oracle)
2 siblings, 0 replies; 4+ messages in thread
From: Russell King (Oracle) @ 2021-08-16 10:10 UTC (permalink / raw)
To: Song Yoong Siang
Cc: Andrew Lunn, Heiner Kallweit, David S . Miller, Jakub Kicinski,
netdev, linux-kernel
On Fri, Aug 13, 2021 at 04:45:08PM +0800, Song Yoong Siang wrote:
> Add Wake-on-PHY feature support by enabling the Link Up Event.
>
> Signed-off-by: Song Yoong Siang <yoong.siang.song@intel.com>
Hi,
I think this can be greatly simplified - see below.
> ---
> drivers/net/phy/marvell.c | 39 ++++++++++++++++++++++++++++++++++++---
> 1 file changed, 36 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
> index 3de93c9f2744..415e2a01c151 100644
> --- a/drivers/net/phy/marvell.c
> +++ b/drivers/net/phy/marvell.c
> @@ -155,6 +155,7 @@
>
> #define MII_88E1318S_PHY_WOL_CTRL 0x10
> #define MII_88E1318S_PHY_WOL_CTRL_CLEAR_WOL_STATUS BIT(12)
> +#define MII_88E1318S_PHY_WOL_CTRL_LINK_UP_ENABLE BIT(13)
> #define MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE BIT(14)
>
> #define MII_PHY_LED_CTRL 16
> @@ -1746,13 +1747,19 @@ static void m88e1318_get_wol(struct phy_device *phydev,
> {
> int ret;
>
> - wol->supported = WAKE_MAGIC;
> + wol->supported = WAKE_MAGIC | WAKE_PHY;
> wol->wolopts = 0;
>
> ret = phy_read_paged(phydev, MII_MARVELL_WOL_PAGE,
> MII_88E1318S_PHY_WOL_CTRL);
> - if (ret >= 0 && ret & MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE)
> + if (ret < 0)
> + return;
> +
> + if (ret & MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE)
> wol->wolopts |= WAKE_MAGIC;
> +
> + if (ret & MII_88E1318S_PHY_WOL_CTRL_LINK_UP_ENABLE)
> + wol->wolopts |= WAKE_PHY;
> }
>
> static int m88e1318_set_wol(struct phy_device *phydev,
> @@ -1764,7 +1771,7 @@ static int m88e1318_set_wol(struct phy_device *phydev,
> if (oldpage < 0)
> goto error;
>
> - if (wol->wolopts & WAKE_MAGIC) {
> + if (wol->wolopts & (WAKE_MAGIC | WAKE_PHY)) {
> /* Explicitly switch to page 0x00, just to be sure */
> err = marvell_write_page(phydev, MII_MARVELL_COPPER_PAGE);
> if (err < 0)
> @@ -1796,7 +1803,9 @@ static int m88e1318_set_wol(struct phy_device *phydev,
> MII_88E1318S_PHY_LED_TCR_INT_ACTIVE_LOW);
> if (err < 0)
> goto error;
> + }
Wouldn't it make more sense to always select the WOL page at this point
between these two blocks? From what I can see, the WOL page is selected
by both true and false blocks of the next if() statement, and again by
the newly added if() statement for WAKE_PHY.
Other than that, I don't see any issues.
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-08-16 10:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-13 8:45 [PATCH net-next 1/1] net: phy: marvell: Add WAKE_PHY support to WOL event Song Yoong Siang
2021-08-14 16:07 ` Andrew Lunn
2021-08-16 10:10 ` patchwork-bot+netdevbpf
2021-08-16 10:10 ` Russell King (Oracle)
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).