net: phy: dp83867: fix speed 10 in sgmii mode
Subsystems (3)
PATCH 1/2 net: phy: dp83867: fix speed 10 in sgmii mode
From: Max Uvarov <[email protected]>
Commit 333061b924539c0de081339643f45514f5f1c1e6 upstream.
For supporting 10Mps speed in SGMII mode DP83867_10M_SGMII_RATE_ADAPT bit of DP83867_10M_SGMII_CFG register has to be cleared by software. That does not affect speeds 100 and 1000 so can be done on init.
---
- already in 5.3
- applies and builds against 4.14 and 4.19
- tested with 4.14
--- drivers/net/phy/dp83867.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/net/phy/dp83867.c +19 -0
@@ -37,6 +37,8 @@#define DP83867_STRAP_STS1 0x006E#define DP83867_RGMIIDCTL 0x0086#define DP83867_IO_MUX_CFG 0x0170 +#define DP83867_10M_SGMII_CFG 0x016F +#define DP83867_10M_SGMII_RATE_ADAPT_MASK BIT(7)#define DP83867_SW_RESET BIT(15)#define DP83867_SW_RESTART BIT(14)
@@ -283,6 +285,23 @@ static int dp83867_config_init(struct phy_device *phydev) } } +if (phydev->interface ==PHY_INTERFACE_MODE_SGMII ) { +/* For support SPEED_10 in SGMII mode +* DP83867_10M_SGMII_RATE_ADAPT bit +* has to be cleared by software. That +* does not affect SPEED_100 and +* SPEED_1000. +*/ + val =phy_read_mmd (phydev,DP83867_DEVADDR , +DP83867_10M_SGMII_CFG ); + val &= ~DP83867_10M_SGMII_RATE_ADAPT_MASK ; + ret =phy_write_mmd (phydev,DP83867_DEVADDR , +DP83867_10M_SGMII_CFG , val); + +if (ret) +return ret; + } +/* Enable Interrupt output INT_OE in CFG3 register */ if (phy_interrupt_is_valid (phydev)) { val =phy_read (phydev,DP83867_CFG3 );
Signature · 1 line
2.20.1
PATCH 2/2 net: phy: dp83867: increase SGMII autoneg timer duration
From: Max Uvarov <[email protected]>
Commit 1a97a477e666cbdededab93bd3754e508f0c09d7 upstream.
After reset SGMII Autoneg timer is set to 2us (bits 6 and 5 are 01). That is not enough to finalize autonegatiation on some devices. Increase this timer duration to maximum supported 16ms.
---
- already in 5.3
- applies and builds against 4.14 and 4.19
- tested with 4.14
--- drivers/net/phy/dp83867.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/net/phy/dp83867.c +18 -0
@@ -33,6 +33,12 @@/* Extended Registers */ #define DP83867_CFG4 0x0031 +#define DP83867_CFG4_SGMII_ANEG_MASK (BIT(5) | BIT(6)) +#define DP83867_CFG4_SGMII_ANEG_TIMER_11MS (3 << 5) +#define DP83867_CFG4_SGMII_ANEG_TIMER_800US (2 << 5) +#define DP83867_CFG4_SGMII_ANEG_TIMER_2US (1 << 5) +#define DP83867_CFG4_SGMII_ANEG_TIMER_16MS (0 << 5) +#define DP83867_RGMIICTL 0x0032#define DP83867_STRAP_STS1 0x006E#define DP83867_RGMIIDCTL 0x0086
@@ -300,6 +306,18 @@ static int dp83867_config_init(struct phy_device *phydev)if (ret)return ret; + +/* After reset SGMII Autoneg timer is set to 2us (bits 6 and 5 +* are 01). That is not enough to finalize autoneg on some +* devices. Increase this timer duration to maximum 16ms. +*/ + val =phy_read_mmd (phydev,DP83867_DEVADDR ,DP83867_CFG4 ); + val &= ~DP83867_CFG4_SGMII_ANEG_MASK ; + val |=DP83867_CFG4_SGMII_ANEG_TIMER_16MS ; + ret =phy_write_mmd (phydev,DP83867_DEVADDR ,DP83867_CFG4 , val); + +if (ret) +return ret; }/* Enable Interrupt output INT_OE in CFG3 register */
Signature · 1 line
2.20.1
Sasha Levin
maintainerQuoted 15 lines · Adrian Bunk
From: Max Uvarov <[email protected]>
Commit
333061b924539c0de081339643f45514f5f1c1e6upstream.For supporting 10Mps speed in SGMII mode
DP83867_10M_SGMII_RATE_ADAPTbit ofDP83867_10M_SGMII_CFGregister has to be cleared by software. That does not affect speeds 100 and 1000 so can be done on init.Signed-off-by Max Uvarov <[email protected]>Cc Heiner Kallweit <[email protected]>Cc Florian Fainelli <[email protected]>Cc Andrew Lunn <[email protected]>Signed-off-by David S. Miller <[email protected]>[ adapted for kernels without phy_modify_mmd ]Signed-off-by Adrian Bunk <[email protected]>
Quoted 4 lines
---
- already in 5.3
- applies and builds against 4.14 and 4.19
- tested with 4.14
Looks like Greg took these in, thanks!
Signature · 2 lines
Thanks, Sasha