2 files changed, 46 insertions, 38 deletions

diff --git a/sys/sparc64/sparc64/exception.S b/sys/sparc64/sparc64/exception.S
index 830a7244ab0d..dd4a6f7882df 100644
--- a/sys/sparc64/sparc64/exception.S
+++ b/sys/sparc64/sparc64/exception.S
@@ -2324,6 +2324,19 @@ ENTRY(tl0_intr)
 	stx	%i6, [%sp + SPOFF + CCFSZ + TF_O6]
 	stx	%i7, [%sp + SPOFF + CCFSZ + TF_O7]
 
+	call	critical_enter
+	 nop
+
+	SET(intr_handlers, %l1, %l0)
+	sllx	%l3, IH_SHIFT, %l1
+	ldx	[%l0 + %l1], %l1
+	KASSERT(%l1, "tl0_intr: ih null")
+	call	%l1
+	 add	%sp, CCFSZ + SPOFF, %o0
+
+	call	critical_exit
+	 nop
+
 	/* %l3 contains PIL */
 	SET(intrcnt, %l1, %l2)
 	prefetcha [%l2] ASI_N, 1
@@ -2336,23 +2349,10 @@ ENTRY(tl0_intr)
 	inc	%l1
 	stx	%l1, [%l0]
 
-	call	critical_enter
-	 nop
-
 	lduw	[PCPU(CNT) + V_INTR], %l0
 	inc	%l0
 	stw	%l0, [PCPU(CNT) + V_INTR]
 
-	SET(intr_handlers, %l1, %l0)
-	sllx	%l3, IH_SHIFT, %l1
-	ldx	[%l0 + %l1], %l1
-	KASSERT(%l1, "tl0_intr: ih null")
-	call	%l1
-	 add	%sp, CCFSZ + SPOFF, %o0
-
-	call	critical_exit
-	 nop
-
 	ba,a	%xcc, tl0_ret
 	 nop
 END(tl0_intr)
@@ -2841,6 +2841,19 @@ ENTRY(tl1_intr)
 	mov	%l5, PCPU_REG
 	wrpr	%g0, PSTATE_KERNEL, %pstate
 
+	call	critical_enter
+	 nop
+
+	SET(intr_handlers, %l5, %l4)
+	sllx	%l7, IH_SHIFT, %l5
+	ldx	[%l4 + %l5], %l5
+	KASSERT(%l5, "tl1_intr: ih null")
+	call	%l5
+	 add	%sp, CCFSZ + SPOFF, %o0
+
+	call	critical_exit
+	 nop
+
 	/* %l7 contains PIL */
 	SET(intrcnt, %l5, %l4)
 	prefetcha [%l4] ASI_N, 1
@@ -2853,23 +2866,10 @@ ENTRY(tl1_intr)
 	inc	%l5
 	stx	%l5, [%l4]
 
-	call	critical_enter
-	 nop
-
 	lduw	[PCPU(CNT) + V_INTR], %l4
 	inc	%l4
 	stw	%l4, [PCPU(CNT) + V_INTR]
 
-	SET(intr_handlers, %l5, %l4)
-	sllx	%l7, IH_SHIFT, %l5
-	ldx	[%l4 + %l5], %l5
-	KASSERT(%l5, "tl1_intr: ih null")
-	call	%l5
-	 add	%sp, CCFSZ + SPOFF, %o0
-
-	call	critical_exit
-	 nop
-
 	ldx	[%sp + SPOFF + CCFSZ + TF_Y], %l4
 
 	ldx	[%sp + SPOFF + CCFSZ + TF_G1], %g1
diff --git a/sys/sparc64/sparc64/interrupt.S b/sys/sparc64/sparc64/interrupt.S
index 6a4318125ce1..9f47557c7604 100644
--- a/sys/sparc64/sparc64/interrupt.S
+++ b/sys/sparc64/sparc64/interrupt.S
@@ -152,16 +152,22 @@ END(intr_vector)
 ENTRY(intr_fast)
 	save	%sp, -CCFSZ, %sp
 
-1:	ldx	[PCPU(IRHEAD)], %l0
+	/*
+	 * Disable interrupts while we fiddle with the interrupt request lists
+	 * as interrupts at levels higher than what got us here aren't blocked.
+	 */
+1:	wrpr	%g0, PSTATE_NORMAL, %pstate
+
+	ldx	[PCPU(IRHEAD)], %l0
 	brnz,a,pt %l0, 2f
 	 nop
 
+	wrpr	%g0, PSTATE_KERNEL, %pstate
+
 	ret
 	 restore
 
-2:	wrpr	%g0, PSTATE_NORMAL, %pstate
-
-	ldx	[%l0 + IR_NEXT], %l1
+2:	ldx	[%l0 + IR_NEXT], %l1
 	brnz,pt	%l1, 3f
 	 stx	%l1, [PCPU(IRHEAD)]
 	PCPU_ADDR(IRHEAD, %l1)
@@ -171,6 +177,16 @@ ENTRY(intr_fast)
 	ldx	[%l0 + IR_ARG], %o1
 	lduw	[%l0 + IR_VEC], %o2
 
+	ldx	[PCPU(IRFREE)], %l1
+	stx	%l1, [%l0 + IR_NEXT]
+	stx	%l0, [PCPU(IRFREE)]
+
+	wrpr	%g0, PSTATE_KERNEL, %pstate
+
+	KASSERT(%o0, "intr_fast: ir_func null")
+	call	%o0
+	 mov	%o1, %o0
+
 	/* intrcnt[intr_countp[%o2]]++ */
 	SET(intrcnt, %l7, %l2)		/* %l2 = intrcnt */
 	prefetcha [%l2] ASI_N, 1
@@ -183,14 +199,6 @@ ENTRY(intr_fast)
 	inc	%l2
 	stx	%l2, [%l7]
 
-	ldx	[PCPU(IRFREE)], %l1
-	stx	%l1, [%l0 + IR_NEXT]
-	stx	%l0, [PCPU(IRFREE)]
-
-	wrpr	%g0, PSTATE_KERNEL, %pstate
-
-	call	%o0
-	 mov	%o1, %o0
 	ba,a	%xcc, 1b
 	 nop
 END(intr_fast)