Go back to the old (icu.s rev.1.7 1993) way of keeping the AST-pending

bit separate from ipending, since this is simpler and/or necessary for
SMP and may even be better for UP.

Reviewed by:	alc, luoqi, tegge

7 files changed, 44 insertions, 87 deletions

diff --git a/sys/i386/isa/apic_ipl.s b/sys/i386/isa/apic_ipl.s
index 9ed8de0..4ba7df1 100644
--- a/sys/i386/isa/apic_ipl.s
+++ b/sys/i386/isa/apic_ipl.s
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apic_ipl.s,v 1.23 1999/04/10 19:22:17 tegge Exp $
+ *	$Id: apic_ipl.s,v 1.24 1999/07/03 06:33:47 alc Exp $
  */
 
 
@@ -138,8 +138,6 @@ splz_unpend:
 
 	ALIGN_TEXT
 splz_swi:
-	cmpl	$SWI_AST,%ecx
-	je	splz_next		/* "can't happen" */
 	pushl	%eax
 	orl	imasks(,%ecx,4),%eax
 	movl	%eax,_cpl
diff --git a/sys/i386/isa/apic_vector.s b/sys/i386/isa/apic_vector.s
index 7acd37c..b99b93a 100644
--- a/sys/i386/isa/apic_vector.s
+++ b/sys/i386/isa/apic_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: apic_vector.s,v 1.40 1999/06/16 03:53:52 tegge Exp $
+ *	$Id: apic_vector.s,v 1.41 1999/07/03 06:33:47 alc Exp $
  */
 
 
@@ -705,8 +705,7 @@ _Xcpuast:
 	movl	_cpl, %eax
 #endif
 	pushl	%eax
-	lock
-	orl	$SWI_AST_PENDING, _ipending
+	movl	$1, _astpending		/* XXX */
 	AVCPL_UNLOCK
 	lock
 	incb	_intr_nesting_level
@@ -976,13 +975,13 @@ _ihandlers:
  *  apic_ipl.s:	splz_unpend
  */
 	.long	_swi_null, swi_net, _swi_null, _swi_null
-	.long	_swi_vm, _swi_null, _softclock, swi_ast
+	.long	_swi_vm, _swi_null, _softclock, _swi_null
 
 imasks:				/* masks for interrupt handlers */
 	.space	NHWI*4		/* padding; HWI masks are elsewhere */
 
 	.long	SWI_TTY_MASK, SWI_NET_MASK, SWI_CAMNET_MASK, SWI_CAMBIO_MASK
-	.long	SWI_VM_MASK, 0, SWI_CLOCK_MASK, SWI_AST_MASK
+	.long	SWI_VM_MASK, 0, SWI_CLOCK_MASK, 0
 
 /* active flag for lazy masking */
 iactive:
diff --git a/sys/i386/isa/atpic_vector.s b/sys/i386/isa/atpic_vector.s
index 453f9d5..cbb8b5e 100644
--- a/sys/i386/isa/atpic_vector.s
+++ b/sys/i386/isa/atpic_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: icu_vector.s,v 1.11 1999/04/28 01:04:13 luoqi Exp $
+ *	$Id: icu_vector.s,v 1.12 1999/05/28 14:08:59 bde Exp $
  */
 
 /*
@@ -211,7 +211,7 @@ _ihandlers:			/* addresses of interrupt handlers */
 	.long	_swi_null, swi_net, _swi_null, _swi_null
 	.long	_swi_vm, _swi_null, _swi_null, _swi_null
 	.long	_swi_null, _swi_null, _swi_null, _swi_null
-	.long	_swi_null, _swi_null, _softclock, swi_ast
+	.long	_swi_null, _swi_null, _softclock, _swi_null
 
 imasks:				/* masks for interrupt handlers */
 	.space	NHWI*4		/* padding; HWI masks are elsewhere */
@@ -219,6 +219,6 @@ imasks:				/* masks for interrupt handlers */
 	.long	SWI_TTY_MASK, SWI_NET_MASK, SWI_CAMNET_MASK, SWI_CAMBIO_MASK
 	.long	SWI_VM_MASK, 0, 0, 0
 	.long	0, 0, 0, 0
-	.long	0, 0, SWI_CLOCK_MASK, SWI_AST_MASK
+	.long	0, 0, SWI_CLOCK_MASK, 0
 
 	.text
diff --git a/sys/i386/isa/icu_ipl.s b/sys/i386/isa/icu_ipl.s
index 4d91725..0f3a3ca 100644
--- a/sys/i386/isa/icu_ipl.s
+++ b/sys/i386/isa/icu_ipl.s
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: icu_ipl.s,v 1.3 1997/09/02 19:40:13 fsmp Exp $
+ *	$Id: icu_ipl.s,v 1.4 1998/08/11 15:08:12 bde Exp $
  */
 
 	.data
@@ -103,8 +103,6 @@ splz_unpend:
 
 	ALIGN_TEXT
 splz_swi:
