Skip to content

Commit

Permalink
Merge branch 'net-phy-lan87xx-use-genphy_read_master_slave-function'
Browse files Browse the repository at this point in the history
Arun Ramadoss says:

====================
net: phy: lan87xx: use genphy_read_master_slave function

LAN87xx T1 Phy has the same register field as gigabit phy for reading the
master slave configuration. But the genphy_read_master_slave function has a
check of gigabit phy. So refactored the function in such a way, moved the speed
check to the genphy_read_status function. Analyzed the nxp-tja11xx function for
refactoring, but the register for configuring master/slave is nxp specific
which is not extended phy register.
And analyzed the reusing genphy_setup_master_slave, but for LAN87xx
MASTER_ENABLE is always 1 and Preferred state is always 0. So, I didn't try to
change it.
====================

Link: https://lore.kernel.org/r/20220307161515.14970-1-arun.ramadoss@microchip.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  • Loading branch information
Paolo Abeni committed Mar 8, 2022
2 parents 6c43a92 + f1f3a67 commit d307eab
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 39 deletions.
30 changes: 1 addition & 29 deletions drivers/net/phy/microchip_t1.c
Original file line number Diff line number Diff line change
Expand Up @@ -674,34 +674,6 @@ static int lan87xx_cable_test_get_status(struct phy_device *phydev,
return 0;
}

static int lan87xx_read_master_slave(struct phy_device *phydev)
{
int rc = 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 rc;
}

static int lan87xx_read_status(struct phy_device *phydev)
{
int rc = 0;
Expand All @@ -720,7 +692,7 @@ static int lan87xx_read_status(struct phy_device *phydev)
phydev->pause = 0;
phydev->asym_pause = 0;

rc = lan87xx_read_master_slave(phydev);
rc = genphy_read_master_slave(phydev);
if (rc < 0)
return rc;

Expand Down
19 changes: 9 additions & 10 deletions drivers/net/phy/phy_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -2051,17 +2051,11 @@ static int genphy_setup_master_slave(struct phy_device *phydev)
CTL1000_PREFER_MASTER), ctl);
}

static int genphy_read_master_slave(struct phy_device *phydev)
int genphy_read_master_slave(struct phy_device *phydev)
{
int cfg, state;
int val;

if (!phydev->is_gigabit_capable) {
phydev->master_slave_get = MASTER_SLAVE_CFG_UNSUPPORTED;
phydev->master_slave_state = MASTER_SLAVE_STATE_UNSUPPORTED;
return 0;
}

phydev->master_slave_get = MASTER_SLAVE_CFG_UNKNOWN;
phydev->master_slave_state = MASTER_SLAVE_STATE_UNKNOWN;

Expand Down Expand Up @@ -2102,6 +2096,7 @@ static int genphy_read_master_slave(struct phy_device *phydev)

return 0;
}
EXPORT_SYMBOL(genphy_read_master_slave);

/**
* genphy_restart_aneg - Enable and Restart Autonegotiation
Expand Down Expand Up @@ -2396,14 +2391,18 @@ int genphy_read_status(struct phy_device *phydev)
if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link)
return 0;

phydev->master_slave_get = MASTER_SLAVE_CFG_UNSUPPORTED;
phydev->master_slave_state = MASTER_SLAVE_STATE_UNSUPPORTED;
phydev->speed = SPEED_UNKNOWN;
phydev->duplex = DUPLEX_UNKNOWN;
phydev->pause = 0;
phydev->asym_pause = 0;

err = genphy_read_master_slave(phydev);
if (err < 0)
return err;
if (phydev->is_gigabit_capable) {
err = genphy_read_master_slave(phydev);
if (err < 0)
return err;
}

err = genphy_read_lpa(phydev);
if (err < 0)
Expand Down
1 change: 1 addition & 0 deletions include/linux/phy.h
Original file line number Diff line number Diff line change
Expand Up @@ -1578,6 +1578,7 @@ int genphy_update_link(struct phy_device *phydev);
int genphy_read_lpa(struct phy_device *phydev);
int genphy_read_status_fixed(struct phy_device *phydev);
int genphy_read_status(struct phy_device *phydev);
int genphy_read_master_slave(struct phy_device *phydev);
int genphy_suspend(struct phy_device *phydev);
int genphy_resume(struct phy_device *phydev);
int genphy_loopback(struct phy_device *phydev, bool enable);
Expand Down

0 comments on commit d307eab

Please sign in to comment.