* [PATCH] irq: enable suspended EARLY_RESUME irqs forcefully if not resumed
@ 2013-07-09 14:32 Laxman Dewangan
2013-07-19 14:00 ` Laxman Dewangan
2013-07-19 15:29 ` Thomas Gleixner
0 siblings, 2 replies; 6+ messages in thread
From: Laxman Dewangan @ 2013-07-09 14:32 UTC (permalink / raw)
To: tglx; +Cc: linux-kernel, Laxman Dewangan
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@nvidia.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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] irq: enable suspended EARLY_RESUME irqs forcefully if not resumed
2013-07-09 14:32 [PATCH] irq: enable suspended EARLY_RESUME irqs forcefully if not resumed Laxman Dewangan
@ 2013-07-19 14:00 ` Laxman Dewangan
2013-07-19 15:29 ` Thomas Gleixner
1 sibling, 0 replies; 6+ messages in thread
From: Laxman Dewangan @ 2013-07-19 14:00 UTC (permalink / raw)
To: Laxman Dewangan; +Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org
Hi Thomas,
On Tuesday 09 July 2013 08:02 PM, Laxman Dewangan wrote:
> 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@nvidia.com>
> ---
Any feedback on this patch please?
Thanks,
Laxman
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] irq: enable suspended EARLY_RESUME irqs forcefully if not resumed
2013-07-09 14:32 [PATCH] irq: enable suspended EARLY_RESUME irqs forcefully if not resumed Laxman Dewangan
2013-07-19 14:00 ` Laxman Dewangan
@ 2013-07-19 15:29 ` Thomas Gleixner
2013-07-22 15:49 ` Konrad Rzeszutek Wilk
1 sibling, 1 reply; 6+ messages in thread
From: Thomas Gleixner @ 2013-07-19 15:29 UTC (permalink / raw)
To: Laxman Dewangan; +Cc: LKML, Konrad Rzeszutek Wilk, Rafael J. Wysocki
On Tue, 9 Jul 2013, Laxman Dewangan wrote:
> 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.
>
> +static bool early_resume_irq_suspended;
> +
Instead of doing that status dance, we could simply reenable all
interrupts in irq_resume(). There's nothing wrong to unmask the few
IRQF_EARLY_RESUME interrupts again.
Just the XEN ones might be upset. Konrad ?
Thanks,
tglx
Index: linux-2.6/kernel/irq/pm.c
===================================================================
--- linux-2.6.orig/kernel/irq/pm.c
+++ linux-2.6/kernel/irq/pm.c
@@ -50,7 +50,7 @@ static void resume_irqs(bool want_early)
bool is_early = desc->action &&
desc->action->flags & IRQF_EARLY_RESUME;
- if (is_early != want_early)
+ if (!is_early && want_early)
continue;
raw_spin_lock_irqsave(&desc->lock, flags);
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] irq: enable suspended EARLY_RESUME irqs forcefully if not resumed
2013-07-19 15:29 ` Thomas Gleixner
@ 2013-07-22 15:49 ` Konrad Rzeszutek Wilk
2013-07-22 19:32 ` Konrad Rzeszutek Wilk
0 siblings, 1 reply; 6+ messages in thread
From: Konrad Rzeszutek Wilk @ 2013-07-22 15:49 UTC (permalink / raw)
To: Thomas Gleixner; +Cc: Laxman Dewangan, LKML, Rafael J. Wysocki
On Fri, Jul 19, 2013 at 05:29:16PM +0200, Thomas Gleixner wrote:
> On Tue, 9 Jul 2013, Laxman Dewangan wrote:
> > 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.
>
> >
> > +static bool early_resume_irq_suspended;
> > +
>
> Instead of doing that status dance, we could simply reenable all
> interrupts in irq_resume(). There's nothing wrong to unmask the few
> IRQF_EARLY_RESUME interrupts again.
>
> Just the XEN ones might be upset. Konrad ?
It should not. I did test it and it ran just fine throught the
gauntlet test - but let me check it with me looking at the console.
>
> Thanks,
>
> tglx
>
> Index: linux-2.6/kernel/irq/pm.c
> ===================================================================
> --- linux-2.6.orig/kernel/irq/pm.c
> +++ linux-2.6/kernel/irq/pm.c
> @@ -50,7 +50,7 @@ static void resume_irqs(bool want_early)
> bool is_early = desc->action &&
> desc->action->flags & IRQF_EARLY_RESUME;
>
> - if (is_early != want_early)
> + if (!is_early && want_early)
> continue;
>
> raw_spin_lock_irqsave(&desc->lock, flags);
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] irq: enable suspended EARLY_RESUME irqs forcefully if not resumed
2013-07-22 15:49 ` Konrad Rzeszutek Wilk
@ 2013-07-22 19:32 ` Konrad Rzeszutek Wilk
2013-07-31 14:10 ` Laxman Dewangan
0 siblings, 1 reply; 6+ messages in thread
From: Konrad Rzeszutek Wilk @ 2013-07-22 19:32 UTC (permalink / raw)
To: Thomas Gleixner; +Cc: Laxman Dewangan, LKML, Rafael J. Wysocki
On Mon, Jul 22, 2013 at 11:49:34AM -0400, Konrad Rzeszutek Wilk wrote:
> On Fri, Jul 19, 2013 at 05:29:16PM +0200, Thomas Gleixner wrote:
> > On Tue, 9 Jul 2013, Laxman Dewangan wrote:
> > > 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.
> >
> > >
> > > +static bool early_resume_irq_suspended;
> > > +
> >
> > Instead of doing that status dance, we could simply reenable all
> > interrupts in irq_resume(). There's nothing wrong to unmask the few
> > IRQF_EARLY_RESUME interrupts again.
> >
> > Just the XEN ones might be upset. Konrad ?
>
> It should not. I did test it and it ran just fine throught the
> gauntlet test - but let me check it with me looking at the console.
It is good. You can add an Acked-by-and-Tested-by from me if you would
like. Thanks!
>
> >
> > Thanks,
> >
> > tglx
> >
> > Index: linux-2.6/kernel/irq/pm.c
> > ===================================================================
> > --- linux-2.6.orig/kernel/irq/pm.c
> > +++ linux-2.6/kernel/irq/pm.c
> > @@ -50,7 +50,7 @@ static void resume_irqs(bool want_early)
> > bool is_early = desc->action &&
> > desc->action->flags & IRQF_EARLY_RESUME;
> >
> > - if (is_early != want_early)
> > + if (!is_early && want_early)
> > continue;
> >
> > raw_spin_lock_irqsave(&desc->lock, flags);
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] irq: enable suspended EARLY_RESUME irqs forcefully if not resumed
2013-07-22 19:32 ` Konrad Rzeszutek Wilk
@ 2013-07-31 14:10 ` Laxman Dewangan
0 siblings, 0 replies; 6+ messages in thread
From: Laxman Dewangan @ 2013-07-31 14:10 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk, Thomas Gleixner; +Cc: LKML, Rafael J. Wysocki
On Tuesday 23 July 2013 01:02 AM, Konrad Rzeszutek Wilk wrote:
> On Mon, Jul 22, 2013 at 11:49:34AM -0400, Konrad Rzeszutek Wilk wrote:
>> On Fri, Jul 19, 2013 at 05:29:16PM +0200, Thomas Gleixner wrote:
>>> On Tue, 9 Jul 2013, Laxman Dewangan wrote:
>>>> 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.
>>>
>>>>
>>>> +static bool early_resume_irq_suspended;
>>>> +
>>> Instead of doing that status dance, we could simply reenable all
>>> interrupts in irq_resume(). There's nothing wrong to unmask the few
>>> IRQF_EARLY_RESUME interrupts again.
>>>
>>> Just the XEN ones might be upset. Konrad ?
>> It should not. I did test it and it ran just fine throught the
>> gauntlet test - but let me check it with me looking at the console.
> It is good. You can add an Acked-by-and-Tested-by from me if you would
> like. Thanks!
Hi Thomas,
Can your change be applied now if this is good? I am fine with the
following change.
If you want, I can send this change through patch or you can take my
Ack, whatever is good.
Acked-by: Laxman Dewangan <ldewangan@nvidia.com>
>>> Thanks,
>>>
>>> tglx
>>>
>>> Index: linux-2.6/kernel/irq/pm.c
>>> ===================================================================
>>> --- linux-2.6.orig/kernel/irq/pm.c
>>> +++ linux-2.6/kernel/irq/pm.c
>>> @@ -50,7 +50,7 @@ static void resume_irqs(bool want_early)
>>> bool is_early = desc->action &&
>>> desc->action->flags & IRQF_EARLY_RESUME;
>>>
>>> - if (is_early != want_early)
>>> + if (!is_early && want_early)
>>> continue;
>>>
>>> raw_spin_lock_irqsave(&desc->lock, flags);
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-07-31 13:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-09 14:32 [PATCH] irq: enable suspended EARLY_RESUME irqs forcefully if not resumed Laxman Dewangan
2013-07-19 14:00 ` Laxman Dewangan
2013-07-19 15:29 ` Thomas Gleixner
2013-07-22 15:49 ` Konrad Rzeszutek Wilk
2013-07-22 19:32 ` Konrad Rzeszutek Wilk
2013-07-31 14:10 ` Laxman Dewangan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox