[...]
> > diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
> > index d9b05b5..2b8ff50 100644
> > --- a/include/linux/interrupt.h
> > +++ b/include/linux/interrupt.h
> > @@ -57,6 +57,9 @@
> > * IRQF_NO_THREAD - Interrupt cannot be threaded
> > * IRQF_EARLY_RESUME - Resume IRQ early during syscore instead of at device
> > * resume time.
> > + * IRQF_SHARED_TIMER_OK - Interrupt is safe to be shared with a timer. The
> > + * handler may be called spuriously during suspend
> > + * without issue.
> > */
> > #define IRQF_DISABLED 0x00000020
> > #define IRQF_SHARED 0x00000080
> > @@ -70,8 +73,10 @@
> > #define IRQF_FORCE_RESUME 0x00008000
> > #define IRQF_NO_THREAD 0x00010000
> > #define IRQF_EARLY_RESUME 0x00020000
> > +#define __IRQF_TIMER_SIBLING_OK 0x00040000
> >
> > #define IRQF_TIMER (__IRQF_TIMER | IRQF_NO_SUSPEND | IRQF_NO_THREAD)
> > +#define IRQF_SHARED_TIMER_OK (IRQF_SHARED | __IRQF_TIMER_SIBLING_OK)
> >
> > /*
> > * These values can be returned by request_any_context_irq() and
> > diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
> > index 3ca5325..e4ec91a 100644
> > --- a/kernel/irq/pm.c
> > +++ b/kernel/irq/pm.c
> > @@ -28,6 +28,47 @@ bool irq_pm_check_wakeup(struct irq_desc *desc)
> > }
> >
> > /*
> > + * Check whether an interrupt is safe to occur during suspend.
> > + *
> > + * Physical IRQ lines may be shared between devices which may be expected to
> > + * raise interrupts during suspend (e.g. timers) and those which may not (e.g.
> > + * anything we cut the power to). Not all handlers will be safe to call during
> > + * suspend, so we need to scream if there's the possibility an unsafe handler
> > + * will be called.
> > + *
> > + * A small number of handlers are safe to be shared with timer interrupts, and
> > + * we don't want to warn erroneously for these. Such handlers will not poke
> > + * hardware that's not powered or call into kernel infrastructure not available
> > + * during suspend. These are marked with __IRQF_TIMER_SIBLING_OK.
> > + */
> > +bool irq_safe_during_suspend(struct irq_desc * desc, struct irqaction *action)
> > +{
> > + const unsigned int safe_flags =
> > + __IRQF_TIMER_SIBLING_OK | IRQF_NO_SUSPEND;
> > +
> > + /*
> > + * If no-one wants to be called during suspend, or if everyone does,
> > + * then there's no potential conflict.
> > + */
> > + if (!desc->no_suspend_depth)
> > + return true;
> > + if (desc->no_suspend_depth == desc->nr_actions)
> > + return true;
> > +
> > + /*
> > + * If any action hasn't asked to be called during suspend or is not
> > + * happy to be called during suspend, we have a potential problem.
> > + */
> > + if (!(action->flags & safe_flags))
> > + return false;
> else if (!(action->flags & IRQF_NO_SUSPEND) ||
> desc->no_suspend_depth > 1)
> return true;
>
> Am I missing something or is the following loop only required if
> we're adding an action with the IRQF_NO_SUSPEND flag set for the
> first time ?
With the check above we could return true incorrectly after the first
time we return true. Consider adding the following in order to an empty
desc:
flags = IRQF_SHARED // safe, returns true
flags = IRQF_NO_SUSPEND // unsafe, returns false
flags = IRQF_NO_SUSPEND // unsafe, but returns true
Currently it shouldn't matter as the only caller is a WARN_ON_ONCE(),
but it seems unfortunate to allow this.
We'd also run the loop until we had at least two IRQF_NO_SUSPEND
irqactions:
flags = IRQF_SHARED_TIMER_OK // early return
flags = IRQF_NO_SUSPEND // run loop
flags = IRQF_SHARED_TIMER_OK // run loop
flags = IRQF_SHARED_TIMER_OK // run loop
flags = IRQF_SHARED_TIMER_OK // run loop
flags = IRQF_NO_SUSPEND // don't run loop.
flags = IRQF_SHARED_TIMER_OK // don't run loop
I assume that we only have one IRQF_NO_SUSPEND action sharing the line
anyway in your case?
Given that we'll only bother to run the test if there's a mismatch
between desc->no_suspend_depth and desc->nr_actions, I don't think we
win much. These cases should be rare in practice, the tests only
performed when we request the irq, and there shouldn't be that many
actions to loop over.
Thanks,
Mark.
>
> > + for (action = desc->action; action; action = action->next)
> > + if (!(action->flags & safe_flags))
> > + return false;
> > +
> > + return true;
> > +}
> > +
> > +/*
> > * Called from __setup_irq() with desc->lock held after @action has
> > * been installed in the action chain.
> > */
> > @@ -44,8 +85,7 @@ void irq_pm_install_action(struct irq_desc *desc, struct irqaction *action)
> > if (action->flags & IRQF_NO_SUSPEND)
> > desc->no_suspend_depth++;
> >
> > - WARN_ON_ONCE(desc->no_suspend_depth &&
> > - desc->no_suspend_depth != desc->nr_actions);
> > + WARN_ON_ONCE(!irq_safe_during_suspend(desc, action));
> > }
> >
> > /*
>
>
>
> --
> Boris Brezillon, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
