svn commit: r208144 - projects/ppc64/sys/powerpc/powermac

[Nathan Whitehorn]

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)