net: phy: marvell: add Marvell specific PHY loopback
Subsystems (4)
PATCH v2 1/1 net: phy: marvell: add Marvell specific PHY loopback
Existing genphy_loopback() is not applicable for Marvell PHY. Besides configuring bit-6 and bit-13 in Page 0 Register 0 (Copper Control Register), it is also required to configure same bits in Page 2 Register 21 (MAC Specific Control Register 2) according to speed of the loopback is operating.
Tested working on Marvell88E1510 PHY for all speeds (1000/100/10Mbps).
FIXME: Based on trial and error test, it seem 1G need to have delay between soft reset and loopback enablement.
---
v2 changelog:
- For loopback enabled, add bit-6 and bit-13 configuration in both Page 0 Register 0 and Page 2 Register 21. Commented by Heiner Kallweit
<[email protected]>.
- For loopback disabled, follow genphy_loopback() implementation.
--- drivers/net/phy/marvell.c | 46 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-)
drivers/net/phy/marvell.c +45 -1
@@ -189,6 +189,8 @@#define MII_88E1510_GEN_CTRL_REG_1_MODE_RGMII_SGMII 0x4#define MII_88E1510_GEN_CTRL_REG_1_RESET 0x8000/* Soft reset */ +#define MII_88E1510_MSCR_2 0x15 +#define MII_VCT5_TX_RX_MDI0_COUPLING 0x10#define MII_VCT5_TX_RX_MDI1_COUPLING 0x11#define MII_VCT5_TX_RX_MDI2_COUPLING 0x12
@@ -1932,6 +1934,48 @@ static void marvell_get_stats(struct phy_device *phydev, data[i] =marvell_get_stat (phydev, i); } +static int marvell_loopback (struct phy_device *phydev,bool enable) +{ +if (enable) { +u16 bmcr_ctl =0 , mscr2_ctl =0 ; + +if (phydev->speed ==SPEED_1000 ) + bmcr_ctl =BMCR_SPEED1000 ; +else if (phydev->speed ==SPEED_100 ) + bmcr_ctl =BMCR_SPEED100 ; + +if (phydev->duplex ==DUPLEX_FULL ) + bmcr_ctl |=BMCR_FULLDPLX ; + +phy_modify (phydev,MII_BMCR , ~0 , bmcr_ctl); + +if (phydev->speed ==SPEED_1000 ) + mscr2_ctl =BMCR_SPEED1000 ; +else if (phydev->speed ==SPEED_100 ) + mscr2_ctl =BMCR_SPEED100 ; + +phy_modify_paged (phydev,MII_MARVELL_MSCR_PAGE , +MII_88E1510_MSCR_2 ,BMCR_SPEED1000 | +BMCR_SPEED100 , mscr2_ctl); + +/* Need soft reset to have speed configuration takes effect */ +genphy_soft_reset (phydev); + +/* FIXME: Based on trial and error test, it seem 1G need to have +* delay between soft reset and loopback enablement. +*/ +if (phydev->speed ==SPEED_1000 ) +msleep (1000 ); + +return phy_modify (phydev,MII_BMCR ,BMCR_LOOPBACK , +BMCR_LOOPBACK ); + }else { +phy_modify (phydev,MII_BMCR ,BMCR_LOOPBACK ,0 ); + +return phy_config_aneg (phydev); + } +} +static int marvell_vct5_wait_complete (struct phy_device *phydev) {int i;
@@ -3078,7 +3122,7 @@ static struct phy_driver marvell_drivers[] = { .get_sset_count = marvell_get_sset_count, .get_strings = marvell_get_strings, .get_stats = marvell_get_stats, - .set_loopback = genphy_loopback, + .set_loopback = marvell_loopback, .get_tunable = m88e1011_get_tunable, .set_tunable = m88e1011_set_tunable, .cable_test_start = marvell_vct7_cable_test_start,
Signature · 1 line
2.17.1
Russell King (Oracle)
reviewerQuoted 4 lines · Mohammad Athari Bin Ismail
drivers/net/phy/marvell.c +4
-0+static int marvell_loopback (struct phy_device *phydev,bool enable) +{ +if (enable) { +u16 bmcr_ctl =0 , mscr2_ctl =0 ;
drivers/net/phy/marvell.c static void marvell_get_stats(struct phy_device *phydev, · line 1950
Quoted 10 lines
drivers/net/phy/marvell.c +10
-0+ +if (phydev->speed ==SPEED_1000 ) + bmcr_ctl =BMCR_SPEED1000 ; +else if (phydev->speed ==SPEED_100 ) + bmcr_ctl =BMCR_SPEED100 ; + +if (phydev->duplex ==DUPLEX_FULL ) + bmcr_ctl |=BMCR_FULLDPLX ; + +phy_modify (phydev,MII_BMCR , ~0 , bmcr_ctl);
Is there any point in doing a read-modify-write here if you're just setting all bits in the register? Wouldn't phy_write() be more appropriate? What about error handing?
Quoted 13 lines
drivers/net/phy/marvell.c +13
-0+ +if (phydev->speed ==SPEED_1000 ) + mscr2_ctl =BMCR_SPEED1000 ; +else if (phydev->speed ==SPEED_100 ) + mscr2_ctl =BMCR_SPEED100 ; + +phy_modify_paged (phydev,MII_MARVELL_MSCR_PAGE , +MII_88E1510_MSCR_2 ,BMCR_SPEED1000 | +BMCR_SPEED100 , mscr2_ctl); + +/* Need soft reset to have speed configuration takes effect */ +genphy_soft_reset (phydev); +
drivers/net/phy/marvell.c static void marvell_get_stats(struct phy_device *phydev, · line 1973
Quoted 10 lines
drivers/net/phy/marvell.c +10
-0+/* FIXME: Based on trial and error test, it seem 1G need to have +* delay between soft reset and loopback enablement. +*/ +if (phydev->speed ==SPEED_1000 ) +msleep (1000 ); + +return phy_modify (phydev,MII_BMCR ,BMCR_LOOPBACK , +BMCR_LOOPBACK ); + }else { +phy_modify (phydev,MII_BMCR ,BMCR_LOOPBACK ,0 );
Error handling?
Thanks.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
Quoted 25 lines
-----Original Message-----
From: Russell King <[email protected]>
Sent: Wednesday, January 12, 2022 9:13 PM
To: Ismail, Mohammad Athari <[email protected]>
Cc: Andrew Lunn <[email protected]>; David S . Miller <[email protected]>; Jakub Kicinski <[email protected]>; Oleksij Rempel <[email protected]>; Heiner Kallweit <[email protected]>; [email protected]; linux- [email protected]; [email protected]
Subject: Re: [PATCH net v2] net: phy: marvell: add Marvell specific PHY loopbackQuoted 9 lines · Mohammad Athari Bin Ismail
drivers/net/phy/marvell.c +9
-0+static int marvell_loopback (struct phy_device *phydev,bool enable) { +if (enable) { +u16 bmcr_ctl =0 , mscr2_ctl =0 ; + +if (phydev->speed ==SPEED_1000 ) + bmcr_ctl =BMCR_SPEED1000 ; +else if (phydev->speed ==SPEED_100 ) + bmcr_ctl =BMCR_SPEED100 ; +
Quoted 8 lines
drivers/net/phy/marvell.c static void marvell_get_stats(struct phy_device *phydev, · line 1950
Quoted 4 lines
drivers/net/phy/marvell.c +4
-0+if (phydev->duplex ==DUPLEX_FULL ) + bmcr_ctl |=BMCR_FULLDPLX ; + +phy_modify (phydev,MII_BMCR , ~0 , bmcr_ctl);Is there any point in doing a read-modify-write here if you're just setting all bits in the register? Wouldn't
phy_write()be more appropriate? What about error handing?
Yes, you're right. phy_write() is more suitable. And will add error handling as well. Will include them in v3 patch.
Quoted 11 lines
drivers/net/phy/marvell.c static void marvell_get_stats(struct phy_device *phydev, · line 1960
Quoted 11 lines
drivers/net/phy/marvell.c +10
-0+ +if (phydev->speed ==SPEED_1000 ) + mscr2_ctl =BMCR_SPEED1000 ; +else if (phydev->speed ==SPEED_100 ) + mscr2_ctl =BMCR_SPEED100 ; + +phy_modify_paged (phydev,MII_MARVELL_MSCR_PAGE , +MII_88E1510_MSCR_2 ,BMCR_SPEED1000 | +BMCR_SPEED100 , mscr2_ctl); +
I believe this also need error handling.
Quoted 3 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ /* Need soft reset to have speed configuration takes effect*/
drivers/net/phy/marvell.c static void marvell_get_stats(struct phy_device *phydev, · line 1962
Quoted 1 line
drivers/net/phy/marvell.c +1
-0+genphy_soft_reset (phydev);
Ditto.
Quoted 14 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ + /* FIXME: Based on trial and error test, it seem 1G need tohave
drivers/net/phy/marvell.c static void marvell_get_stats(struct phy_device *phydev, · line 1973
Quoted 9 lines
drivers/net/phy/marvell.c +9
-0+* delay between soft reset and loopback enablement. +*/ +if (phydev->speed ==SPEED_1000 ) +msleep (1000 ); + +return phy_modify (phydev,MII_BMCR ,BMCR_LOOPBACK , +BMCR_LOOPBACK ); + }else { +phy_modify (phydev,MII_BMCR ,BMCR_LOOPBACK ,0 );Error handling?
Will add it in v3 patch.
-Athari-
Quoted 6 lines
Thanks.
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!