Commit ac61d143 authored by Russell King's avatar Russell King
Browse files

ARM: GIC: move enablement of PPI interrupts to gic.c 



Avoid adding nasty genirq-specific code to local timers to enable PPI
interrupts.  Instead, provide a gic function to do this.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7627dc80

arch/arm/common/gic.c

+10 −0
Original line number Diff line number Diff line
@@ -331,6 +331,16 @@ void __cpuinit gic_secondary_init(unsigned int gic_nr) 
	gic_cpu_init(&gic_data[gic_nr]);

}



void __cpuinit gic_enable_ppi(unsigned int irq)

{

	unsigned long flags;



	local_irq_save(flags);

	irq_to_desc(irq)->status |= IRQ_NOPROBE;

	gic_unmask_irq(irq);

	local_irq_restore(flags);

}



#ifdef CONFIG_SMP

void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)

{

arch/arm/include/asm/hardware/gic.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ void gic_init(unsigned int, unsigned int, void __iomem *, void __iomem *); 
void gic_secondary_init(unsigned int);

void gic_cascade_irq(unsigned int gic_nr, unsigned int irq);

void gic_raise_softirq(const struct cpumask *mask, unsigned int irq);

void gic_enable_ppi(unsigned int);

#endif



#endif

arch/arm/kernel/smp_twd.c

+1 −6
Original line number Diff line number Diff line
@@ -127,8 +127,6 @@ static void __cpuinit twd_calibrate_rate(void) 
 */

void __cpuinit twd_timer_setup(struct clock_event_device *clk)

{

	unsigned long flags;



	twd_calibrate_rate();



	clk->name = "local_timer";
@@ -143,10 +141,7 @@ void __cpuinit twd_timer_setup(struct clock_event_device *clk) 
	clk->min_delta_ns = clockevent_delta2ns(0xf, clk);



	/* Make sure our local interrupt controller has this enabled */

	local_irq_save(flags);

	irq_to_desc(clk->irq)->status |= IRQ_NOPROBE;

	get_irq_chip(clk->irq)->unmask(clk->irq);

	local_irq_restore(flags);

	gic_enable_ppi(clk->irq);



	clockevents_register_device(clk);

}