From owner-svn-src-projects@FreeBSD.ORG  Fri Nov  1 22:55:12 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 6DA59B01;
 Fri,  1 Nov 2013 22:55:12 +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 5B2E12E1E;
 Fri,  1 Nov 2013 22:55:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1MtCr3090756;
 Fri, 1 Nov 2013 22:55:12 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA1MtCc9090755;
 Fri, 1 Nov 2013 22:55:12 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201311012255.rA1MtCc9090755@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Fri, 1 Nov 2013 22:55:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r257533 - 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: Fri, 01 Nov 2013 22:55:12 -0000

Author: marcel
Date: Fri Nov  1 22:55:11 2013
New Revision: 257533
URL: http://svnweb.freebsd.org/changeset/base/257533

Log:
  Fix the MMR mapping for SHub2, as found on the Altix 450.
  
  Sponsored by:	HOB GmbH & Co. KG

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

Modified: projects/altix2/sys/ia64/sgisn/sgisn_shub.c
==============================================================================
--- projects/altix2/sys/ia64/sgisn/sgisn_shub.c	Fri Nov  1 22:38:58 2013	(r257532)
+++ projects/altix2/sys/ia64/sgisn/sgisn_shub.c	Fri Nov  1 22:55:11 2013	(r257533)
@@ -417,8 +417,7 @@ sgisn_shub_attach(device_t dev)
 	    sc->sc_nasid_mask;
 
 	sc->sc_mmraddr = (sc->sc_nasid << sc->sc_nasid_shft) |
-	    (1UL << (sc->sc_nasid_shft - 3)) |
-	    (((sc->sc_hubtype == 0) ? 1UL : 0UL) << 32);
+	    (((sc->sc_hubtype == 0) ? 9UL : 3UL) << 32);
 	sc->sc_tag = IA64_BUS_SPACE_MEM;
 	bus_space_map(sc->sc_tag, sc->sc_mmraddr, 1UL << 32, 0, &sc->sc_hndl);