Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff740fb0 authored by John Keller's avatar John Keller Committed by Tony Luck
Browse files

[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: default avatarJohn Keller <jpk@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 3c0db899

arch/ia64/sn/kernel/irq.c

+8 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (c) 2000-2007 Silicon Graphics, Inc.  All Rights Reserved.

 * Copyright (c) 2000-2008 Silicon Graphics, Inc.  All Rights Reserved.

 */



#include <linux/irq.h>
@@ -375,6 +375,7 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info) 
	int cpu = nasid_slice_to_cpuid(nasid, slice);

#ifdef CONFIG_SMP

	int cpuphys;

	irq_desc_t *desc;

#endif



	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) 
#ifdef CONFIG_SMP

	cpuphys = cpu_physical_id(cpu);

	set_irq_affinity_info(sn_irq_info->irq_irq, cpuphys, 0);

	desc = irq_to_desc(sn_irq_info->irq_irq);

	/*

	 * Affinity was set by the PROM, prevent it from

	 * being reset by the request_irq() path.

	 */

	desc->status |= IRQ_AFFINITY_SET;

#endif

}