[src/netbsd-8]: src/sys/arch/prep/prep Pull up following revision(s) (request...

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

details:   https://anonhg.NetBSD.org/src/rev/2ca7a00c77f4
branches:  netbsd-8
changeset: 435223:2ca7a00c77f4
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Aug 28 16:24:24 2018 +0000

description:
Pull up following revision(s) (requested by martin in ticket #994):
        sys/arch/prep/prep/machdep.c: revision 1.76
        sys/arch/prep/prep/mainbus.c: revision 1.34
Fix initialization order so we can boot again on IBM PPS Model 6015
(which needs pci interrupt fixup quirks).
>From Artyom Tarasenko.

diffstat:

 sys/arch/prep/prep/machdep.c |  10 ++--------
 sys/arch/prep/prep/mainbus.c |   7 +++++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diffs (59 lines):

diff -r cf5e278bdcb5 -r 2ca7a00c77f4 sys/arch/prep/prep/machdep.c
--- a/sys/arch/prep/prep/machdep.c      Tue Aug 28 13:29:22 2018 +0000
+++ b/sys/arch/prep/prep/machdep.c      Tue Aug 28 16:24:24 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.75 2014/04/03 23:49:47 mrg Exp $ */
+/*     $NetBSD: machdep.c,v 1.75.22.1 2018/08/28 16:24:24 snj Exp $    */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.75 2014/04/03 23:49:47 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.75.22.1 2018/08/28 16:24:24 snj Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_openpic.h"
@@ -207,12 +207,6 @@
         * Now safe for bus space allocation to use malloc.
         */
        bus_space_mallocok();
-
-       /*
-        * Gather the pci interrupt routings.
-         */
-       setup_pciroutinginfo();
-
 }
 
 /*
diff -r cf5e278bdcb5 -r 2ca7a00c77f4 sys/arch/prep/prep/mainbus.c
--- a/sys/arch/prep/prep/mainbus.c      Tue Aug 28 13:29:22 2018 +0000
+++ b/sys/arch/prep/prep/mainbus.c      Tue Aug 28 16:24:24 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mainbus.c,v 1.33 2012/01/27 18:53:00 para Exp $        */
+/*     $NetBSD: mainbus.c,v 1.33.40.1 2018/08/28 16:24:24 snj 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.33 2012/01/27 18:53:00 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.33.40.1 2018/08/28 16:24:24 snj Exp $");
 
 #include "opt_pci.h"
 #include "opt_residual.h"
@@ -140,6 +140,9 @@
        SIMPLEQ_INIT(&genppc_pct->pc_pbi);
        SIMPLEQ_INSERT_TAIL(&genppc_pct->pc_pbi, pbi, next);
 
+       /* fix pci interrupt routings on some models */
+       setup_pciroutinginfo();
+
        /* find the primary host bridge */
        setup_pciintr_map(pbi, 0, 0, 0);