From owner-p4-projects@FreeBSD.ORG  Sun Oct 25 16:02:24 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9699210656D8; Sun, 25 Oct 2009 16:02:24 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 583AC1065670
	for <perforce@freebsd.org>; Sun, 25 Oct 2009 16:02:24 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 21B618FC28
	for <perforce@freebsd.org>; Sun, 25 Oct 2009 16:02:24 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9PG2O6x031467
	for <perforce@freebsd.org>; Sun, 25 Oct 2009 16:02:24 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9PG2O2s031465
	for perforce@freebsd.org; Sun, 25 Oct 2009 16:02:24 GMT
	(envelope-from mav@freebsd.org)
Date: Sun, 25 Oct 2009 16:02:24 GMT
Message-Id: <200910251602.n9PG2O2s031465@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169802 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Oct 2009 16:02:24 -0000

http://p4web.freebsd.org/chv.cgi?CH=169802

Change 169802 by mav@mav_mavtest on 2009/10/25 16:01:26

	Do not forget to release device after ATA_SET_MULTI error.
	Use only lower byte of identify word 47 for max sec/int.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#33 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#33 (text+ko) ====

@@ -645,7 +645,7 @@
 	if (cgd->ident_data.satacapabilities & ATA_SUPPORT_NCQ &&
 	    cgd->ident_data.queue >= 31)
 		softc->flags |= ADA_FLAG_CAN_NCQ;
-	softc->secsperint = max(1, min(cgd->ident_data.sectors_intr, 16));
+	softc->secsperint = max(1, min(cgd->ident_data.sectors_intr & 0xff, 16));
 	softc->state = ADA_STATE_SET_MULTI;
 
 	periph->softc = softc;
@@ -1015,6 +1015,12 @@
 				/* A retry was scheduled, so just return. */
 				return;
 			}
+			if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0)
+				cam_release_devq(done_ccb->ccb_h.path,
+						 /*relsim_flags*/0,
+						 /*reduction*/0,
+						 /*timeout*/0,
+						 /*getcount_only*/0);
 		}
 		softc->state = ADA_STATE_NORMAL;
 		/*