From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Gleixner Subject: Re: 2.6.30 enabling cpu1 on resume fails after suspend to memory Date: Sun, 14 Jun 2009 16:45:10 +0200 (CEST) Message-ID: References: <20090614120950.116536fa@pluto-lenny.milky.way> <200906141400.27331.rjw@sisk.pl> <200906141415.16949.rjw@sisk.pl> <20090614143708.32ec250c@pluto-lenny.milky.way> <7E82351C108FA840AB1866AC776AEC4669244187@orsmsx505.amr.corp.intel.com> <7E82351C108FA840AB1866AC776AEC466924418A@orsmsx505.amr.corp.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org To: "Pallipadi, Venkatesh" Cc: "js@sig21.net" , Matthew Wilcox , Linux PCI , LKML , Jesse Barnes , "Benjamin S." , Ingo Molnar , pm list List-Id: linux-pm@vger.kernel.org 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 ------------> 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);