On 05/10/2016 02:42 AM, shh....@gmail.com wrote:
> From: Shaohui Xie <shaohui....@nxp.com>
>
> If phy was suspended and is starting, current driver always enable
> phy's interrupts, if phy works in polling, phy can raise unexpected
> interrupt which will not be handled, the interrupt will block system
> enter suspend again. So interrupts should only be re-enabled if phy
> works in interrupt.
Your explanation makes sense. The commit message could you use some
improvements like s/phy/PHY/ and "works in interrupt mode", but that is
not a huge thing.
>
> Signed-off-by: Shaohui Xie <shaohui....@nxp.com>
Reviewed-by: Florian Fainelli <f.faine...@gmail.com>
> ---
> drivers/net/phy/phy.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
> index 6f221c8..baa5ecb 100644
> --- a/drivers/net/phy/phy.c
> +++ b/drivers/net/phy/phy.c
> @@ -871,9 +871,11 @@ void phy_start(struct phy_device *phydev)
> break;
> case PHY_HALTED:
> /* make sure interrupts are re-enabled for the PHY */
> - err = phy_enable_interrupts(phydev);
> - if (err < 0)
> - break;
> + if (phydev->irq != PHY_POLL) {
> + err = phy_enable_interrupts(phydev);
> + if (err < 0)
> + break;
> + }
>
> phydev->state = PHY_RESUMING;
> do_resume = true;
>
--
Florian
