From owner-svn-src-projects@FreeBSD.ORG  Sun Nov 10 02:49:20 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B67353E5;
 Sun, 10 Nov 2013 02:49:20 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A12F12105;
 Sun, 10 Nov 2013 02:49:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAA2nKgK055692;
 Sun, 10 Nov 2013 02:49:20 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAA2nKRt055691;
 Sun, 10 Nov 2013 02:49:20 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201311100249.rAA2nKRt055691@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 10 Nov 2013 02:49:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r257907 - 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, 10 Nov 2013 02:49:20 -0000

Author: marcel
Date: Sun Nov 10 02:49:20 2013
New Revision: 257907
URL: http://svnweb.freebsd.org/changeset/base/257907

Log:
  Fix Altix 350 support (SHub1/PIC), broken when Altix 450 (SHub2/TIOCP)
  support was added: prefetch cannot be set when consistent/coherent I/O
  is wanted. It's one or the other or none.

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 Nov 10 02:43:09 2013	(r257906)
+++ projects/altix2/sys/ia64/sgisn/sgisn_pcib.c	Sun Nov 10 02:49:20 2013	(r257907)
@@ -660,7 +660,7 @@ sgisn_pcib_iommu_map(device_t bus, devic
 		addr = ba;
 		if (flags & BUSDMA_ALLOC_CONSISTENT)
 			addr |= 1UL << 56;	/* bar */
-		if ((sc->sc_fwbus->fw_mode & 1) == 0)
+		else if ((sc->sc_fwbus->fw_mode & 1) == 0)
 			addr |= 1UL << 59;	/* prefetch */
 		if (sc->sc_fwbus->fw_common.bus_asic == SGISN_PCIB_PIC)
 			addr |= (u_long)sc->sc_fwbus->fw_hub_xid << 60;
@@ -746,10 +746,10 @@ sgisn_pcib_iommu_map(device_t bus, devic
 
 	ba &= ~SGISN_PCIB_PAGE_MASK;
 	ba |= 1 << 0;		/* valid */
-	if ((sc->sc_fwbus->fw_mode & 1) == 0)
-		ba |= 1 << 3;	/* prefetch */
 	if (flags & BUSDMA_ALLOC_CONSISTENT)
 		ba |= 1 << 4;	/* bar */
+	else if ((sc->sc_fwbus->fw_mode & 1) == 0)
+		ba |= 1 << 3;	/* prefetch */
 	if (sc->sc_fwbus->fw_common.bus_asic == SGISN_PCIB_PIC)
 		ba |= (u_long)sc->sc_fwbus->fw_hub_xid << 8;
 	while (count > 0) {