From owner-p4-projects@FreeBSD.ORG  Sat Dec  5 19:21:31 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8F3B51065676; Sat,  5 Dec 2009 19:21:31 +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 53B09106566B
	for <perforce@freebsd.org>; Sat,  5 Dec 2009 19:21:31 +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 4175B8FC17
	for <perforce@freebsd.org>; Sat,  5 Dec 2009 19:21:31 +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 nB5JLVD1066829
	for <perforce@freebsd.org>; Sat, 5 Dec 2009 19:21:31 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB5JLVfW066827
	for perforce@freebsd.org; Sat, 5 Dec 2009 19:21:31 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 5 Dec 2009 19:21:31 GMT
Message-Id: <200912051921.nB5JLVfW066827@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 171420 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: Sat, 05 Dec 2009 19:21:31 -0000

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

Change 171420 by mav@mav_mavtest on 2009/12/05 19:20:44

	Improve PIO transaction size negotiation.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#42 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#42 (text+ko) ====

@@ -153,7 +153,10 @@
 #ifdef ATA_CAM
 	for (i = 0; i < 16; i++) {
 		ch->user[i].mode = 0;
-		ch->user[i].bytecount = 8192;
+		if (ch->flags & ATA_SATA)
+			ch->user[i].bytecount = 8192;
+		else
+			ch->user[i].bytecount = MAXPHYS;
 		ch->curr[i] = ch->user[i];
 	}
 #endif
@@ -1494,7 +1497,9 @@
 					d->mode = cts->xport_specific.ata.mode;
 			}
 			if (cts->xport_specific.ata.valid & CTS_ATA_VALID_BYTECOUNT)
-				d->bytecount = min(8192, cts->xport_specific.ata.bytecount);
+				d->bytecount = cts->xport_specific.ata.bytecount;
+			if (ch->flags & ATA_SATA)
+				d->bytecount = min(8192, d->bytecount);
 		}
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);