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

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

sparc32, sun4m: bugfix in SMP IPI traphandler 



Three new IPIs were introduced by commit
ecbc42b7 ("sparc32, sun4m:
Implemented SMP IPIs support for SUN4M machines"), the
old handler was already prepared for IPIs but handled only
IRQ14 and IRQ13, this patch adds support for the new IPI at
IRQ12.

The IPI trap handler looks at the mask rather than the
pending IRQ/IPI, this bug may have masked the problem
above, introduced by the same commit.

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

arch/sparc/kernel/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ real_irq_entry: 
#ifdef CONFIG_SMP

	.globl	patchme_maybe_smp_msg



	cmp	%l7, 12

	cmp	%l7, 11

patchme_maybe_smp_msg:

	bgu	maybe_smp4m_msg

	 nop
@@ -293,7 +293,7 @@ maybe_smp4m_msg: 
	WRITE_PAUSE

	wr	%l4, PSR_ET, %psr

	WRITE_PAUSE

	sll	%o2, 28, %o2		! shift for simpler checks below

	sll	%o3, 28, %o2		! shift for simpler checks below

maybe_smp4m_msg_check_single:

	andcc	%o2, 0x1, %g0

	beq,a	maybe_smp4m_msg_check_mask