Upon system sleep, mdio_bus_phy_suspend() stops the phy_state_machine(), but subsequent interrupts may retrigger it: They may have been left enabled to facilitate wakeup and are not quiesced until the ->suspend_noirq() phase. Unwanted interrupts may hence occur between mdio_bus_phy_suspend() and dpm_suspend_noirq(), as well as between dpm_resume_noirq() and mdio_bus_phy_resume(). Retriggering the phy_state_machine() through an interrupt is not only undesirable for the reason given in mdio_bus_phy_suspend() (freezing it midway with phydev->lock held), but also because the PHY may be inaccessible after it's suspended: Accesses to USB-attached PHYs are blocked once usb_suspend_both() clears the can_submit flag and PHYs on PCI network cards may become inaccessible upon suspend as well. Amend phy_interrupt() to avoid triggering the state machine if the PHY is suspended. Signal wakeup instead if the attached net_device or its parent has been configured as a wakeup source. (Those conditions are identical to mdio_bus_phy_may_suspend().) Postpone handling of the interrupt until the PHY has resumed. Before stopping the phy_state_machine() in mdio_bus_phy_suspend(), wait for a concurrent phy_interrupt() to run to completion. That is necessary because phy_interrupt() may have checked the PHY's suspend status before the system sleep transition commenced and it may thus retrigger the state machine after it was stopped. Likewise, after re-enabling interrupt handling in mdio_bus_phy_resume(), wait for a concurrent phy_interrupt() to complete to ensure that interrupts which it postponed are properly rerun. The issue was exposed by commit 1ce8b37241ed ("usbnet: smsc95xx: Forward PHY interrupts to PHY driver to avoid polling"), but has existed since forever.
Showing the changes to include (1 of 3 files). Show all
Unified · Split
| @@ -572,6 +572,10 @@ struct macsec_ops; · 571 unmodified lines | |||
| 572 | * @mdix_ctrl: User setting of crossover | 572 | * @mdix_ctrl: User setting of crossover |
| 573 | * @pma_extable: Cached value of PMA/PMD Extended Abilities Register | 573 | * @pma_extable: Cached value of PMA/PMD Extended Abilities Register |
| 574 | * @interrupts: Flag interrupts have been enabled | 574 | * @interrupts: Flag interrupts have been enabled |
| 575 | * @irq_suspended: Flag indicating PHY is suspended and therefore interrupt | ||
| 576 | * handling shall be postponed until PHY has resumed | ||
| 577 | * @irq_rerun: Flag indicating interrupts occurred while PHY was suspended, | ||
| 578 | * requiring a rerun of the interrupt handler after resume | ||
| 575 | * @interface: enum phy_interface_t value | 579 | * @interface: enum phy_interface_t value |
| 576 | * @skb: Netlink message for cable diagnostics | 580 | * @skb: Netlink message for cable diagnostics |
| 577 | * @nest: Netlink nest used for cable diagnostics | 581 | * @nest: Netlink nest used for cable diagnostics |
| @@ -626,6 +630,8 @@ struct phy_device { · 48 unmodified lines | |||
| 626 | 630 | ||
| 627 | /* Interrupts are enabled */ | 631 | /* Interrupts are enabled */ |
| 628 | unsigned interrupts:1; | 632 | unsigned interrupts:1; |
| 633 | unsigned irq_suspended:1; | ||
| 634 | unsigned irq_rerun:1; | ||
| 629 | 635 | ||
| 630 | enum phy_state state; | 636 | enum phy_state state; |
| 631 | 637 | ||