Module Name: src
Committed By: macallan
Date: Thu Mar 22 15:23:43 UTC 2018
Modified Files:
src/sys/arch/macppc/macppc: cpu.c
Log Message:
mapiodev() the CPU reset GPIOs instead of blindly assuming that everything
is BAT-mapped
Now the 2nd CPU on my PowerMac7,3 wakes up and says hi.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/macppc/macppc/cpu.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/macppc/macppc/cpu.c
diff -u src/sys/arch/macppc/macppc/cpu.c:1.60 src/sys/arch/macppc/macppc/cpu.c:1.61
--- src/sys/arch/macppc/macppc/cpu.c:1.60 Wed Mar 26 17:45:16 2014
+++ src/sys/arch/macppc/macppc/cpu.c Thu Mar 22 15:23:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.60 2014/03/26 17:45:16 christos Exp $ */
+/* $NetBSD: cpu.c,v 1.61 2018/03/22 15:23:43 macallan Exp $ */
/*-
* Copyright (c) 2001 Tsubai Masanari.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.60 2014/03/26 17:45:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.61 2018/03/22 15:23:43 macallan Exp $");
#include "opt_ppcparam.h"
#include "opt_multiprocessor.h"
@@ -209,7 +209,7 @@ md_setup_trampoline(volatile struct cpu_
{
#ifdef OPENPIC
if (openpic_base) {
- uint32_t kl_base = 0x80000000; /* XXX */
+ uint32_t kl_base = (uint32_t)mapiodev(0x80000000, 0x1000, 0);
uint32_t gpio = kl_base + 0x5c; /* XXX */
u_int node, off;
char cpupath[32];
