ahc_search_qinfo->ahc_search_qinfifo

ULTRAENB->FAST20

Add a missing ahc_run_done_queue if a BRKADDRINT occurs.  This should never
happen (haven't heard of one happening), but it was still a bug.

Brought the ordered tag sending code up into the tag code to be clearer.

If we decide we should send an ordered tag, only do so for the target that
timed out instead of all targets.

Initialize the STAILQ in ahc_serach__qinfifo.  This was causing a panic
during some recovery operations.

Remove the unused varable maxtarget.

1 files changed, 36 insertions, 31 deletions

diff --git a/sys/i386/scsi/aic7xxx.c b/sys/i386/scsi/aic7xxx.c
index 8c1c85a..62c9de5 100644
--- a/sys/i386/scsi/aic7xxx.c
+++ b/sys/i386/scsi/aic7xxx.c
@@ -255,7 +255,7 @@ restart_sequencer(ahc)
 
 #if defined(__FreeBSD__)
 #define	IS_SCSIBUS_B(ahc, sc_link)	\
-	(((u_int32_t)(sc_link)->fordriver) & SELBUSB)
+	(((u_int32_t)((sc_link)->fordriver) & SELBUSB) != 0)
 #else /* NetBSD/OpenBSD */
 #define	IS_SCSIBUS_B(ahc, sc_link)	\
 	((sc_link)->scsibus == (ahc)->sc_link_b.scsibus)
@@ -278,10 +278,10 @@ static int	ahc_poll __P((struct ahc_softc *ahc, int wait));
 static void	ahc_print_scb __P((struct scb *scb));
 #endif
 static u_int8_t ahc_find_scb __P((struct ahc_softc *ahc, struct scb *scb));
-static int	ahc_search_qinfo __P((struct ahc_softc *ahc, int target,
-				      char channel, u_int8_t tag,
-				      u_int32_t flags, u_int32_t xs_error,
-				      int requeue));
+static int	ahc_search_qinfifo __P((struct ahc_softc *ahc, int target,
+					char channel, u_int8_t tag,
+					u_int32_t flags, u_int32_t xs_error,
+					int requeue));
 static int	ahc_reset_channel __P((struct ahc_softc *ahc, char channel,
 				       u_int32_t xs_error, int initiate_reset));
 static int	ahc_reset_device __P((struct ahc_softc *ahc, int target,
@@ -583,10 +583,10 @@ ahc_scsirate(ahc, scsirate, period, offset, channel, target )
 	sxfrctl0 = ahc_inb(ahc, SXFRCTL0);
 	if (*scsirate != 0 && ahc_syncrates[i].sxfr & ULTRA_SXFR) {
 		ultra_enb |= 0x01 << (target & 0x07);
-		sxfrctl0 |= ULTRAEN;
+		sxfrctl0 |= FAST20;
 	} else {
 		ultra_enb &= ~(0x01 << (target & 0x07));
-		sxfrctl0 &= ~ULTRAEN;
+		sxfrctl0 &= ~FAST20;
 	}
 	ahc_outb(ahc, ultra_enb_addr, ultra_enb);
 	ahc_outb(ahc, SXFRCTL0, sxfrctl0);
@@ -767,6 +767,7 @@ ahc_intr(arg)
 
 		ahc_reset_device(ahc, ALL_TARGETS, ALL_CHANNELS, SCB_LIST_NULL,
 				 XS_DRIVER_STUFFUP);
+		ahc_run_done_queue(ahc);
         }
 	if (intstat & SEQINT)
 		ahc_handle_seqint(ahc, intstat);
@@ -1548,8 +1549,8 @@ ahc_handle_scsiint(ahc, intstat)
 		}
 		ahc_outb(ahc, SIMODE1, ahc_inb(ahc, SIMODE1) & ~ENBUSFREE);
 		ahc_outb(ahc, CLRSINT1, CLRBUSFREE);
-		ahc_outb(ahc, CLRINT, CLRSCSIINT);
 		restart_sequencer(ahc);
+		ahc_outb(ahc, CLRINT, CLRSCSIINT);
 	} else if (scb == NULL) {
 		printf("%s: ahc_intr - referenced scb not "
 		       "valid during scsiint 0x%x scb(%d)\n",
@@ -1947,7 +1948,7 @@ ahc_init(ahc)
 					|ENSTIMER|ACTNEGEN);
 		ahc_outb(ahc, SIMODE1, ENSELTIMO|ENSCSIRST|ENSCSIPERR);
 		if (ahc->type & AHC_ULTRA)
-			ahc_outb(ahc, SXFRCTL0, DFON|SPIOEN|ULTRAEN);
+			ahc_outb(ahc, SXFRCTL0, DFON|SPIOEN|FAST20);
 		else
 			ahc_outb(ahc, SXFRCTL0, DFON|SPIOEN);
 
@@ -1973,7 +1974,7 @@ ahc_init(ahc)
 				|ENSTIMER|ACTNEGEN);
 	ahc_outb(ahc, SIMODE1, ENSELTIMO|ENSCSIRST|ENSCSIPERR);
 	if (ahc->type & AHC_ULTRA)
-		ahc_outb(ahc, SXFRCTL0, DFON|SPIOEN|ULTRAEN);
+		ahc_outb(ahc, SXFRCTL0, DFON|SPIOEN|FAST20);
 	else
 		ahc_outb(ahc, SXFRCTL0, DFON|SPIOEN);
 
