phy: add set_wol/get_wol functions
Subsystems (4)
PATCH 1/2 phy: add set_wol/get_wol functions
This allows ethernet drivers (such as the mv643xx_eth) to support Wake on LAN on platforms where PHY registers have to be configured for Wake on LAN (e.g. the Marvell Kirkwood based qnap TS-119P II).
--- drivers/net/phy/phy.c | 16 ++++++++++++++++ include/linux/phy.h | 10 ++++++++++ 2 files changed, 26 insertions(+)
drivers/net/phy/phy.c +16 -0
@@ -1188,3 +1188,19 @@ int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data)return 0 ; }EXPORT_SYMBOL (phy_ethtool_set_eee); + +int phy_ethtool_set_wol (struct phy_device *phydev,struct ethtool_wolinfo *wol) +{ +if (phydev->drv->set_wol) +return phydev->drv->set_wol (phydev, wol); + +return -EOPNOTSUPP ; +} +EXPORT_SYMBOL (phy_ethtool_set_wol); + +void phy_ethtool_get_wol (struct phy_device *phydev,struct ethtool_wolinfo *wol) +{ +if (phydev->drv->get_wol) + phydev->drv->get_wol (phydev, wol); +} +EXPORT_SYMBOL (phy_ethtool_get_wol);
include/linux/phy.h +10 -0
@@ -455,6 +455,14 @@ struct phy_driver {*/ void (*txtstamp)(struct phy_device *dev,struct sk_buff *skb,int type); +/* Some devices (e.g. qnap TS-119P II) require PHY register changes to +* enable Wake on LAN, so set_wol is provided to be called in the +* ethernet driver's set_wol function. */ +int (*set_wol)(struct phy_device *dev,struct ethtool_wolinfo *wol); + +/* See set_wol, but for checking whether Wake on LAN is enabled. */ +void (*get_wol)(struct phy_device *dev,struct ethtool_wolinfo *wol); +struct device_driver driver; };#define to_phy_driver (d) container_of(d, struct phy_driver, driver)
@@ -560,6 +568,8 @@ int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable);int phy_get_eee_err (struct phy_device *phydev);int phy_ethtool_set_eee (struct phy_device *phydev,struct ethtool_eee *data);int phy_ethtool_get_eee (struct phy_device *phydev,struct ethtool_eee *data); +int phy_ethtool_set_wol (struct phy_device *phydev,struct ethtool_wolinfo *wol); +void phy_ethtool_get_wol (struct phy_device *phydev,struct ethtool_wolinfo *wol);int __init mdio_bus_init (void );void mdio_bus_exit (void );
Signature · 1 line
1.7.10.4
PATCH 2/2 mv643xx_eth with 88E1318S: support Wake on LAN
This has been tested on a qnap TS-119P II. Note that enabling WOL with "ethtool -s eth0 wol g" is not enough; you also need to tell the PIC microcontroller inside the qnap that WOL should be enabled by sending 0xF2 with qcontrol(1) and you have to disable EUP ("Energy-using Products", a European power-saving thing) by sending 0xF4.
--- drivers/net/ethernet/marvell/mv643xx_eth.c | 32 +++++++ drivers/net/phy/marvell.c | 127 ++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+)
drivers/net/ethernet/marvell/mv643xx_eth.c +32 -0
@@ -20,6 +20,8 @@* Copyright (C) 2007-2008 Marvell Semiconductor * Lennert Buytenhek <[email protected]> * +* Copyright (C) 2013 Michael Stapelberg <[email protected]> +* * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2
@@ -1484,6 +1486,34 @@ mv643xx_eth_get_settings_phyless(struct mv643xx_eth_private *mp,return 0 ; } +static void +mv643xx_eth_get_wol (struct net_device *dev,struct ethtool_wolinfo *wol) +{ +struct mv643xx_eth_private *mp =netdev_priv (dev); + wol->supported =0 ; + wol->wolopts =0 ; +if (mp->phy) +phy_ethtool_get_wol (mp->phy, wol); +} + +static int +mv643xx_eth_set_wol (struct net_device *dev,struct ethtool_wolinfo *wol) +{ +struct mv643xx_eth_private *mp =netdev_priv (dev); +int err; + +if (mp->phy ==NULL ) +return -EOPNOTSUPP ; + + err =phy_ethtool_set_wol (mp->phy, wol); +/* Given that mv643xx_eth works without the marvell-specific PHY driver, +* this debugging hint is useful to have. +*/ +if (err == -EOPNOTSUPP ) +netdev_info (dev,"The PHY does not support set_wol, was CONFIG_MARVELL_PHY enabled?\n" ); +return err; +} +static int mv643xx_eth_get_settings (struct net_device *dev,struct ethtool_cmd *cmd) {
@@ -1665,6 +1695,8 @@ static const struct ethtool_ops mv643xx_eth_ethtool_ops = { .get_ethtool_stats = mv643xx_eth_get_ethtool_stats, .get_sset_count = mv643xx_eth_get_sset_count, .get_ts_info = ethtool_op_get_ts_info, + .get_wol = mv643xx_eth_get_wol, + .set_wol = mv643xx_eth_set_wol, };
drivers/net/phy/marvell.c +127 -0
151 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Re: [PATCH net-next 2/2] mv643xx_eth with 88E1318S: support Wake on LAN
From: Michael Stapelberg <[email protected]>
Date: Tue, 12 Mar 2013 00:56:45 +0100
Quoted 7 lines
This has been tested on a qnap TS-119P II. Note that enabling WOL with "ethtool -s eth0 wol g" is not enough; you also need to tell the PIC microcontroller inside the qnap that WOL should be enabled by sending
0xF2with qcontrol(1) and you have to disable EUP ("Energy-using Products", a European power-saving thing) by sending0xF4.Signed-off-by Michael Stapelberg <[email protected]>
Applied.
Hello Michael,
This is looking good from my perspective, just a minor nitpick with repsect to your comment below.
Quoted 39 lines · Michael Stapelberg
This allows ethernet drivers (such as the
mv643xx_eth) to support Wake on LAN on platforms where PHY registers have to be configured for Wake on LAN (e.g. the Marvell Kirkwood based qnap TS-119P II).Signed-off-by Michael Stapelberg <[email protected]>--- drivers/net/phy/phy.c | 16 ++++++++++++++++ include/linux/phy.h | 10 ++++++++++ 2 files changed, 26 insertions(+)drivers/net/phy/phy.c +16
-0@@ -1188,3 +1188,19 @@ int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data)return 0 ; }EXPORT_SYMBOL (phy_ethtool_set_eee); + +int phy_ethtool_set_wol (struct phy_device *phydev,struct ethtool_wolinfo *wol) +{ +if (phydev->drv->set_wol) +return phydev->drv->set_wol (phydev, wol); + +return -EOPNOTSUPP ; +} +EXPORT_SYMBOL (phy_ethtool_set_wol); + +void phy_ethtool_get_wol (struct phy_device *phydev,struct ethtool_wolinfo *wol) +{ +if (phydev->drv->get_wol) + phydev->drv->get_wol (phydev, wol); +} +EXPORT_SYMBOL (phy_ethtool_get_wol);include/linux/phy.h +0
-0
include/linux/phy.h struct phy_driver { · line 460
Quoted 6 lines
include/linux/phy.h +3
-0@@ -455,6 +455,14 @@ struct phy_driver {*/ void (*txtstamp)(struct phy_device *dev,struct sk_buff *skb,int type); +/* Some devices (e.g. qnap TS-119P II) require PHY register changes to +* enable Wake on LAN, so set_wol is provided to be called in the +* ethernet driver's set_wol function. */
I would just mention here that some PHY chip needs to be configured to enable WoL at the PHY level (such as the Marvell 88E1318S PHY).
Quoted 18 lines
include/linux/phy.h +7
-0+int (*set_wol)(struct phy_device *dev,struct ethtool_wolinfo *wol); + +/* See set_wol, but for checking whether Wake on LAN is enabled. */ +void (*get_wol)(struct phy_device *dev,struct ethtool_wolinfo *wol); +struct device_driver driver; };#define to_phy_driver (d) container_of(d, struct phy_driver, driver)@@ -560,6 +568,8 @@ int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable);int phy_get_eee_err (struct phy_device *phydev);int phy_ethtool_set_eee (struct phy_device *phydev,struct ethtool_eee *data);int phy_ethtool_get_eee (struct phy_device *phydev,struct ethtool_eee *data); +int phy_ethtool_set_wol (struct phy_device *phydev,struct ethtool_wolinfo *wol); +void phy_ethtool_get_wol (struct phy_device *phydev,struct ethtool_wolinfo *wol);int __init mdio_bus_init (void );void mdio_bus_exit (void );
From: Michael Stapelberg <[email protected]>
Date: Tue, 12 Mar 2013 00:56:44 +0100
Quoted 5 lines
This allows ethernet drivers (such as the
mv643xx_eth) to support Wake on LAN on platforms where PHY registers have to be configured for Wake on LAN (e.g. the Marvell Kirkwood based qnap TS-119P II).Signed-off-by Michael Stapelberg <[email protected]>
Applied.