From owner-svn-src-projects@FreeBSD.ORG  Sun May 16 14:31:54 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6958D1065670;
	Sun, 16 May 2010 14:31:53 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 589198FC08;
	Sun, 16 May 2010 14:31:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4GEVrKM027288;
	Sun, 16 May 2010 14:31:53 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4GEVr09027286;
	Sun, 16 May 2010 14:31:53 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201005161431.o4GEVr09027286@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 16 May 2010 14:31:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208144 - projects/ppc64/sys/powerpc/powermac
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 16 May 2010 14:31:54 -0000

Author: nwhitehorn
Date: Sun May 16 14:31:53 2010
New Revision: 208144
URL: http://svn.freebsd.org/changeset/base/208144

Log:
  Ignore devices on the non-primary function on the CPCHT HT root bus. This
  solves hangs probing the IO/APIC integrated into the AMD 8131 south bridge
  on the Powermac 7,2.
  
  Reported by:	Andreas Tobler

Modified:
  projects/ppc64/sys/powerpc/powermac/cpcht.c

Modified: projects/ppc64/sys/powerpc/powermac/cpcht.c
==============================================================================
--- projects/ppc64/sys/powerpc/powermac/cpcht.c	Sun May 16 12:39:17 2010	(r208143)
+++ projects/ppc64/sys/powerpc/powermac/cpcht.c	Sun May 16 14:31:53 2010	(r208144)
@@ -378,7 +378,7 @@ cpcht_read_config(device_t dev, u_int bu
 	caoff = sc->sc_data + 
 		(((((slot & 0x1f) << 3) | (func & 0x07)) << 8) | reg);
 
-	if (bus == 0 && !(sc->sc_populated_slots & (1 << slot)))
+	if (bus == 0 && (!(sc->sc_populated_slots & (1 << slot)) || func > 0))
 		return (0xffffffff);
 
 	if (bus > 0)
@@ -410,7 +410,7 @@ cpcht_write_config(device_t dev, u_int b
 	caoff = sc->sc_data + 
 		(((((slot & 0x1f) << 3) | (func & 0x07)) << 8) | reg);
 
-	if (bus == 0 && !(sc->sc_populated_slots & (1 << slot)))
+	if (bus == 0 && (!(sc->sc_populated_slots & (1 << slot)) || func > 0))
 		return;
 
 	if (bus > 0)