Commit c8434559 authored Feb 10, 2017 by Grygorii Strashko Committed by Rafael J. Wysocki Feb 13, 2017

PM / wakeirq: Enable dedicated wakeirq for suspend



We currently rely on runtime PM to enable dedicated wakeirq for suspend.
This assumption fails in the following two cases:

1. If the consumer driver does not have runtime PM implemented, the
   dedicated wakeirq never gets enabled for suspend

2. If the consumer driver has runtime PM implemented, but does not idle
   in suspend

Let's fix the issue by always enabling the dedicated wakeirq during
suspend.

Depends-on: bed57030 (PM / wakeirq: Fix dedicated wakeirq for drivers not using autosuspend)
Fixes: 4990d4fe (PM / Wakeirq: Add automated device wake IRQ handling)
Reported-by: Keerthy <j-keerthy@ti.com>
Tested-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
[ tony@atomide.com: updated based on bed57030, added description ]
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 7089db84

drivers/base/power/wakeirq.c

+10 −2

Original line number	Diff line number	Diff line
		@@ -312,9 +312,13 @@ void dev_pm_arm_wake_irq(struct wake_irq *wirq)
		if (!wirq)
		return;

		if (device_may_wakeup(wirq->dev))
		if (device_may_wakeup(wirq->dev)) {
		if (wirq->status & WAKE_IRQ_DEDICATED_ALLOCATED)
		enable_irq(wirq->irq);

		enable_irq_wake(wirq->irq);
		}
		}

		/**
		* dev_pm_disarm_wake_irq - Disarm device wake-up
		@@ -328,6 +332,10 @@ void dev_pm_disarm_wake_irq(struct wake_irq *wirq)
		if (!wirq)
		return;

		if (device_may_wakeup(wirq->dev))
		if (device_may_wakeup(wirq->dev)) {
		disable_irq_wake(wirq->irq);

		if (wirq->status & WAKE_IRQ_DEDICATED_ALLOCATED)
		disable_irq_nosync(wirq->irq);
		}
		}

Admin message