2018-09-05 12:33:17

by Marek Szyprowski

Subject: [PATCH] mfd: max8997: Disable interrupt handling for suspend/resume cycle

Disable IRQs during suspend/resume cycle to ensure handling of wakeup
interrupts (i.e. RTC wake alarm) after max8997_resume(). This way it can
be properly handled when I2C bus is finally available. This pattern is
also used in other MAX PMIC MFD drivers.

Signed-off-by: Marek Szyprowski <[email protected]>
---
drivers/mfd/max8997.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index d1495d76bf2c..5a50ea976c70 100644
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -464,6 +464,7 @@ static int max8997_suspend(struct device *dev)

if (device_may_wakeup(dev))
irq_set_irq_wake(max8997->irq, 1);
+ disable_irq(max8997->irq);
return 0;
}

@@ -474,6 +475,7 @@ static int max8997_resume(struct device *dev)

if (device_may_wakeup(dev))
irq_set_irq_wake(max8997->irq, 0);
+ enable_irq(max8997->irq);
return max8997_irq_resume(max8997);
}

--
2.17.1

2018-09-05 13:48:58

by Krzysztof Kozlowski

Subject: Re: [PATCH] mfd: max8997: Disable interrupt handling for suspend/resume cycle

On Wed, 5 Sep 2018 at 14:32, Marek Szyprowski <[email protected]> wrote:
>
> Disable IRQs during suspend/resume cycle to ensure handling of wakeup
> interrupts (i.e. RTC wake alarm) after max8997_resume(). This way it can
> be properly handled when I2C bus is finally available. This pattern is
> also used in other MAX PMIC MFD drivers.
>
> Signed-off-by: Marek Szyprowski <[email protected]>
> ---
> drivers/mfd/max8997.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
> index d1495d76bf2c..5a50ea976c70 100644
> --- a/drivers/mfd/max8997.c
> +++ b/drivers/mfd/max8997.c
> @@ -464,6 +464,7 @@ static int max8997_suspend(struct device *dev)
>
> if (device_may_wakeup(dev))
> irq_set_irq_wake(max8997->irq, 1);
> + disable_irq(max8997->irq);
> return 0;
> }
>
> @@ -474,6 +475,7 @@ static int max8997_resume(struct device *dev)
>
> if (device_may_wakeup(dev))
> irq_set_irq_wake(max8997->irq, 0);
> + enable_irq(max8997->irq);
> return max8997_irq_resume(max8997);

Looks good except that here and in some existing drivers we do not
resume in reverse order of suspend. How about making it like in
drivers/mfd/max77843.c? It should not differ from functional point of
view, just logically it makes sense.

Best regards,
Krzysztof