-	cmpl	$SWI_AST,%ecx
-	je	splz_next		/* "can't happen" */
 	pushl	%eax
 	orl	imasks(,%ecx,4),%eax
 	movl	%eax,_cpl
diff --git a/sys/i386/isa/icu_vector.s b/sys/i386/isa/icu_vector.s
index 453f9d5..cbb8b5e 100644
--- a/sys/i386/isa/icu_vector.s
+++ b/sys/i386/isa/icu_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: icu_vector.s,v 1.11 1999/04/28 01:04:13 luoqi Exp $
+ *	$Id: icu_vector.s,v 1.12 1999/05/28 14:08:59 bde Exp $
  */
 
 /*
@@ -211,7 +211,7 @@ _ihandlers:			/* addresses of interrupt handlers */
 	.long	_swi_null, swi_net, _swi_null, _swi_null
 	.long	_swi_vm, _swi_null, _swi_null, _swi_null
 	.long	_swi_null, _swi_null, _swi_null, _swi_null
-	.long	_swi_null, _swi_null, _softclock, swi_ast
+	.long	_swi_null, _swi_null, _softclock, _swi_null
 
 imasks:				/* masks for interrupt handlers */
 	.space	NHWI*4		/* padding; HWI masks are elsewhere */
@@ -219,6 +219,6 @@ imasks:				/* masks for interrupt handlers */
 	.long	SWI_TTY_MASK, SWI_NET_MASK, SWI_CAMNET_MASK, SWI_CAMBIO_MASK
 	.long	SWI_VM_MASK, 0, 0, 0
 	.long	0, 0, 0, 0
-	.long	0, 0, SWI_CLOCK_MASK, SWI_AST_MASK
+	.long	0, 0, SWI_CLOCK_MASK, 0
 
 	.text
