From owner-svn-src-projects@FreeBSD.ORG  Sun Dec 30 06:00:56 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3C6328D3;
 Sun, 30 Dec 2012 06:00:56 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 20DA38FC0A;
 Sun, 30 Dec 2012 06:00:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBU60uGV037639;
 Sun, 30 Dec 2012 06:00:56 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBU60tc3037638;
 Sun, 30 Dec 2012 06:00:55 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201212300600.qBU60tc3037638@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 30 Dec 2012 06:00:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244852 - projects/altix2/sys/ia64/sgisn
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Dec 2012 06:00:56 -0000

Author: marcel
Date: Sun Dec 30 06:00:55 2012
New Revision: 244852
URL: http://svnweb.freebsd.org/changeset/base/244852

Log:
  Use 64-bit direct mapped DMA for devices that support it (e.g. isp(4)).

Modified:
  projects/altix2/sys/ia64/sgisn/sgisn_pcib.c

Modified: projects/altix2/sys/ia64/sgisn/sgisn_pcib.c
==============================================================================
--- projects/altix2/sys/ia64/sgisn/sgisn_pcib.c	Sun Dec 30 05:59:10 2012	(r244851)
+++ projects/altix2/sys/ia64/sgisn/sgisn_pcib.c	Sun Dec 30 06:00:55 2012	(r244852)
@@ -506,12 +506,22 @@ sgisn_pcib_iommu_xlate(device_t dev, bus
 static int
 sgisn_pcib_iommu_map(device_t dev, busdma_md_t md, u_int idx, bus_addr_t *ba_p)
 {
-	bus_addr_t bndry = 0x80000000UL;
+	struct sgisn_pcib_softc *sc = device_get_softc(dev);
+	busdma_tag_t tag;
+	bus_addr_t maxaddr = 0x80000000UL;
 	bus_addr_t ba;
 
 	ba = *ba_p;
-	if (ba < bndry) {
-		ba |= bndry;
+	if (ba < maxaddr) {
+		ba |= maxaddr;
+		*ba_p = ba;
+		return (0);
+	}
+
+	tag = busdma_md_get_tag(md);
+	maxaddr = busdma_tag_get_maxaddr(tag);
+	if (maxaddr == ~0UL) {
+		ba |= ((u_long)sc->sc_fwbus->fw_hub_xid << 60) | (1UL << 59);
 		*ba_p = ba;
 		return (0);
 	}