diff options
| author | Jacob Pan <jacob.jun.pan@linux.intel.com> | 2011-01-13 16:06:44 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-01-14 11:53:44 -0800 |
| commit | 6550904ddbc3c286798a87edf95eeebcc62bc58a (patch) | |
| tree | a0c41cbc15bdf725d456c63b8151882b5138bb88 /arch/x86 | |
| parent | 62627bec8a601c5679bf3d20a2096a1206d61b71 (diff) | |
| download | op-kernel-dev-6550904ddbc3c286798a87edf95eeebcc62bc58a.zip op-kernel-dev-6550904ddbc3c286798a87edf95eeebcc62bc58a.tar.gz | |
x86, mrst: Set correct APB timer IRQ affinity for secondary cpu
Offlining the secondary CPU causes the timer irq affinity to be set to
CPU 0. When the secondary CPU is back online again, the wrong irq
affinity will be used.
This patch ensures secondary per CPU timer always has the correct
IRQ affinity when enabled.
Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
LKML-Reference: <1294963604-18111-1-git-send-email-jacob.jun.pan@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: <stable@kernel.org> 2.6.37
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/apb_timer.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c index 7c9ab59..51ef31a 100644 --- a/arch/x86/kernel/apb_timer.c +++ b/arch/x86/kernel/apb_timer.c @@ -313,14 +313,16 @@ static void apbt_setup_irq(struct apbt_dev *adev) if (adev->irq == 0) return; + irq_modify_status(adev->irq, 0, IRQ_MOVE_PCNTXT); + irq_set_affinity(adev->irq, cpumask_of(adev->cpu)); + /* APB timer irqs are set up as mp_irqs, timer is edge type */ + __set_irq_handler(adev->irq, handle_edge_irq, 0, "edge"); + if (system_state == SYSTEM_BOOTING) { - irq_modify_status(adev->irq, 0, IRQ_MOVE_PCNTXT); - irq_set_affinity(adev->irq, cpumask_of(adev->cpu)); - /* APB timer irqs are set up as mp_irqs, timer is edge type */ - __set_irq_handler(adev->irq, handle_edge_irq, 0, "edge"); if (request_irq(adev->irq, apbt_interrupt_handler, - IRQF_TIMER | IRQF_DISABLED | IRQF_NOBALANCING, - adev->name, adev)) { + IRQF_TIMER | IRQF_DISABLED | + IRQF_NOBALANCING, + adev->name, adev)) { printk(KERN_ERR "Failed request IRQ for APBT%d\n", adev->num); } |
