From owner-svn-src-projects@FreeBSD.ORG  Sat Nov  2 01:03:15 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 4AFE1777;
 Sat,  2 Nov 2013 01:03:15 +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 3775025C1;
 Sat,  2 Nov 2013 01:03:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA213Fa8036938;
 Sat, 2 Nov 2013 01:03:15 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA213FkC036937;
 Sat, 2 Nov 2013 01:03:15 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201311020103.rA213FkC036937@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 2 Nov 2013 01:03:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r257538 - 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: Sat, 02 Nov 2013 01:03:15 -0000

Author: marcel
Date: Sat Nov  2 01:03:14 2013
New Revision: 257538
URL: http://svnweb.freebsd.org/changeset/base/257538

Log:
  The TIOCP PCI Bridge has the low order bit of the NAS ID set. Mask it
  when we match PCI bridges to SHub ASICs.

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	Sat Nov  2 00:54:47 2013	(r257537)
+++ projects/altix2/sys/ia64/sgisn/sgisn_shub.c	Sat Nov  2 01:03:14 2013	(r257538)
@@ -477,7 +477,7 @@ sgisn_shub_attach(device_t dev)
 
 			fwbus = (void *)IA64_PHYS_TO_RR7(addr);
 			if (((fwbus->bus_base >> sc->sc_nasid_shft) &
-			    sc->sc_nasid_mask) != sc->sc_nasid)
+			    (sc->sc_nasid_mask - 1)) != sc->sc_nasid)
 				continue;
 
 			child = device_add_child(dev, "pcib", -1);