diff options
author | John Keller <jpk@sgi.com> | 2008-12-08 12:44:11 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-12-09 13:57:18 -0500 |
commit | ff740fb02146c83d96def1b897ed232b4e0fbcfd (patch) | |
tree | c4f956781a660d4a16114d899fa0f4a2bb08a5c6 /arch/ia64/sn | |
parent | 3c0db899bff2acbf1b36c65763de4d0133910104 (diff) |
[IA64] SN: prevent IRQ retargetting in request_irq()
With the introduction of the generic affinity autoselector,
irq_select_affinity(), IRQs are now being retargetted,
using a default mask, via the request_irq() path.
This results in all IRQs targetted at CPU 0.
SN Altix assigns affinity in the SN PROM, and does not
expect that to be changed as part of request_irq().
Set the IRQ_AFFINITY_SET flag to prevent
request_irq() from resetting affinity.
Signed-off-by: John Keller <jpk@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/sn')
-rw-r--r-- | arch/ia64/sn/kernel/irq.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c index 96c31b4180c3..0c66dbdd1d72 100644 --- a/arch/ia64/sn/kernel/irq.c +++ b/arch/ia64/sn/kernel/irq.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * License. See the file "COPYING" in the main directory of this archive | 5 | * License. See the file "COPYING" in the main directory of this archive |
6 | * for more details. | 6 | * for more details. |
7 | * | 7 | * |
8 | * Copyright (c) 2000-2007 Silicon Graphics, Inc. All Rights Reserved. | 8 | * Copyright (c) 2000-2008 Silicon Graphics, Inc. All Rights Reserved. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
@@ -375,6 +375,7 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info) | |||
375 | int cpu = nasid_slice_to_cpuid(nasid, slice); | 375 | int cpu = nasid_slice_to_cpuid(nasid, slice); |
376 | #ifdef CONFIG_SMP | 376 | #ifdef CONFIG_SMP |
377 | int cpuphys; | 377 | int cpuphys; |
378 | irq_desc_t *desc; | ||
378 | #endif | 379 | #endif |
379 | 380 | ||
380 | pci_dev_get(pci_dev); | 381 | pci_dev_get(pci_dev); |
@@ -391,6 +392,12 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info) | |||
391 | #ifdef CONFIG_SMP | 392 | #ifdef CONFIG_SMP |
392 | cpuphys = cpu_physical_id(cpu); | 393 | cpuphys = cpu_physical_id(cpu); |
393 | set_irq_affinity_info(sn_irq_info->irq_irq, cpuphys, 0); | 394 | set_irq_affinity_info(sn_irq_info->irq_irq, cpuphys, 0); |
395 | desc = irq_to_desc(sn_irq_info->irq_irq); | ||
396 | /* | ||
397 | * Affinity was set by the PROM, prevent it from | ||
398 | * being reset by the request_irq() path. | ||
399 | */ | ||
400 | desc->status |= IRQ_AFFINITY_SET; | ||
394 | #endif | 401 | #endif |
395 | } | 402 | } |
396 | 403 | ||