2.6.30 enabling cpu1 on resume fails after suspend to memory

Commit Message

Thomas Gleixner June 14, 2009, 2:45 p.m. UTC

Benjamin,

On Sun, 14 Jun 2009, Thomas Gleixner wrote:
> On Sun, 14 Jun 2009, Pallipadi, Venkatesh wrote:
> > >Benjamin just confirmed that. The logic in disable_device_interrupts()
> > >already skips interrupts marked with IRQF_TIMER, but I suspect that
> > >the hpet/MSI interupts are not marked that way.
> > >
> > 
> > For percpu hpet at offline we will have
> > - clockevent shutdown which will disable the interrupt
> > - free_irq that will unregister on CPU DEAD
> 
> Well, the interupt in question is on the boot cpu which is not going
> through CPU DEAD :)

can you please test the patch below.

Thanks,

	tglx
------------>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Benjamin S. June 14, 2009, 3:03 p.m. UTC | #1

On Sun, 14 Jun 2009 16:45:10 +0200 (CEST)
Thomas Gleixner <[e-mail]> wrote:

> can you please test the patch below.

It works. 


Benjamin
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Thomas Gleixner June 14, 2009, 3:41 p.m. UTC | #2

On Sun, 14 Jun 2009, Benjamin S. wrote:

> On Sun, 14 Jun 2009 16:45:10 +0200 (CEST)
> Thomas Gleixner <[e-mail]> wrote:
> 
> > can you please test the patch below.
> 
> It works. 

I queue it up. Thanks,

  	tglx
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Greg KH June 14, 2009, 4:12 p.m. UTC | #3

On Sun, Jun 14, 2009 at 05:41:50PM +0200, Thomas Gleixner wrote:
> On Sun, 14 Jun 2009, Benjamin S. wrote:
> 
> > On Sun, 14 Jun 2009 16:45:10 +0200 (CEST)
> > Thomas Gleixner <[e-mail]> wrote:
> > 
> > > can you please test the patch below.
> > 
> > It works. 
> 
> I queue it up. Thanks,

Make sure to add a tag to get it sent to the stable tree too please :)

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Thomas Gleixner June 14, 2009, 4:19 p.m. UTC | #4

On Sun, 14 Jun 2009, Greg KH wrote:
> On Sun, Jun 14, 2009 at 05:41:50PM +0200, Thomas Gleixner wrote:
> > On Sun, 14 Jun 2009, Benjamin S. wrote:
> > 
> > > On Sun, 14 Jun 2009 16:45:10 +0200 (CEST)
> > > Thomas Gleixner <[e-mail]> wrote:
> > > 
> > > > can you please test the patch below.
> > > 
> > > It works. 
> > 
> > I queue it up. Thanks,
> 
> Make sure to add a tag to get it sent to the stable tree too please :)

Already done :)

	tglx
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Johannes Stezenbach June 15, 2009, 1:12 p.m. UTC | #5

On Sun, Jun 14, 2009 at 05:03:34PM +0200, Benjamin S. wrote:
> On Sun, 14 Jun 2009 16:45:10 +0200 (CEST)
> Thomas Gleixner <[e-mail]> wrote:
> 
> > can you please test the patch below.
> 
> It works. 

I can report that it works for me, too.

Thank you for fixing this while I was away.


Johannes
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 81408b9..dedc2bd 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -510,7 +510,8 @@  static int hpet_setup_irq(struct hpet_dev *dev)
 {
 
 	if (request_irq(dev->irq, hpet_interrupt_handler,
-			IRQF_DISABLED|IRQF_NOBALANCING, dev->name, dev))
+			IRQF_TIMER | IRQF_DISABLED | IRQF_NOBALANCING,
+			dev->name, dev))
 		return -1;
 
 	disable_irq(dev->irq);