iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: phy: remove state PHY_AN

Browse Source 
After the recent changes in the state machine state PHY_AN isn't used
any longer and can be removed.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Heiner Kallweit 2018-11-07 20:46:51 +01:00 committed by David S. Miller
parent 74a992b359
commit 85a1f31d63
2 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/phy/phy.c
View File

@ -50,7 +50,6 @@ static const char *phy_state_to_str(enum phy_state st)
PHY_STATE_STR(READY) PHY_STATE_STR(READY)
PHY_STATE_STR(PENDING) PHY_STATE_STR(PENDING)
PHY_STATE_STR(UP) PHY_STATE_STR(UP)
PHY_STATE_STR(AN)
PHY_STATE_STR(RUNNING) PHY_STATE_STR(RUNNING)
PHY_STATE_STR(NOLINK) PHY_STATE_STR(NOLINK)
PHY_STATE_STR(FORCING) PHY_STATE_STR(FORCING)
@ -944,32 +943,6 @@ void phy_state_machine(struct work_struct *work)
case PHY_UP: case PHY_UP:
needs_aneg = true; needs_aneg = true;
phydev->link_timeout = PHY_AN_TIMEOUT;
break;
case PHY_AN:
err = phy_read_status(phydev);
if (err < 0)
break;
/* If the link is down, give up on negotiation for now */
if (!phydev->link) {
phydev->state = PHY_NOLINK;
phy_link_down(phydev, true);
break;
}
/* Check if negotiation is done. Break if there's an error */
err = phy_aneg_done(phydev);
if (err < 0)
break;
/* If AN is done, we're running */
if (err > 0) {
phydev->state = PHY_RUNNING;
phy_link_up(phydev);
} else if (0 == phydev->link_timeout--)
needs_aneg = true;
break; break;
case PHY_NOLINK: case PHY_NOLINK:
if (!phy_polling_mode(phydev)) if (!phy_polling_mode(phydev))

19
include/linux/phy.h
View File

@ -178,7 +178,6 @@ static inline const char *phy_modes(phy_interface_t interface)
#define PHY_INIT_TIMEOUT 100000 #define PHY_INIT_TIMEOUT 100000
#define PHY_STATE_TIME 1 #define PHY_STATE_TIME 1
#define PHY_FORCE_TIMEOUT 10 #define PHY_FORCE_TIMEOUT 10
#define PHY_AN_TIMEOUT 10
#define PHY_MAX_ADDR 32 #define PHY_MAX_ADDR 32
@ -297,24 +296,10 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr);
* *
* UP: The PHY and attached device are ready to do work. * UP: The PHY and attached device are ready to do work.
* Interrupts should be started here. * Interrupts should be started here.
* - timer moves to AN * - timer moves to NOLINK or RUNNING
*
* AN: The PHY is currently negotiating the link state. Link is
* therefore down for now. phy_timer will set this state when it
* detects the state is UP. config_aneg will set this state
* whenever called with phydev->autoneg set to AUTONEG_ENABLE.
* - If autonegotiation finishes, but there's no link, it sets
* the state to NOLINK.
* - If aneg finishes with link, it sets the state to RUNNING,
* and calls adjust_link
* - If autonegotiation did not finish after an arbitrary amount
* of time, autonegotiation should be tried again if the PHY
* supports "magic" autonegotiation (back to AN)
* - If it didn't finish, and no magic_aneg, move to FORCING.
* *
* NOLINK: PHY is up, but not currently plugged in. * NOLINK: PHY is up, but not currently plugged in.
* - If the timer notes that the link comes back, we move to RUNNING * - If the timer notes that the link comes back, we move to RUNNING
* - config_aneg moves to AN
* - phy_stop moves to HALTED * - phy_stop moves to HALTED
* *
* FORCING: PHY is being configured with forced settings * FORCING: PHY is being configured with forced settings
@ -329,7 +314,6 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr);
* link state is polled every other cycle of this state machine, * link state is polled every other cycle of this state machine,
* which makes it every other second) * which makes it every other second)
* - irq will set CHANGELINK * - irq will set CHANGELINK
* - config_aneg will set AN
* - phy_stop moves to HALTED * - phy_stop moves to HALTED
* *
* CHANGELINK: PHY experienced a change in link state * CHANGELINK: PHY experienced a change in link state
@ -353,7 +337,6 @@ enum phy_state {
PHY_READY, PHY_READY,
PHY_PENDING, PHY_PENDING,
PHY_UP, PHY_UP,
PHY_AN,
PHY_RUNNING, PHY_RUNNING,
PHY_NOLINK, PHY_NOLINK,
PHY_FORCING, PHY_FORCING,