> -----Original Message----- > From: Thomas Gleixner [mailto:t...@linutronix.de] > Sent: Tuesday, March 12, 2013 5:24 AM > To: Liu, Chuansheng > Cc: mi...@redhat.com; linux-kernel@vger.kernel.org > Subject: Re: [PATCH 2/3] genirq: Do not consider the irqs with disabling and > IRQF_NO_SUSPEND > > On Tue, 12 Mar 2013, Chuansheng Liu wrote: > > According to commit 9c6079aa1bf(genirq: Do not consider disabled > > wakeup irqs), we should not break the suspend when one irq is pending > > but has been disabled before suspending. > > > > But there is another case missed, that one irq with flag IRQF_NO_SUSPEND, > > which has been disabled before suspending, and irq pending there, > > in this case, we still should not break the suspending, otherwise, > > the suspend abort over and over. > > > > Here also checking if the desc->istate & IRQS_SUSPENDED is true. > > So what you are saying is: > > If an interrupt which is marked IRQF_NO_SUSPEND has been disabled > before suspend invocation then desc->depth is 1 and therefor it should > not be checked for IRQS_PENDING in check_wakeup_irqs(). > > Makes sense, though the changelog needs to be more clear and the code > wants to have a proper comment. Thanks, will copy your saying into comments, and send patch V2.
> > Thanks, > > tglx > > > Signed-off-by: liu chuansheng <chuansheng....@intel.com> > > --- > > kernel/irq/pm.c | 3 ++- > > 1 files changed, 2 insertions(+), 1 deletions(-) > > > > diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c > > index cb228bf..1470c1b 100644 > > --- a/kernel/irq/pm.c > > +++ b/kernel/irq/pm.c > > @@ -109,7 +109,8 @@ int check_wakeup_irqs(void) > > * can abort suspend. > > */ > > if (irqd_is_wakeup_set(&desc->irq_data)) { > > - if (desc->depth == 1 && desc->istate & IRQS_PENDING) > > + if (desc->depth == 1 && (desc->istate & IRQS_PENDING) > > + && (desc->istate & IRQS_SUSPENDED)) > > return -EBUSY; > > continue; > > } > > -- > > 1.7.0.4 > > > > > > > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/