[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1373380343-10143-1-git-send-email-ldewangan@nvidia.com>
Date: Tue, 9 Jul 2013 20:02:23 +0530
From: Laxman Dewangan <ldewangan@...dia.com>
To: <tglx@...utronix.de>
CC: <linux-kernel@...r.kernel.org>,
Laxman Dewangan <ldewangan@...dia.com>
Subject: [PATCH] irq: enable suspended EARLY_RESUME irqs forcefully if not resumed
When system enters into suspend, it disable all irqs in single
function call. This disables EARLY_RESUME irqs also along with
normal irqs.
The EARLY_RESUME irqs get enabled in sys_core_ops->resume and
non-EARLY_RESUME irqs get enabled in normal system resume path.
When suspend_noirq failed or suspend is aborted for any reason,
the EARLY_RESUME irqs do not get enabled as sys_core_ops->resume()
call did not happen. It only enables the non-EARLY_RESUME irqs in normal
disable for remaining life of system.
Add checks on normal irq_resume() whether EARLY_RESUME irqs have been
enabled or not and if not then enable it forcefully.
Signed-off-by: Laxman Dewangan <ldewangan@...dia.com>
---
kernel/irq/pm.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index cb228bf..e8a1427 100644
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -13,6 +13,8 @@
#include "internals.h"
+static bool early_resume_irq_suspended;
+
/**
* suspend_device_irqs - disable all currently enabled interrupt lines
*
@@ -37,6 +39,7 @@ void suspend_device_irqs(void)
for_each_irq_desc(irq, desc)
if (desc->istate & IRQS_SUSPENDED)
synchronize_irq(irq);
+ early_resume_irq_suspended = true;
}
EXPORT_SYMBOL_GPL(suspend_device_irqs);
@@ -67,6 +70,7 @@ static void resume_irqs(bool want_early)
static void irq_pm_syscore_resume(void)
{
resume_irqs(true);
+ early_resume_irq_suspended = false;
}
static struct syscore_ops irq_pm_syscore_ops = {
@@ -87,9 +91,15 @@ device_initcall(irq_pm_init_ops);
* Enable all non-%IRQF_EARLY_RESUME interrupt lines previously
* disabled by suspend_device_irqs() that have the IRQS_SUSPENDED flag
* set as well as those with %IRQF_FORCE_RESUME.
+ * Also enable IRQF_EARLY_RESUME irqs if it is not enabled by syscore_ops
+ * resume path.
*/
void resume_device_irqs(void)
{
+ if (early_resume_irq_suspended) {
+ pr_err("%s: Resuming IRQF_EARLY_RESUME forcefully\n", __func__);
+ irq_pm_syscore_resume();
+ }
resume_irqs(false);
}
EXPORT_SYMBOL_GPL(resume_device_irqs);
--
1.7.1.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists