From owner-svn-src-projects@FreeBSD.ORG Sun Nov 3 18:14:46 2013 Return-Path: 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 A1643F2A; Sun, 3 Nov 2013 18:14:46 +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 8EF122B2C; Sun, 3 Nov 2013 18:14:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3IEkqI080697; Sun, 3 Nov 2013 18:14:46 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3IEkBE080696; Sun, 3 Nov 2013 18:14:46 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311031814.rA3IEkBE080696@svn.freebsd.org> From: Marcel Moolenaar Date: Sun, 3 Nov 2013 18:14:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257581 - 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 18:14:46 -0000 Author: marcel Date: Sun Nov 3 18:14:46 2013 New Revision: 257581 URL: http://svnweb.freebsd.org/changeset/base/257581 Log: o Update copyright o Add a comment explaining what's happening with the PCI bridge discovery and in particular the conditional involving the NASID. 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 Sun Nov 3 17:19:17 2013 (r257580) +++ projects/altix2/sys/ia64/sgisn/sgisn_shub.c Sun Nov 3 18:14:46 2013 (r257581) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2011 Marcel Moolenaar + * Copyright (c) 2011-2013 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -474,6 +474,14 @@ sgisn_shub_attach(device_t dev) if (r.sal_status != 0 || addr == 0) continue; + /* + * Filter PCI bridges not connected to the SHub + * instance in question. We use the NASID to match + * bridges to SHubs. + * Note that the TIOCP bridge has bit 0 of the + * NASID set, which is why we want to ignore bit 0. + * Subtracting 1 from the mask does the trick. + */ fwbus = (void *)IA64_PHYS_TO_RR7(addr); if (((fwbus->bus_base >> sc->sc_nasid_shft) & (sc->sc_nasid_mask - 1)) != sc->sc_nasid)