Commit 4f2aaf7d authored by David S. Miller's avatar David S. Miller

Merge branch 'fix-phy-ignore-interrupts'

Florian Fainelli says:

====================
net: phy: Finally fix PHY_IGNORE_INTERRUPTS

This patch series finally fixes how PHY_IGNORE_INTERRUPTS are treated by
avoiding to poll the PHY *and* getting notified from link state changes by the
Ethernet MAC interrupt service routine.

Tested with bcmgenet since this is the HW that I have access to.

Targetting the "net" tree since these are bugfixes, but I would like Woojun and
Andrew to take a look and test that on their respective HW setups as well.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ceb6560a 49f7a471
...@@ -401,7 +401,7 @@ int bcmgenet_mii_probe(struct net_device *dev) ...@@ -401,7 +401,7 @@ int bcmgenet_mii_probe(struct net_device *dev)
* Ethernet MAC ISRs * Ethernet MAC ISRs
*/ */
if (priv->internal_phy) if (priv->internal_phy)
priv->mii_bus->irq[phydev->mdio.addr] = PHY_IGNORE_INTERRUPT; priv->phydev->irq = PHY_IGNORE_INTERRUPT;
return 0; return 0;
} }
......
...@@ -692,18 +692,21 @@ void phy_change(struct work_struct *work) ...@@ -692,18 +692,21 @@ void phy_change(struct work_struct *work)
struct phy_device *phydev = struct phy_device *phydev =
container_of(work, struct phy_device, phy_queue); container_of(work, struct phy_device, phy_queue);
if (phy_interrupt_is_valid(phydev)) {
if (phydev->drv->did_interrupt && if (phydev->drv->did_interrupt &&
!phydev->drv->did_interrupt(phydev)) !phydev->drv->did_interrupt(phydev))
goto ignore; goto ignore;
if (phy_disable_interrupts(phydev)) if (phy_disable_interrupts(phydev))
goto phy_err; goto phy_err;
}
mutex_lock(&phydev->lock); mutex_lock(&phydev->lock);
if ((PHY_RUNNING == phydev->state) || (PHY_NOLINK == phydev->state)) if ((PHY_RUNNING == phydev->state) || (PHY_NOLINK == phydev->state))
phydev->state = PHY_CHANGELINK; phydev->state = PHY_CHANGELINK;
mutex_unlock(&phydev->lock); mutex_unlock(&phydev->lock);
if (phy_interrupt_is_valid(phydev)) {
atomic_dec(&phydev->irq_disable); atomic_dec(&phydev->irq_disable);
enable_irq(phydev->irq); enable_irq(phydev->irq);
...@@ -711,6 +714,7 @@ void phy_change(struct work_struct *work) ...@@ -711,6 +714,7 @@ void phy_change(struct work_struct *work)
if (PHY_HALTED != phydev->state && if (PHY_HALTED != phydev->state &&
phy_config_interrupt(phydev, PHY_INTERRUPT_ENABLED)) phy_config_interrupt(phydev, PHY_INTERRUPT_ENABLED))
goto irq_enable_err; goto irq_enable_err;
}
/* reschedule state queue work to run as soon as possible */ /* reschedule state queue work to run as soon as possible */
cancel_delayed_work_sync(&phydev->state_queue); cancel_delayed_work_sync(&phydev->state_queue);
...@@ -905,10 +909,10 @@ void phy_state_machine(struct work_struct *work) ...@@ -905,10 +909,10 @@ void phy_state_machine(struct work_struct *work)
phydev->adjust_link(phydev->attached_dev); phydev->adjust_link(phydev->attached_dev);
break; break;
case PHY_RUNNING: case PHY_RUNNING:
/* Only register a CHANGE if we are polling or ignoring /* Only register a CHANGE if we are polling and link changed
* interrupts and link changed since latest checking. * since latest checking.
*/ */
if (!phy_interrupt_is_valid(phydev)) { if (phydev->irq == PHY_POLL) {
old_link = phydev->link; old_link = phydev->link;
err = phy_read_status(phydev); err = phy_read_status(phydev);
if (err) if (err)
...@@ -1000,15 +1004,21 @@ void phy_state_machine(struct work_struct *work) ...@@ -1000,15 +1004,21 @@ void phy_state_machine(struct work_struct *work)
phy_state_to_str(old_state), phy_state_to_str(old_state),
phy_state_to_str(phydev->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, queue_delayed_work(system_power_efficient_wq, &phydev->state_queue,
PHY_STATE_TIME * HZ); PHY_STATE_TIME * HZ);
} }
void phy_mac_interrupt(struct phy_device *phydev, int new_link) void phy_mac_interrupt(struct phy_device *phydev, int new_link)
{ {
cancel_work_sync(&phydev->phy_queue);
phydev->link = new_link; phydev->link = new_link;
schedule_work(&phydev->phy_queue);
/* Trigger a state machine change */
queue_work(system_power_efficient_wq, &phydev->phy_queue);
} }
EXPORT_SYMBOL(phy_mac_interrupt); EXPORT_SYMBOL(phy_mac_interrupt);
......
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