 @@ -1,41 +1,41 @@
-/*	$NetBSD: ata.c,v 1.132.8.28 2017/08/12 22:31:50 jdolecek Exp $	*/
+/*	$NetBSD: ata.c,v 1.132.8.29 2017/08/15 11:21:32 jdolecek Exp $	*/
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.28 2017/08/12 22:31:50 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.29 2017/08/15 11:21:32 jdolecek Exp $");
 #include "opt_ata.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/proc.h>
 #include <sys/kthread.h>
 #include <sys/errno.h>
 @@ -1239,76 +1239,76 @@ ata_exec_xfer(struct ata_channel *chp, s
 /*
  * Start I/O on a controller, for the given channel.
  * The first xfer may be not for our channel if the channel queues
  * are shared.
+ *
  * MUST BE CALLED AT splbio()!
  */
 void
 atastart(struct ata_channel *chp)
+{
 	struct atac_softc *atac = chp->ch_atac;
 	struct ata_queue *chq = chp->ch_queue;
 	struct ata_xfer *xfer, *axfer;
-	bool immediate;
+	bool recovery;
 #ifdef ATA_DEBUG
 	int spl1, spl2;
 	spl1 = splbio();
 	spl2 = splbio();
 	if (spl2 != spl1) {
 		printf("atastart: not at splbio()\n");
 		panic("atastart");
+	}
 	splx(spl2);
 	splx(spl1);
 #endif /* ATA_DEBUG */
 again:
 	mutex_enter(&chp->ch_lock);
 	KASSERT(chq->queue_active <= chq->queue_openings);
 	if (chq->queue_active == chq->queue_openings) {
 		goto out; /* channel completely busy */
+	}
 	/* is there a xfer ? */
 	if ((xfer = TAILQ_FIRST(&chp->ch_queue->queue_xfer)) == NULL)
 		goto out;
-	immediate = ISSET(xfer->c_flags, C_RECOVERY);
+	recovery = ISSET(xfer->c_flags, C_RECOVERY);
 	/* is the queue frozen? */
-	if (__predict_false(!immediate && chq->queue_freeze > 0)) {
+	if (__predict_false(!recovery && chq->queue_freeze > 0)) {
 		if (chq->queue_flags & QF_IDLE_WAIT) {
 			chq->queue_flags &= ~QF_IDLE_WAIT;
 			wakeup(&chq->queue_flags);
+		}
 		goto out; /* queue frozen */
+	}
 	/* all xfers on same queue must belong to the same channel */
 	KASSERT(xfer->c_chp == chp);
 	/*
 	 * Can only take the command if there are no current active
 	 * commands, or if the command is NCQ and the active commands are also
 	 * NCQ. If PM is in use and HBA driver doesn't support/use FIS-based
 	 * switching, can only send commands to single drive.
 	 * Need only check first xfer.
 	 * XXX FIS-based switching - revisit
 	 */
-	if (!immediate && (axfer = TAILQ_FIRST(&chp->ch_queue->active_xfers))) {
+	if (!recovery && (axfer = TAILQ_FIRST(&chp->ch_queue->active_xfers))) {
 		if (!ISSET(xfer->c_flags, C_NCQ) ||
 		    !ISSET(axfer->c_flags, C_NCQ) ||
 		    xfer->c_drive != axfer->c_drive)
 			goto out;
+	}
 	struct ata_drive_datas * const drvp = &chp->ch_drive[xfer->c_drive];
 	/*
 	 * if someone is waiting for the command to be active, wake it up
 	 * and let it process the command
 	 */
 	if (xfer->c_flags & C_WAITACT) {
 @@ -1334,28 +1334,28 @@ again:
 	ata_activate_xfer_locked(chp, xfer);
 	if (atac->atac_cap & ATAC_CAP_NOIRQ)
 		KASSERT(xfer->c_flags & C_POLL);
 	mutex_exit(&chp->ch_lock);
 	/*
 	 * XXX MPSAFE can't keep the lock, xfer->c_start() might call the done
 	 * routine for polled commands.
 	 */
 	xfer->c_start(chp, xfer);
-	/* Queue more commands if possible */
+	/* Queue more commands if possible, but not during recovery */
-	if (chq->queue_active < chq->queue_openings)
+	if (!recovery && chq->queue_active < chq->queue_openings)
 		goto again;
 	return;
 out:
 	mutex_exit(&chp->ch_lock);
+}
 /*
  * Does it's own locking, does not require splbio().
  * flags - whether to block waiting for free xfer
  * openings - limit of openings supported by device, <= 0 means tag not
  *     relevant, and any available xfer can be returned