@@ -2284,8 +2285,14 @@ ahc_scsi_cmd(xs)
 		hscb->control |= DISCENB;
 		if (ahc->tagenable & mask)
 			hscb->control |= TAG_ENB;
+		if (ahc->orderedtag & mask) {
+			/* XXX this should be handled by the upper SCSI layer */
+			printf("Ordered Tag sent\n");
+			hscb->control |= MSG_ORDERED_Q_TAG;
+			ahc->orderedtag &= ~mask;
+		}
 	}
-	
+
 	if (flags & SCSI_RESET) {
 		scb->flags |= SCB_DEVICE_RESET|SCB_IMMED;
 		hscb->control |= MK_MESSAGE;		
@@ -2297,11 +2304,6 @@ ahc_scsi_cmd(xs)
 		ahc->sdtrpending |= mask;
 		hscb->control |= MK_MESSAGE;		
 		scb->flags |= SCB_MSGOUT_SDTR;
-	} else if (ahc->orderedtag & mask) {
-		/* XXX this should be handled by the upper SCSI layer */
-		printf("Ordered Tag sent\n");
-		hscb->control |= MSG_ORDERED_Q_TAG;
-		ahc->orderedtag &= ~mask;
 	}
 
 #if 0
@@ -2792,9 +2794,14 @@ ahc_timeout(arg)
 		 * try sending an ordered tag command
 		 * to the target we come from.
 		 */
+		u_int16_t mask;
+
+		mask = (0x01 << (scb->xs->sc_link->target
+			 	 | (IS_SCSIBUS_B(ahc, scb->xs->sc_link) ?
+				    SELBUSB : 0)));
 		scb->flags |= SCB_SENTORDEREDTAG;
-		ahc->orderedtag |= 0xFF;
-		timeout(ahc_timeout, (caddr_t)scb, (5 * hz));
+		ahc->orderedtag |= mask;
+		timeout(ahc_timeout, (caddr_t)scb, (1 * hz));
 		unpause_sequencer(ahc, /*unpause_always*/TRUE);
 		printf("Ordered Tag queued\n");
 	} else {
@@ -2879,11 +2886,11 @@ ahc_timeout(arg)
 
 					target = scb->xs->sc_link->target;
 					ahc_unbusy_target(ahc, target, channel);
-					ahc_search_qinfo(ahc, target,
-							 channel,
-							 SCB_LIST_NULL,
-							 0, 0,
-							 /*requeue*/TRUE);
+					ahc_search_qinfifo(ahc, target,
+							   channel,
+							   SCB_LIST_NULL,
+							   0, 0,
+							   /*requeue*/TRUE);
 				}
 				STAILQ_INSERT_HEAD(&ahc->waiting_scbs, scb,
 						   links);
@@ -2930,7 +2937,7 @@ ahc_find_scb(ahc, scb)
 }
 
 static int
-ahc_search_qinfo(ahc, target, channel, tag, flags, xs_error, requeue)
+ahc_search_qinfifo(ahc, target, channel, tag, flags, xs_error, requeue)
 	struct	  ahc_softc *ahc;
 	int	  target;
 	char	  channel;
@@ -2940,13 +2947,14 @@ ahc_search_qinfo(ahc, target, channel, tag, flags, xs_error, requeue)
 	int	  requeue;
 {
 	u_int8_t saved_queue[AHC_SCB_MAX];
-	u_int8_t queued = ahc_inb(ahc, QINCNT) & ahc->qcntmask;
+	int	 queued = ahc_inb(ahc, QINCNT) & ahc->qcntmask;
 	int	 i;
 	int	 found;
 	struct	 scb *scbp;
 	STAILQ_HEAD(, scb) removed_scbs;
 
 	found = 0;
+	STAILQ_INIT(&removed_scbs);
 	for (i = 0; i < (queued - found); i++) {
 		saved_queue[i] = ahc_inb(ahc, QINFIFO);
 		scbp = ahc->scb_data->scbarray[saved_queue[i]];
@@ -3003,9 +3011,9 @@ ahc_reset_device(ahc, target, channel, tag, xs_error)
 	/*
 	 * Remove any entries from the Queue-In FIFO.
 	 */
-	found = ahc_search_qinfo(ahc, target, channel, tag,
-				 SCB_ABORTED|SCB_QUEUED_FOR_DONE, xs_error,
-				 /*requeue*/FALSE);
+	found = ahc_search_qinfifo(ahc, target, channel, tag,
+				   SCB_ABORTED|SCB_QUEUED_FOR_DONE, xs_error,
+				   /*requeue*/FALSE);
 
 	/*
 	 * Search waiting for selection list.
@@ -3275,12 +3283,10 @@ ahc_reset_channel(ahc, channel, xs_error, initiate_reset)
 	u_int32_t offset, offset_max;
 	int	  found;
 	int	  target;
-	int	  maxtarget;
 	u_int8_t  sblkctl;
 	char	  cur_channel;
 
 	pause_sequencer(ahc);
-	maxtarget = 8;
 	/*
 	 * Clean up all the state information for the
 	 * pending transactions on this bus.
@@ -3297,7 +3303,6 @@ ahc_reset_channel(ahc, channel, xs_error, initiate_reset)
 		ahc->needwdtr = ahc->needwdtr_orig;
 		ahc->sdtrpending = 0;
 		ahc->wdtrpending = 0;
-		maxtarget = 16;
 		offset = TARG_SCRATCH;
 		offset_max = TARG_SCRATCH + 16;
 	} else {