Commit d457917a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Marcelo Henrique Cerri

Revert "net: phy: Avoid polling PHY with PHY_IGNORE_INTERRUPTS"

BugLink: https://bugs.launchpad.net/bugs/1881356

This reverts commit 0d1951fa23ba0d35a4c5498ff28d1c5206d6fcdd which was
commit d5c3d846 upstream.

Guillaume reports that this patch breaks booting on
at91-sama5d4_xplained, so revert it for now.
Reported-by: default avatar"kernelci.org bot" <bot@kernelci.org>
Reported-by: default avatarGuillaume Tucker <guillaume.tucker@collabora.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarIan May <ian.may@canonical.com>
Signed-off-by: default avatarKelsey Skunberg <kelsey.skunberg@canonical.com>
parent c8d24658
......@@ -918,10 +918,10 @@ void phy_state_machine(struct work_struct *work)
phydev->adjust_link(phydev->attached_dev);
break;
case PHY_RUNNING:
/* Only register a CHANGE if we are polling and link changed
* since latest checking.
/* Only register a CHANGE if we are polling or ignoring
* interrupts and link changed since latest checking.
*/
if (phydev->irq == PHY_POLL) {
if (!phy_interrupt_is_valid(phydev)) {
old_link = phydev->link;
err = phy_read_status(phydev);
if (err)
......@@ -1021,11 +1021,6 @@ void phy_state_machine(struct work_struct *work)
dev_dbg(&phydev->dev, "PHY state change %s -> %s\n",
phy_state_to_str(old_state), phy_state_to_str(phydev->state));
/* Only re-schedule a PHY state machine change if we are polling the
* PHY, if PHY_IGNORE_INTERRUPT is set, then we will be moving
* between states from phy_mac_interrupt()
*/
if (phydev->irq == PHY_POLL)
queue_delayed_work(system_power_efficient_wq, &phydev->state_queue,
PHY_STATE_TIME * HZ);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment