net: phy: soft reset rework for 10G PHYs
Subsystems (4)
v2 cover net: phy: soft reset rework for 10G PHYs
Hi David,
As reported by Shaohui, 10G PHYs may have a slightly more complex reset sequence for which a BMCR_RESET software reset might not suffice. This patchset offers a solution for those by allowing them to implement their own soft_reset() callback. Finally there is an update to the PHY library Documentation to cover for the newly added callbacks of the PHY driver structure.
Thanks!
Changes in v2:
- fixed callback testing
- fixed typo in Documentation
Florian Fainelli (3):
net: phy: move PHY software reset to genphy_soft_reset
net: phy: allow PHY drivers to implement their own software reset
Documentation: networking: update phy.txt with recent changes
Documentation/networking/phy.txt | 9 +++++++++ drivers/net/phy/phy_device.c | 39 ++++++++++++++++++++++++++++++++++----- include/linux/phy.h | 6 ++++++ 3 files changed, 49 insertions(+), 5 deletions(-)
Signature · 1 line
1.8.3.2
PATCH v2 1/3 net: phy: move PHY software reset to genphy_soft_reset
As pointed out by Shaohui, this function is generic for 10/100/1000 PHYs, but 10G PHYs might have a slightly different reset sequence which prevents most of them from using this function.
Move the BMCR_RESET based software resent sequence to genphy_soft_reset() in preparation for allowing PHY drivers to implement a soft_reset() callback.
---
Changes in v2:
- respin
drivers/net/phy/phy_device.c | 27 ++++++++++++++++++++++----- include/linux/phy.h | 1 + 2 files changed, 23 insertions(+), 5 deletions(-)
drivers/net/phy/phy_device.c +22 -5
@@ -540,11 +540,7 @@ int phy_init_hw(struct phy_device *phydev)if (!phydev->drv || !phydev->drv->config_init)return 0 ; - ret =phy_write (phydev,MII_BMCR ,BMCR_RESET ); -if (ret <0 ) -return ret; - - ret =phy_poll_reset (phydev); + ret =genphy_soft_reset (phydev);if (ret <0 )return ret;
@@ -1045,6 +1041,27 @@ static int gen10g_read_status(struct phy_device *phydev)return 0 ; } +/** +* genphy_soft_reset - software reset the PHY via BMCR_RESET bit +* @phydev: target phy_device struct +* +* Description: Perform a software PHY reset using the standard +* BMCR_RESET bit and poll for the reset bit to be cleared. +* +* Returns: 0 on success, < 0 on failure +*/ +int genphy_soft_reset (struct phy_device *phydev) +{ +int ret; + + ret =phy_write (phydev,MII_BMCR ,BMCR_RESET ); +if (ret <0 ) +return ret; + +return phy_poll_reset (phydev); +} +EXPORT_SYMBOL (genphy_soft_reset); +static int genphy_config_init (struct phy_device *phydev) {int val;
include/linux/phy.h +1 -0
@@ -666,6 +666,7 @@ int genphy_update_link(struct phy_device *phydev);int genphy_read_status (struct phy_device *phydev);int genphy_suspend (struct phy_device *phydev);int genphy_resume (struct phy_device *phydev); +int genphy_soft_reset (struct phy_device *phydev);void phy_driver_unregister (struct phy_driver *drv);void phy_drivers_unregister (struct phy_driver *drv,int n);int phy_driver_register (struct phy_driver *new_driver);
Signature · 1 line
1.8.3.2
PATCH v2 2/3 net: phy: allow PHY drivers to implement their own software reset
In reply to Florian FainelliAs pointed out by Shaohui, most 10G PHYs out there have a non-standard compliant software reset sequence, eventually something much more complex than just toggling the BMCR_RESET bit. Allow PHY driver to implement their own soft_reset() callback to deal with that. If no callback is provided, call into genphy_soft_reset() which makes sure the existing behavior is kept intact.
---
Changes in v2:
- fix callback testing before actually invoking it
drivers/net/phy/phy_device.c | 16 ++++++++++++++-- include/linux/phy.h | 5 +++++ 2 files changed, 19 insertions(+), 2 deletions(-)
drivers/net/phy/phy_device.c +14 -2
@@ -535,12 +535,16 @@ static int phy_poll_reset(struct phy_device *phydev)int phy_init_hw (struct phy_device *phydev) { -int ret; +int ret =0 ;if (!phydev->drv || !phydev->drv->config_init)return 0 ; - ret =genphy_soft_reset (phydev); +if (phydev->drv->soft_reset) + ret = phydev->drv->soft_reset (phydev); +else + ret =genphy_soft_reset (phydev); +if (ret <0 )return ret;
@@ -1108,6 +1112,12 @@ static int genphy_config_init(struct phy_device *phydev)return 0 ; } +static int gen10g_soft_reset (struct phy_device *phydev) +{ +/* Do nothing for now */ +return 0 ; +} +static int gen10g_config_init (struct phy_device *phydev) {/* Temporarily just say we support everything */
@@ -1282,6 +1292,7 @@ static struct phy_driver genphy_driver[] = { .phy_id = 0xffffffff, .phy_id_mask = 0xffffffff, .name = "Generic PHY", + .soft_reset = genphy_soft_reset, .config_init = genphy_config_init, .features = 0, .config_aneg = genphy_config_aneg,
@@ -1294,6 +1305,7 @@ static struct phy_driver genphy_driver[] = { .phy_id = 0xffffffff, .phy_id_mask = 0xffffffff, .name = "Generic 10G PHY", + .soft_reset = gen10g_soft_reset, .config_init = gen10g_config_init, .features = 0, .config_aneg = gen10g_config_aneg,
include/linux/phy.h +5 -0
@@ -440,6 +440,11 @@ struct phy_driver {u32 flags;/* +* Called to issue a PHY software reset +*/ +int (*soft_reset)(struct phy_device *phydev); + +/* * Called to initialize the PHY, * including after a reset */
Signature · 1 line
1.8.3.2
PATCH v2 3/3 Documentation: networking: update phy.txt with recent changes
In reply to Florian FainelliThe PHY library was missing a bunch of newly added PHY driver callbacks along with a smallish description of what they do, fix that.
---
Changes in v2:
- fix typo on the soft_reset description
Documentation/networking/phy.txt | 9 +++++++++ 1 file changed, 9 insertions(+)
Documentation/networking/phy.txt +9 -0
@@ -253,16 +253,25 @@ Writing a PHY driver Each driver consists of a number of function pointers: + soft_reset: perform a PHY software reset config_init: configures PHY into a sane state after a reset. For instance, a Davicom PHY requires descrambling disabled. probe: Allocate phy->priv, optionally refuse to bind. PHY may not have been reset or had fixups run yet. suspend/resume: power management config_aneg: Changes the speed/duplex/negotiation settings + aneg_done: Determines the auto-negotiation result read_status: Reads the current speed/duplex/negotiation settings ack_interrupt: Clear a pending interrupt + did_interrupt: Checks if the PHY generated an interrupt config_intr: Enable or disable interrupts remove: Does any driver take-down + ts_info: Queries about the HW timestamping status + hwtstamp: Set the PHY HW timestamping configuration + rxtstamp: Requests a receive timestamp at the PHY level for a 'skb' + txtsamp: Requests a transmit timestamp at the PHY level for a 'skb' + set_wol: Enable Wake-on-LAN at the PHY level + get_wol: Get the Wake-on-LAN status at the PHY level Of these, only config_aneg and read_status are required to be assigned by the driver code. The rest are optional. Also, it is
Signature · 1 line
1.8.3.2
Re: [PATCH net-next v2 3/3] Documentation: networking: update phy.txt with recent changes
Hello.
Quoted 4 lines · Florian Fainelli
The PHY library was missing a bunch of newly added PHY driver callbacks along with a smallish description of what they do, fix that.
Signed-off-by Florian Fainelli <[email protected]>
[...]
Again too quick merge, not all types have been fixed. :-/
Quoted 7 lines
Documentation/networking/phy.txt +0
-0@@ -253,16 +253,25 @@ Writing a PHY driver Each driver consists of a number of function pointers:
[...]
Documentation/networking/phy.txt Writing a PHY driver · line 272
Quoted 4 lines
Documentation/networking/phy.txt +4
-0+ ts_info: Queries about the HW timestamping status + hwtstamp: Set the PHY HW timestamping configuration + rxtstamp: Requests a receive timestamp at the PHY level for a 'skb' + txtsamp: Requests a transmit timestamp at the PHY level for a 'skb'
s/txtsamp/txtstamp/.
WBR, Sergei
David Miller
maintainerFrom: Florian Fainelli <[email protected]>
Date: Mon, 17 Feb 2014 13:34:01 -0800
Quoted 9 lines
Hi David,
As reported by Shaohui, 10G PHYs may have a slightly more complex reset sequence for which a
BMCR_RESETsoftware reset might not suffice. This patchset offers a solution for those by allowing them to implement their ownsoft_reset()callback. Finally there is an update to the PHY library Documentation to cover for the newly added callbacks of the PHY driver structure.
Quoted 5 lines
Thanks!
Changes in v2:
- fixed callback testing
- fixed typo in Documentation
Much better, series applied, thanks.