| Message ID | 20220228140510.20883-5-arun.ramadoss@microchip.com (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Add support for LAN937x T1 Phy | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/fixes_present | success | Fixes tag not required for -next series |
| netdev/subject_prefix | success | Link |
| netdev/cover_letter | success | Series has a cover letter |
| netdev/patch_count | success | Link |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/cc_maintainers | success | CCed 6 of 6 maintainers |
| netdev/build_clang | success | Errors and warnings before: 0 this patch: 0 |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/verify_fixes | success | No Fixes tag |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 99 lines checked |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
On Mon, Feb 28, 2022 at 07:35:10PM +0530, Arun Ramadoss wrote: > To configure the Lan937x T1 phy as master or slave using the ethtool -s > <dev> master-slave <forced-master/forced-slave>, the config_aneg and > read status functions are added. And for the cable-diagnostics, used the > lan87xx routines. > > Signed-off-by: Prasanna Vengateshan <prasanna.vengateshan@microchip.com> > Signed-off-by: Arun Ramadoss <arun.ramadoss@microchip.com> > --- > drivers/net/phy/microchip_t1.c | 75 ++++++++++++++++++++++++++++++++++ > 1 file changed, 75 insertions(+) > > diff --git a/drivers/net/phy/microchip_t1.c b/drivers/net/phy/microchip_t1.c > index 634a1423182a..3a0d4c4fab0a 100644 > --- a/drivers/net/phy/microchip_t1.c > +++ b/drivers/net/phy/microchip_t1.c > @@ -81,6 +81,9 @@ > #define T1_REG_BANK_SEL 8 > #define T1_REG_ADDR_MASK 0xFF > > +#define T1_MODE_STAT_REG 0x11 > +#define T1_LINK_UP_MSK BIT(0) > + > #define DRIVER_AUTHOR "Nisar Sayed <nisar.sayed@microchip.com>" > #define DRIVER_DESC "Microchip LAN87XX/LAN937x T1 PHY driver" > > @@ -435,6 +438,11 @@ static int lan_phy_config_init(struct phy_device *phydev) > if (rc < 0) > phydev_err(phydev, "failed to initialize phy\n"); > > + phydev->duplex = DUPLEX_FULL; > + phydev->speed = SPEED_100; > + phydev->pause = 0; > + phydev->asym_pause = 0; Shouldn't this be done in lan937x_read_status()? Have you tested this patch with various invocations of ethtool -s ? E.g. autoneg on, autoneg off at various forced speeds, both suitable for the PHY and unsuitable? Are all these sensibly handled? Thanks.
On Mon, 2022-02-28 at 14:12 +0000, Russell King (Oracle) wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you > know the content is safe > > On Mon, Feb 28, 2022 at 07:35:10PM +0530, Arun Ramadoss wrote: > > To configure the Lan937x T1 phy as master or slave using the > > ethtool -s > > <dev> master-slave <forced-master/forced-slave>, the config_aneg > > and > > read status functions are added. And for the cable-diagnostics, > > used the > > lan87xx routines. > > > > Signed-off-by: Prasanna Vengateshan < > > prasanna.vengateshan@microchip.com> > > Signed-off-by: Arun Ramadoss <arun.ramadoss@microchip.com> > > --- > > drivers/net/phy/microchip_t1.c | 75 > > ++++++++++++++++++++++++++++++++++ > > 1 file changed, 75 insertions(+) > > > > diff --git a/drivers/net/phy/microchip_t1.c > > b/drivers/net/phy/microchip_t1.c > > index 634a1423182a..3a0d4c4fab0a 100644 > > --- a/drivers/net/phy/microchip_t1.c > > +++ b/drivers/net/phy/microchip_t1.c > > @@ -81,6 +81,9 @@ > > #define T1_REG_BANK_SEL 8 > > #define T1_REG_ADDR_MASK 0xFF > > > > +#define T1_MODE_STAT_REG 0x11 > > +#define T1_LINK_UP_MSK BIT(0) > > + > > #define DRIVER_AUTHOR "Nisar Sayed < > > nisar.sayed@microchip.com>" > > #define DRIVER_DESC "Microchip LAN87XX/LAN937x T1 PHY driver" > > > > @@ -435,6 +438,11 @@ static int lan_phy_config_init(struct > > phy_device *phydev) > > if (rc < 0) > > phydev_err(phydev, "failed to initialize phy\n"); > > > > + phydev->duplex = DUPLEX_FULL; > > + phydev->speed = SPEED_100; > > + phydev->pause = 0; > > + phydev->asym_pause = 0; > > Shouldn't this be done in lan937x_read_status()? > > Have you tested this patch with various invocations of ethtool -s ? > E.g. autoneg on, autoneg off at various forced speeds, both suitable > for the PHY and unsuitable? Are all these sensibly handled? > Thanks for the comment. LAN937x is 100BaseT1 Phy and it doesn't provide option for changing speed and autonegotiation. Since it is fixed and not going to change using ethtool -s command, I added it in the config_init routine. I took the drivers/net/phy/nxp-tja11xx as reference in which speed is initialised in config_init routine. I tested the patch using the ethtool -s for changing the master/slave configuration. For other change like speed/duplex setting, driver will not make change. When I execute ethtool <dev>, it returns the default value 100Mbps, Full duplex. If lan937x_read_status( ) is the suitable place, then I will move it there. > Thanks. > > -- > RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ > FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
diff --git a/drivers/net/phy/microchip_t1.c b/drivers/net/phy/microchip_t1.c index 634a1423182a..3a0d4c4fab0a 100644 --- a/drivers/net/phy/microchip_t1.c +++ b/drivers/net/phy/microchip_t1.c @@ -81,6 +81,9 @@ #define T1_REG_BANK_SEL 8 #define T1_REG_ADDR_MASK 0xFF +#define T1_MODE_STAT_REG 0x11 +#define T1_LINK_UP_MSK BIT(0) + #define DRIVER_AUTHOR "Nisar Sayed <nisar.sayed@microchip.com>" #define DRIVER_DESC "Microchip LAN87XX/LAN937x T1 PHY driver" @@ -435,6 +438,11 @@ static int lan_phy_config_init(struct phy_device *phydev) if (rc < 0) phydev_err(phydev, "failed to initialize phy\n"); + phydev->duplex = DUPLEX_FULL; + phydev->speed = SPEED_100; + phydev->pause = 0; + phydev->asym_pause = 0; + return rc < 0 ? rc : 0; } @@ -666,6 +674,69 @@ static int lan87xx_cable_test_get_status(struct phy_device *phydev, return 0; } +static int lan937x_read_status(struct phy_device *phydev) +{ + int rc; + + rc = phy_read(phydev, T1_MODE_STAT_REG); + if (rc < 0) + return rc; + + if (rc & T1_LINK_UP_MSK) + phydev->link = 1; + else + phydev->link = 0; + + phydev->master_slave_get = MASTER_SLAVE_CFG_UNKNOWN; + phydev->master_slave_state = MASTER_SLAVE_STATE_UNKNOWN; + + rc = phy_read(phydev, MII_CTRL1000); + if (rc < 0) + return rc; + + if (rc & CTL1000_AS_MASTER) + phydev->master_slave_get = MASTER_SLAVE_CFG_MASTER_FORCE; + else + phydev->master_slave_get = MASTER_SLAVE_CFG_SLAVE_FORCE; + + rc = phy_read(phydev, MII_STAT1000); + if (rc < 0) + return rc; + + if (rc & LPA_1000MSRES) + phydev->master_slave_state = MASTER_SLAVE_STATE_MASTER; + else + phydev->master_slave_state = MASTER_SLAVE_STATE_SLAVE; + + return 0; +} + +static int lan937x_config_aneg(struct phy_device *phydev) +{ + int rc; + u16 ctl = 0; + + switch (phydev->master_slave_set) { + case MASTER_SLAVE_CFG_MASTER_FORCE: + ctl |= CTL1000_AS_MASTER; + break; + case MASTER_SLAVE_CFG_SLAVE_FORCE: + break; + case MASTER_SLAVE_CFG_UNKNOWN: + case MASTER_SLAVE_CFG_UNSUPPORTED: + return 0; + default: + phydev_warn(phydev, "Unsupported Master/Slave mode\n"); + return -EOPNOTSUPP; + } + + rc = phy_modify_changed(phydev, MII_CTRL1000, CTL1000_AS_MASTER, ctl); + if (rc == 1) + rc = genphy_soft_reset(phydev); + + return rc; +} + static struct phy_driver microchip_t1_phy_driver[] = { { .phy_id = LAN87XX_PHY_ID, @@ -689,6 +760,10 @@ static struct phy_driver microchip_t1_phy_driver[] = { .config_init = lan_phy_config_init, .suspend = genphy_suspend, .resume = genphy_resume, + .config_aneg = lan937x_config_aneg, + .read_status = lan937x_read_status, + .cable_test_start = lan87xx_cable_test_start, + .cable_test_get_status = lan87xx_cable_test_get_status, } };