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

Commit 6ec36b58 authored by Stuart Yoder's avatar Stuart Yoder Committed by Kumar Gala
Browse files

powerpc: make irq_choose_cpu() available to all PIC drivers 



Move irq_choose_cpu() into arch/powerpc/kernel/irq.c so that it can be used
by other PIC drivers.  The function is not MPIC-specific.

Signed-off-by: default avatarStuart Yoder <stuart.yoder@freescale.com>
Signed-off-by: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 47fe819e

arch/powerpc/include/asm/irq.h

+2 −0
Original line number Diff line number Diff line
@@ -330,5 +330,7 @@ extern int call_handle_irq(int irq, void *p1, 
			   struct thread_info *tp, void *func);

extern void do_IRQ(struct pt_regs *regs);



int irq_choose_cpu(const struct cpumask *mask);



#endif /* _ASM_IRQ_H */

#endif /* __KERNEL__ */

arch/powerpc/kernel/irq.c

+35 −0
Original line number Diff line number Diff line
@@ -882,6 +882,41 @@ unsigned int irq_find_mapping(struct irq_host *host, 
}

EXPORT_SYMBOL_GPL(irq_find_mapping);



#ifdef CONFIG_SMP

int irq_choose_cpu(const struct cpumask *mask)

{

	int cpuid;



	if (cpumask_equal(mask, cpu_all_mask)) {

		static int irq_rover;

		static DEFINE_RAW_SPINLOCK(irq_rover_lock);

		unsigned long flags;



		/* Round-robin distribution... */

do_round_robin:

		raw_spin_lock_irqsave(&irq_rover_lock, flags);



		irq_rover = cpumask_next(irq_rover, cpu_online_mask);

		if (irq_rover >= nr_cpu_ids)

			irq_rover = cpumask_first(cpu_online_mask);



		cpuid = irq_rover;



		raw_spin_unlock_irqrestore(&irq_rover_lock, flags);

	} else {

		cpuid = cpumask_first_and(mask, cpu_online_mask);

		if (cpuid >= nr_cpu_ids)

			goto do_round_robin;

	}



	return get_hard_smp_processor_id(cpuid);

}

#else

int irq_choose_cpu(const struct cpumask *mask)

{

	return hard_smp_processor_id();

}

#endif



unsigned int irq_radix_revmap_lookup(struct irq_host *host,

				     irq_hw_number_t hwirq)

arch/powerpc/sysdev/mpic.c

+0 −36
Original line number Diff line number Diff line
@@ -597,42 +597,6 @@ static void __init mpic_scan_ht_pics(struct mpic *mpic) 


#endif /* CONFIG_MPIC_U3_HT_IRQS */



#ifdef CONFIG_SMP

static int irq_choose_cpu(const struct cpumask *mask)

{

	int cpuid;



	if (cpumask_equal(mask, cpu_all_mask)) {

		static int irq_rover = 0;

		static DEFINE_RAW_SPINLOCK(irq_rover_lock);

		unsigned long flags;



		/* Round-robin distribution... */

	do_round_robin:

		raw_spin_lock_irqsave(&irq_rover_lock, flags);



		irq_rover = cpumask_next(irq_rover, cpu_online_mask);

		if (irq_rover >= nr_cpu_ids)

			irq_rover = cpumask_first(cpu_online_mask);



		cpuid = irq_rover;



		raw_spin_unlock_irqrestore(&irq_rover_lock, flags);

	} else {

		cpuid = cpumask_first_and(mask, cpu_online_mask);

		if (cpuid >= nr_cpu_ids)

			goto do_round_robin;

	}



	return get_hard_smp_processor_id(cpuid);

}

#else

static int irq_choose_cpu(const struct cpumask *mask)

{

	return hard_smp_processor_id();

}

#endif



/* Find an mpic associated with a given linux interrupt */

static struct mpic *mpic_find(unsigned int irq)

{