Commit 8deeb630 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

net: phy: don't set state PHY_CHANGELINK in phy_change 



State PHY_CHANGELINK isn't needed here, we can call the state machine
directly. We just have to remove the check for phy_polling_mode() to
make this work also in interrupt mode. Removing this check doesn't
cause any overhead because when not polling the state machine is
called only if required by some event.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d79e26a7

drivers/net/phy/phy.c

+0 −8
Original line number Diff line number Diff line
@@ -738,11 +738,6 @@ static irqreturn_t phy_change(struct phy_device *phydev) 
				goto phy_err;

	}



	mutex_lock(&phydev->lock);

	if ((PHY_RUNNING == phydev->state) || (PHY_NOLINK == phydev->state))

		phydev->state = PHY_CHANGELINK;

	mutex_unlock(&phydev->lock);



	/* reschedule state queue work to run as soon as possible */

	phy_trigger_machine(phydev);
@@ -946,9 +941,6 @@ void phy_state_machine(struct work_struct *work) 
		break;

	case PHY_NOLINK:

	case PHY_RUNNING:

		if (!phy_polling_mode(phydev))

			break;

		/* fall through */

	case PHY_CHANGELINK:

	case PHY_RESUMING:

		err = phy_check_link_status(phydev);

include/linux/phy.h

+2 −5
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr); 
 * - timer moves to NOLINK or RUNNING

 *

 * NOLINK: PHY is up, but not currently plugged in.

 * - If the timer notes that the link comes back, we move to RUNNING

 * - irq or timer will set RUNNING if link comes back

 * - phy_stop moves to HALTED

 *

 * FORCING: PHY is being configured with forced settings
@@ -309,10 +309,7 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr); 
 *

 * RUNNING: PHY is currently up, running, and possibly sending

 * and/or receiving packets

 * - timer will set CHANGELINK if we're polling (this ensures the

 *   link state is polled every other cycle of this state machine,

 *   which makes it every other second)

 * - irq will set CHANGELINK

 * - irq or timer will set NOLINK if link goes down

 * - phy_stop moves to HALTED

 *

 * CHANGELINK: PHY experienced a change in link state

CRA Git | Maintained and supported by SUSTech CRA and CCSE