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

Commit 970def65 authored by Daniel Hellstrom's avatar Daniel Hellstrom Committed by David S. Miller
Browse files

sparc32,leon: don't rely on bootloader to mask IRQs 



Signed-off-by: default avatarDaniel Hellstrom <daniel@gaisler.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 01dae0f0

arch/sparc/kernel/leon_kernel.c

+3 −0
Original line number Diff line number Diff line
@@ -345,6 +345,9 @@ void __init leon_init_timers(irq_handler_t counter_fn) 
	icsel = (icsel >> ((7 - (boot_cpu_id&0x7)) * 4)) & 0xf;

	leon3_irqctrl_regs += icsel;



	/* Mask all IRQs on boot-cpu IRQ controller */

	LEON3_BYPASS_STORE_PA(&leon3_irqctrl_regs->mask[boot_cpu_id], 0);



	/* Probe extended IRQ controller */

	eirq = (LEON3_BYPASS_LOAD_PA(&leon3_irqctrl_regs->mpstatus)

		>> 16) & 0xf;

arch/sparc/kernel/leon_smp.c

+4 −0
Original line number Diff line number Diff line
@@ -217,6 +217,10 @@ int __cpuinit leon_boot_one_cpu(int i) 
	       (unsigned int)&leon3_irqctrl_regs->mpstatus);

	local_flush_cache_all();



	/* Make sure all IRQs are of from the start for this new CPU */

	LEON_BYPASS_STORE_PA(&leon3_irqctrl_regs->mask[i], 0);



	/* Wake one CPU */

	LEON_BYPASS_STORE_PA(&(leon3_irqctrl_regs->mpstatus), 1 << i);



	/* wheee... it's going... */