Module Name: src
Committed By: dyoung
Date: Tue Feb 7 16:34:44 UTC 2012
Modified Files:
src/sys/arch/i386/i386: mainbus.c
Log Message:
Initialize pcibus_attach_args.pba_sub to 255. Note in a comment that
this needs some improvement for machines with >1 Host-PCI bridge, but
that it doesn't cause any practical problems at this time.
Ok releng@.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/i386/i386/mainbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/i386/mainbus.c
diff -u src/sys/arch/i386/i386/mainbus.c:1.93 src/sys/arch/i386/i386/mainbus.c:1.94
--- src/sys/arch/i386/i386/mainbus.c:1.93 Wed Jan 18 21:34:38 2012
+++ src/sys/arch/i386/i386/mainbus.c Tue Feb 7 16:34:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.93 2012/01/18 21:34:38 drochner Exp $ */
+/* $NetBSD: mainbus.c,v 1.94 2012/02/07 16:34:44 dyoung Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.93 2012/01/18 21:34:38 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.94 2012/02/07 16:34:44 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -406,6 +406,13 @@ mainbus_rescan(device_t self, const char
mba.mba_pba.pba_pc = NULL;
mba.mba_pba.pba_flags = pci_bus_flags();
mba.mba_pba.pba_bus = 0;
+ /* XXX On those machines with >1 Host-PCI bridge,
+ * XXX not every bus > pba_bus is subordinate to pba_bus,
+ * XXX but this works on many machines, and pba_sub is
+ * XXX not used today by any critical code, so it is safe
+ * XXX to be so inclusive at this time.
+ */
+ mba.mba_pba.pba_sub = 255;
mba.mba_pba.pba_bridgetag = NULL;
#if NACPICA > 0 && defined(ACPI_SCANPCI)
if (npcibus == 0 && sc->sc_mpacpi_active)
