It's important that user space can figure out what device woke the
system from suspend -- e.g., for debugging, or for implementing
conditional wake behavior. Dedicated wakeup IRQs don't currently do
that.
Let's report the event (pm_wakeup_event()) and also allow drivers to
synchronize with these events in their resume path (hence, disable_irq()
instead of disable_irq_nosync()).
Signed-off-by: Brian Norris <briannor...@chromium.org>
---
drivers/base/power/wakeirq.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/base/power/wakeirq.c b/drivers/base/power/wakeirq.c
index 0d77cd6fd8d1..c35b2db1194c 100644
--- a/drivers/base/power/wakeirq.c
+++ b/drivers/base/power/wakeirq.c
@@ -139,6 +139,8 @@ static irqreturn_t handle_threaded_wake_irq(int irq, void
*_wirq)
struct wake_irq *wirq = _wirq;
int res;
+ pm_wakeup_event(wirq->dev, 0);
+
/* We don't want RPM_ASYNC or RPM_NOWAIT here */
res = pm_runtime_resume(wirq->dev);
if (res < 0)
@@ -240,7 +242,7 @@ void dev_pm_disable_wake_irq(struct device *dev)
struct wake_irq *wirq = dev->power.wakeirq;
if (wirq && wirq->dedicated_irq)
- disable_irq_nosync(wirq->irq);
+ disable_irq(wirq->irq);
}
EXPORT_SYMBOL_GPL(dev_pm_disable_wake_irq);
--
2.8.0.rc3.226.g39d4020