diff --git a/sys/i386/isa/ipl.s b/sys/i386/isa/ipl.s
index 51e8329..ad7eb11 100644
--- a/sys/i386/isa/ipl.s
+++ b/sys/i386/isa/ipl.s
@@ -36,7 +36,7 @@
  *
  *	@(#)ipl.s
  *
- *	$Id: ipl.s,v 1.28 1999/06/01 18:20:15 jlemon Exp $
+ *	$Id: ipl.s,v 1.29 1999/07/03 06:33:48 alc Exp $
  */
 
 
@@ -67,6 +67,8 @@ _softnet_imask:	.long	SWI_NET_MASK
 	.globl	_softtty_imask
 _softtty_imask:	.long	SWI_TTY_MASK
 
+	.globl	_astpending
+_astpending:	.long	0
 
 /* pending interrupts blocked by splxxx() */
 	.globl	_ipending
@@ -143,7 +145,6 @@ doreti_next2:
 #endif
 	andl	_ipending,%ecx		/* set bit = unmasked pending INT */
 	jne	doreti_unpend
-doreti_exit:
 #ifdef SMP
 	TEST_CIL
 #endif
@@ -154,32 +155,19 @@ doreti_exit:
 #endif
 	FAST_ICPL_UNLOCK		/* preserves %eax */
 	MPLOCKED decb _intr_nesting_level
-	MEXITCOUNT
-#ifdef CPL_AND_CML
-	/* XXX CPL_AND_CML needs work */
-#error not ready for vm86
-#endif
+
+	/* Check for ASTs that can be handled now. */
+	cmpb	$0,_astpending
+	je	doreti_exit
+	testb	$SEL_RPL_MASK,TF_CS(%esp)
+	jne	doreti_ast
+	testl	$PSL_VM,TF_EFLAGS(%esp)
+	je	doreti_exit
 	cmpl	$1,_in_vm86call
-	je	1f			/* want cpl == SWI_AST_PENDING */
-	/*
-	 * XXX
-	 * Sometimes when attempting to return to vm86 mode, cpl is not
-	 * being reset to 0, so here we force it to 0 before returning to
-	 * vm86 mode.  doreti_stop is a convenient place to set a breakpoint.
-	 * When the cpl problem is solved, this code can disappear.
-	 */
-	ICPL_LOCK
-	cmpl	$0,_cpl				/* cpl == 0, skip it */
-	je	1f
-	testl	$PSL_VM,TF_EFLAGS(%esp)		/* going to VM86 mode? */
-	jne	doreti_stop
-	testb	$SEL_RPL_MASK,TF_CS(%esp)	/* to user mode? */
-	je	1f
-doreti_stop:
-	movl	$0,_cpl
-	nop
-1:
-	FAST_ICPL_UNLOCK		/* preserves %eax */
+	jne	doreti_ast
+
+doreti_exit:
+	MEXITCOUNT
 
 #ifdef SMP
 #ifdef INTR_SIMPLELOCK
@@ -310,8 +298,8 @@ doreti_swi:
 #endif
 	pushl	%eax
 	/*
-	 * The SWI_AST handler has to run at cpl = SWI_AST_MASK and the
-	 * SWI_CLOCK handler at cpl = SWI_CLOCK_MASK, so we have to restore
+	 * At least the SWI_CLOCK handler has to run at a possibly strictly
+	 * lower cpl, so we have to restore
 	 * all the h/w bits in cpl now and have to worry about stack growth.
 	 * The worst case is currently (30 Jan 1994) 2 SWI handlers nested
 	 * in dying interrupt frames and about 12 HWIs nested in active
@@ -343,15 +331,10 @@ doreti_swi:
 	jmp	doreti_next
 
 	ALIGN_TEXT
-swi_ast:
-	addl	$8,%esp			/* discard raddr & cpl to get trap frame */
-	cmpl	$1,_in_vm86call
-	je	1f			/* stay in kernel mode */
-	testb	$SEL_RPL_MASK,TF_CS(%esp)
-	je	swi_ast_phantom
-swi_ast_user:
+doreti_ast:
+	movl	$0,_astpending
+	sti
 	movl	$T_ASTFLT,TF_TRAPNO(%esp)
-	movb	$0,_intr_nesting_level	/* finish becoming a trap handler */
 	call	_trap
 	subl	%eax,%eax		/* recover cpl|cml */
 #ifdef CPL_AND_CML
@@ -361,33 +344,6 @@ swi_ast_user:
 	jmp	doreti_next
 
 	ALIGN_TEXT
-swi_ast_phantom:
-	/*
-	 * check for ast from vm86 mode.  Placed down here so the jumps do
-	 * not get taken for mainline code.
-	 */
-	testl	$PSL_VM,TF_EFLAGS(%esp)
-	jne	swi_ast_user
-1:
-	/*
-	 * These happen when there is an interrupt in a trap handler before
-	 * ASTs can be masked or in an lcall handler before they can be
-	 * masked or after they are unmasked.  They could be avoided for
-	 * trap entries by using interrupt gates, and for lcall exits by
-	 * using by using cli, but they are unavoidable for lcall entries.
-	 */
-	cli
-	ICPL_LOCK
-	MPLOCKED orl $SWI_AST_PENDING, _ipending
-	/* cpl is unlocked in doreti_exit */
-	subl	%eax,%eax
-#ifdef CPL_AND_CML
-	movl	%eax, _cpl
-#endif
-	jmp	doreti_exit	/* SWI_AST is highest so we must be done */
-
-
-	ALIGN_TEXT
 swi_net:
 	MCOUNT
 	bsfl	_netisr,%eax
diff --git a/sys/i386/isa/ipl_funcs.c b/sys/i386/isa/ipl_funcs.c
index 602ce01..2b7a1c4 100644
--- a/sys/i386/isa/ipl_funcs.c
+++ b/sys/i386/isa/ipl_funcs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ipl_funcs.c,v 1.20 1999/05/09 23:40:29 peter Exp $
+ *	$Id: ipl_funcs.c,v 1.21 1999/06/30 03:39:29 alc Exp $
  */
 
 #include <sys/types.h>
@@ -55,7 +55,6 @@ void setdelayed(void)
 }
 #endif /* !SMP */
 
-DO_SETBITS(setsoftast,   &ipending, SWI_AST_PENDING)
 DO_SETBITS(setsoftcamnet,&ipending, SWI_CAMNET_PENDING)
 DO_SETBITS(setsoftcambio,&ipending, SWI_CAMBIO_PENDING)
 DO_SETBITS(setsoftclock, &ipending, SWI_CLOCK_PENDING)
@@ -106,8 +105,8 @@ GENSPL(splvm, cpl |= net_imask | bio_imask | cam_imask)
 void
 spl0(void)
 {
-	cpl = SWI_AST_MASK;
-	if (ipending & ~SWI_AST_MASK)
+	cpl = 0;
+	if (ipending)
 		splz();
 }
 
@@ -281,6 +280,12 @@ spl0(void)
 	for (;;) {
 		IFCPL_LOCK();
 		POSTCODE_HI(0xc);
+		/*
+		 * XXX SWI_AST_MASK in ipending has moved to 1 in astpending,
+		 * so the following code is dead, but just removing it may
+		 * not be right.
+		 */
+#if 0
 		if (cil & SWI_AST_MASK) {	/* not now */
 			IFCPL_UNLOCK();		/* allow cil to change */
 			SPIN_RESET;
@@ -288,14 +293,15 @@ spl0(void)
 				SPIN_SPL
 			continue;		/* try again */
 		}
+#endif
 		break;
 	}
 #else /* INTR_SPL */
 	IFCPL_LOCK();
 #endif /* INTR_SPL */
 
-	cpl = SWI_AST_MASK;
-	unpend = ipending & ~SWI_AST_MASK;
+	cpl = 0;
+	unpend = ipending;
 	IFCPL_UNLOCK();
 
 	if (unpend && !inside_intr)