From owner-svn-src-all@FreeBSD.ORG  Thu Jun 23 04:06:33 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A21821065672;
	Thu, 23 Jun 2011 04:06:33 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 594588FC18;
	Thu, 23 Jun 2011 04:06:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5N46Xm8082196;
	Thu, 23 Jun 2011 04:06:33 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5N46XFC082194;
	Thu, 23 Jun 2011 04:06:33 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201106230406.p5N46XFC082194@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 23 Jun 2011 04:06:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223462 - head/sys/powerpc/ps3
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2011 04:06:33 -0000

Author: nwhitehorn
Date: Thu Jun 23 04:06:33 2011
New Revision: 223462
URL: http://svn.freebsd.org/changeset/base/223462

Log:
  Use 4 KB pages for storage bus devices, which seems to be what the HV uses
  internally.

Modified:
  head/sys/powerpc/ps3/ps3bus.c

Modified: head/sys/powerpc/ps3/ps3bus.c
==============================================================================
--- head/sys/powerpc/ps3/ps3bus.c	Thu Jun 23 03:37:25 2011	(r223461)
+++ head/sys/powerpc/ps3/ps3bus.c	Thu Jun 23 04:06:33 2011	(r223462)
@@ -629,7 +629,7 @@ ps3bus_get_dma_tag(device_t dev, device_
 {
 	struct ps3bus_devinfo *dinfo = device_get_ivars(child);
 	struct ps3bus_softc *sc = device_get_softc(dev);
-	int i, err, flags;
+	int i, err, flags, pagesize;
 
 	if (dinfo->bustype != PS3_BUSTYPE_SYSBUS &&
 	    dinfo->bustype != PS3_BUSTYPE_STORAGE)
@@ -646,9 +646,13 @@ ps3bus_get_dma_tag(device_t dev, device_
 	    dinfo->devtype == PS3_DEVTYPE_USB)
 		flags = 2; /* 8-bit mode */
 
+	pagesize = 24; /* log_2(16 MB) */
+	if (dinfo->bustype == PS3_BUSTYPE_STORAGE)
+		pagesize = 12; /* 4 KB */
+
 	for (i = 0; i < sc->rcount; i++) {
 		err = lv1_allocate_device_dma_region(dinfo->bus, dinfo->dev,
-		    sc->regions[i].mr_size, 24 /* log_2(16 MB) */, flags,
+		    sc->regions[i].mr_size, pagesize, flags,
 		    &dinfo->dma_base[i]);
 		if (err != 0) {
 			device_printf(child,