From owner-p4-projects@FreeBSD.ORG  Thu Oct 23 14:23:52 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D4B42106567C; Thu, 23 Oct 2008 14:23:52 +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 8F6461065673
	for <perforce@freebsd.org>; Thu, 23 Oct 2008 14:23:52 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E0398FC28
	for <perforce@freebsd.org>; Thu, 23 Oct 2008 14:23:52 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9NENqIb024693
	for <perforce@freebsd.org>; Thu, 23 Oct 2008 14:23:52 GMT
	(envelope-from nwhitehorn@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NENq4A024691
	for perforce@freebsd.org; Thu, 23 Oct 2008 14:23:52 GMT
	(envelope-from nwhitehorn@freebsd.org)
Date: Thu, 23 Oct 2008 14:23:52 GMT
Message-Id: <200810231423.m9NENq4A024691@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	nwhitehorn@freebsd.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 151806 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Thu, 23 Oct 2008 14:23:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=151806

Change 151806 by nwhitehorn@nwhitehorn_trantor on 2008/10/23 14:23:37

	Mambodisk supports 4K transfers -- let it use them.

Affected files ...

.. //depot/projects/ppc-g5/sys/powerpc/mambo/mambodisk.c#2 edit

Differences ...

==== //depot/projects/ppc-g5/sys/powerpc/mambo/mambodisk.c#2 (text+ko) ====

@@ -49,6 +49,7 @@
 	struct proc *p;
 	struct bio_queue_head bio_queue;
 	int running;
+	int maxblocks;
 };
 
 #define MAMBO_DISK_READ		116
@@ -116,8 +117,10 @@
 	d->d_drv1 = sc;
 	d->d_maxsize = MAXPHYS;		/* Maybe ask bridge? */
 
-	d->d_sectorsize = mambocall(MAMBO_DISK_INFO,MAMBO_INFO_BLKSZ,d->d_unit)
-	    / 8; /* Mambo gives an answer 8 times too large, for fun */
+	d->d_sectorsize = 512;
+	sc->maxblocks = mambocall(MAMBO_DISK_INFO,MAMBO_INFO_BLKSZ,d->d_unit)
+	    / 512;
+
 	d->d_unit = device_get_unit(dev);
 	d->d_mediasize = mambocall(MAMBO_DISK_INFO,MAMBO_INFO_DEVSZ,d->d_unit)
 	    * 1024; /* Mambo gives size in KB */
@@ -221,7 +224,10 @@
 			char *vaddr = bp->bio_data + 
 			    (block - bp->bio_pblkno) * sz;
 
-			numblocks = 1;
+			numblocks = end - block;
+			if (numblocks > sc->maxblocks)
+				numblocks = sc->maxblocks;
+
 			if (bp->bio_cmd == BIO_READ) {
 				result = mambocall(MAMBO_DISK_READ, vaddr, 
 				    (uint32_t)block, (numblocks << 16) | unit);