Module Name: src
Committed By: snj
Date: Tue Aug 28 16:24:24 UTC 2018
Modified Files:
src/sys/arch/prep/prep [netbsd-8]: machdep.c mainbus.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.75.22.1 src/sys/arch/prep/prep/machdep.c
cvs rdiff -u -r1.33 -r1.33.40.1 src/sys/arch/prep/prep/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/prep/prep/machdep.c
diff -u src/sys/arch/prep/prep/machdep.c:1.75 src/sys/arch/prep/prep/machdep.c:1.75.22.1
--- src/sys/arch/prep/prep/machdep.c:1.75 Thu Apr 3 23:49:47 2014
+++ src/sys/arch/prep/prep/machdep.c Tue Aug 28 16:24:24 2018
@@ -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 @@ cpu_startup(void)
* Now safe for bus space allocation to use malloc.
*/
bus_space_mallocok();
-
- /*
- * Gather the pci interrupt routings.
- */
- setup_pciroutinginfo();
-
}
/*
Index: src/sys/arch/prep/prep/mainbus.c
diff -u src/sys/arch/prep/prep/mainbus.c:1.33 src/sys/arch/prep/prep/mainbus.c:1.33.40.1
--- src/sys/arch/prep/prep/mainbus.c:1.33 Fri Jan 27 18:53:00 2012
+++ src/sys/arch/prep/prep/mainbus.c Tue Aug 28 16:24:24 2018
@@ -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 @@ mainbus_attach(device_t parent, device_t
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);
