From owner-svn-src-head@FreeBSD.ORG  Wed Jun 22 02:23:19 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F32551065679;
	Wed, 22 Jun 2011 02:23:18 +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 E41BC8FC0C;
	Wed, 22 Jun 2011 02:23:18 +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 p5M2NI7S027756;
	Wed, 22 Jun 2011 02:23:18 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5M2NI11027754;
	Wed, 22 Jun 2011 02:23:18 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201106220223.p5M2NI11027754@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 22 Jun 2011 02:23:18 +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: r223406 - head/sys/powerpc/ps3
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Jun 2011 02:23:19 -0000

Author: nwhitehorn
Date: Wed Jun 22 02:23:18 2011
New Revision: 223406
URL: http://svn.freebsd.org/changeset/base/223406

Log:
  This is more complicated than I expected. Storage devices need the IOMMU
  set up, but must not use it.

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

Modified: head/sys/powerpc/ps3/ps3bus.c
==============================================================================
--- head/sys/powerpc/ps3/ps3bus.c	Wed Jun 22 02:18:45 2011	(r223405)
+++ head/sys/powerpc/ps3/ps3bus.c	Wed Jun 22 02:23:18 2011	(r223406)
@@ -631,7 +631,8 @@ 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)
+	if (dinfo->bustype != PS3_BUSTYPE_SYSBUS &&
+	    dinfo->bustype != PS3_BUSTYPE_STORAGE)
 		return (bus_get_dma_tag(dev));
 
 	mtx_lock(&dinfo->iommu_mtx);
@@ -671,7 +672,15 @@ ps3bus_get_dma_tag(device_t dev, device_
 	    NULL, NULL, BUS_SPACE_MAXSIZE, 0, BUS_SPACE_MAXSIZE,
 	    0, NULL, NULL, &dinfo->dma_tag);
 
-	bus_dma_tag_set_iommu(dinfo->dma_tag, dev, dinfo);
+	/*
+	 * Note: storage devices have IOMMU mappings set up by the hypervisor,
+	 * but use physical, non-translated addresses. The above IOMMU
+	 * initialization is necessary for the hypervisor to be able to set up
+	 * the mappings, but actual DMA mappings should not use the IOMMU
+	 * routines.
+	 */
+	if (dinfo->bustype != PS3_BUSTYPE_STORAGE)
+		bus_dma_tag_set_iommu(dinfo->dma_tag, dev, dinfo);
 
 fail:
 	mtx_unlock(&dinfo->iommu_mtx);