From owner-svn-src-user@FreeBSD.ORG  Mon Nov 15 18:49:43 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 020981065675;
	Mon, 15 Nov 2010 18:49:43 +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 E54728FC1A;
	Mon, 15 Nov 2010 18:49:42 +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 oAFIng45025254;
	Mon, 15 Nov 2010 18:49:42 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAFInglo025251;
	Mon, 15 Nov 2010 18:49:42 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201011151849.oAFInglo025251@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 15 Nov 2010 18:49:42 +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: r215343 - 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, 15 Nov 2010 18:49:43 -0000

Author: nwhitehorn
Date: Mon Nov 15 18:49:42 2010
New Revision: 215343
URL: http://svn.freebsd.org/changeset/base/215343

Log:
  Storage bus devices on the PS3 do not appear to require (or allow) use
  of the I/O MMU.

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

Modified: user/nwhitehorn/ps3/powerpc/ps3/ps3bus.c
==============================================================================
--- user/nwhitehorn/ps3/powerpc/ps3/ps3bus.c	Mon Nov 15 17:48:13 2010	(r215342)
+++ user/nwhitehorn/ps3/powerpc/ps3/ps3bus.c	Mon Nov 15 18:49:42 2010	(r215343)
@@ -473,6 +473,9 @@ ps3bus_get_dma_tag(device_t dev, device_
 	struct ps3bus_softc *sc = device_get_softc(dev);
 	int i, err, flags;
 
+	if (dinfo->bustype != PS3_BUSTYPE_SYSBUS)
+		return (bus_get_dma_tag(dev));
+
 	mtx_lock(&dinfo->iommu_mtx);
 	if (dinfo->dma_tag != NULL) {
 		mtx_unlock(&dinfo->iommu_mtx);