[src/trunk]: src/sys/arch/x86/pci Move acpimcfg_map_bus() before no-MSI bailo...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4b59a7843738
branches:  trunk
changeset: 341863:4b59a7843738
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Thu Nov 26 16:27:05 2015 +0000

description:
Move acpimcfg_map_bus() before no-MSI bailout in pci_attach_hook().

diffstat:

 sys/arch/x86/pci/pci_machdep.c |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r e2c8feba525a -r 4b59a7843738 sys/arch/x86/pci/pci_machdep.c
--- a/sys/arch/x86/pci/pci_machdep.c    Thu Nov 26 16:07:40 2015 +0000
+++ b/sys/arch/x86/pci/pci_machdep.c    Thu Nov 26 16:27:05 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_machdep.c,v 1.72 2015/11/02 09:29:08 knakahara Exp $       */
+/*     $NetBSD: pci_machdep.c,v 1.73 2015/11/26 16:27:05 jakllsch Exp $        */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.72 2015/11/02 09:29:08 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.73 2015/11/26 16:27:05 jakllsch Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -461,6 +461,9 @@
 #if NACPICA > 0
        mpacpi_pci_attach_hook(parent, self, pba);
 #endif
+#if NACPICA > 0 && !defined(NO_PCI_EXTENDED_CONFIG)
+       acpimcfg_map_bus(self, pba->pba_pc, pba->pba_bus);
+#endif
 
 #ifdef __HAVE_PCI_MSI_MSIX
        /*
@@ -515,10 +518,6 @@
                pba->pba_flags &= ~PCI_FLAGS_MSIX_OKAY;
        }
 #endif /* __HAVE_PCI_MSI_MSIX */
-
-#if NACPICA > 0 && !defined(NO_PCI_EXTENDED_CONFIG)
-       acpimcfg_map_bus(self, pba->pba_pc, pba->pba_bus);
-#endif
 }
 
 int