From owner-svn-src-user@FreeBSD.ORG  Mon Oct 25 03:45:27 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A45C1065670;
	Mon, 25 Oct 2010 03:45:27 +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 7858F8FC12;
	Mon, 25 Oct 2010 03:45:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9P3jRnM049766;
	Mon, 25 Oct 2010 03:45:27 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9P3jR1d049764;
	Mon, 25 Oct 2010 03:45:27 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201010250345.o9P3jR1d049764@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 25 Oct 2010 03:45:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214314 - user/nwhitehorn/ps3/powerpc/ps3
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Oct 2010 03:45:27 -0000

Author: nwhitehorn
Date: Mon Oct 25 03:45:27 2010
New Revision: 214314
URL: http://svn.freebsd.org/changeset/base/214314

Log:
  Set the correct DMA region flags for USB devices. This makes USB work (and
  so local consoles as well).
  
  Obtained from:	NetBSD

Modified:
  user/nwhitehorn/ps3/powerpc/ps3/ps3bus.c

Modified: user/nwhitehorn/ps3/powerpc/ps3/ps3bus.c
==============================================================================
--- user/nwhitehorn/ps3/powerpc/ps3/ps3bus.c	Mon Oct 25 03:21:40 2010	(r214313)
+++ user/nwhitehorn/ps3/powerpc/ps3/ps3bus.c	Mon Oct 25 03:45:27 2010	(r214314)
@@ -471,7 +471,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;
+	int i, err, flags;
 
 	mtx_lock(&dinfo->iommu_mtx);
 	if (dinfo->dma_tag != NULL) {
@@ -479,10 +479,15 @@ ps3bus_get_dma_tag(device_t dev, device_
 		return (dinfo->dma_tag);
 	}
 
+	flags = 0; /* 32-bit mode */
+	if (dinfo->bustype == PS3_BUSTYPE_SYSBUS &&
+	    dinfo->devtype == PS3_DEVTYPE_USB)
+		flags = 2; /* 8-bit mode */
+
 	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) */,
-		    0 /* 32-bit transfers */, &dinfo->dma_base[i]);
+		    sc->regions[i].mr_size, 24 /* log_2(16 MB) */, flags,
+		    &dinfo->dma_base[i]);
 		if (err != 0) {
 			device_printf(child,
 			    "could not allocate DMA region %d: %d\n", i, err);