 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.h,v 1.19 2019/01/08 07:46:10 mrg Exp $	*/
+/*	$NetBSD: autoconf.h,v 1.20 2020/07/07 02:33:54 rin Exp $	*/
 /*-
  * Copyright (C) 1998	Internet Research Institute, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -72,16 +72,17 @@ void copy_disp_props(device_t, int, prop
 void init_interrupt(void);
 /* these are in dev/akbd.c */
 int kbd_intr(void *);
 int akbd_cnattach(void);
 int adbkbd_cnattach(void);
 /* these are in dev/ofb.c */
 int ofb_is_console(void);
 int rascons_cnattach(void);
 extern int console_node;
 extern int console_instance;
 extern int ofw_quiesce;
 extern char model_name[64];
 #endif /* _MACHINE_AUTOCONF_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.169 2019/01/28 02:25:01 sevan Exp $	*/
+/*	$NetBSD: machdep.c,v 1.170 2020/07/07 02:33:54 rin Exp $	*/
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
  * Copyright (C) 1995, 1996 TooLs GmbH.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -22,27 +22,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.169 2019/01/28 02:25:01 sevan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.170 2020/07/07 02:33:54 rin Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_altivec.h"
 #include "opt_multiprocessor.h"
 #include "adb.h"
 #include "zsc.h"
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/boot_flag.h>
 #include <sys/bus.h>
 @@ -267,31 +267,28 @@ void
 callback(void *p)
+{
 	panic("callback");	/* for now			XXX */
+}
 #endif
 void
 copy_disp_props(device_t dev, int node, prop_dictionary_t dict)
+{
 	char name[32];
 	uint32_t temp;
 	uint64_t cmap_cb, backlight_cb, brightness_cb;
 	int have_backlight = 0;
 #ifdef PMAC_G5
 	int have_palette = 0;
 #else
 	int have_palette = 1;
 #endif
 	if (node != console_node) {
 		/*
 		 * see if any child matches since OF attaches nodes for
 		 * each head and /chosen/stdout points to the head
 		 * rather than the device itself in this case
 		 */
 		int sub;
 		sub = OF_child(node);
 		while ((sub != 0) && (sub != console_node)) {
 			sub = OF_peer(sub);
+		}
 		if (sub != console_node)
 @@ -339,41 +336,54 @@ copy_disp_props(device_t dev, int node,
+		}
+	}
 	add_model_specifics(dict);
 	temp = 0;
 	if (OF_getprop(node, "ATY,RefCLK", &temp, sizeof(temp)) != 4) {
 		OF_getprop(OF_parent(node), "ATY,RefCLK", &temp,
 		    sizeof(temp));
+	}
 	if (temp != 0)
 		prop_dictionary_set_uint32(dict, "refclk", temp / 10);
 	if (have_palette && ofw_quiesce) {
 		aprint_debug(
 		    "OFW has been quiesced - disabling palette callback\n");
 		have_palette = 0;
+	}
 	if (have_palette) {
 		gfb_cb.gcc_cookie = (void *)console_instance;
 		gfb_cb.gcc_set_mapreg = of_set_palette;
 		cmap_cb = (uint64_t)(uintptr_t)&gfb_cb;
 		prop_dictionary_set_uint64(dict, "cmap_callback", cmap_cb);
+	}
 	/* now let's look for backlight control */
 	have_backlight = 0;
 	if (OF_getprop(node, "backlight-control", &temp, sizeof(temp)) == 4) {
 		have_backlight = 1;
 	} else if (OF_getprop(OF_parent(node), "backlight-control", &temp,
 		    sizeof(temp)) == 4) {
 		have_backlight = 1;
+	}
 	if (have_backlight && ofw_quiesce) {
 		aprint_debug(
 		    "OFW has been quiesced - disabling backlight callbacks\n");
 		have_palette = 0;
+	}
 	if (have_backlight) {
 		gpc_backlight.gpc_cookie = (void *)console_instance;
 		gpc_backlight.gpc_set_parameter = of_set_backlight;
 		gpc_backlight.gpc_get_parameter = of_get_backlight;
 		gpc_backlight.gpc_upd_parameter = NULL;
 		backlight_cb = (uint64_t)(uintptr_t)&gpc_backlight;
 		prop_dictionary_set_uint64(dict, "backlight_callback",
 		    backlight_cb);
 		gpc_brightness.gpc_cookie = (void *)console_instance;
 		gpc_brightness.gpc_set_parameter = of_set_brightness;
 		gpc_brightness.gpc_get_parameter = of_get_brightness;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.h,v 1.16 2019/01/08 07:46:10 mrg Exp $	*/
+/*	$NetBSD: autoconf.h,v 1.17 2020/07/07 02:33:54 rin Exp $	*/
 #ifndef _OFPPC_AUTOCONF_H_
 #define _OFPPC_AUTOCONF_H_
 #include <sys/bus.h>
 #include <prop/proplib.h>
 struct confargs {
 	const char	*ca_name;
 	u_int		ca_node;
 	int		ca_nreg;
 	u_int		*ca_reg;
 @@ -22,26 +22,27 @@ struct confargs {
 struct pciio_info {
 	uint32_t	start;
 	uint32_t	limit;
 };
 /* to support machines with more than 4 busses, change the below */
 #define MAX_PCI_BUSSES		4
 struct model_data {
 	int			ranges_offset;
 	struct pciio_info	pciiodata[MAX_PCI_BUSSES];
 };
 extern int console_node;
 extern int ofw_quiesce;		/* XXX not used at the moment */
 extern char model_name[64];
 #ifdef _KERNEL
 void initppc(u_int, u_int, char *);
 void model_init(void);
 void strayintr(int);
 void dumpsys(void);
 void inittodr(time_t);
 void resettodr(void);
 void cpu_initclocks(void);
 void decr_intr(struct clockframe *);
 void setstatclockrate(int);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ofw_rascons.c,v 1.15 2020/07/07 02:10:20 rin Exp $	*/
+/*	$NetBSD: ofw_rascons.c,v 1.16 2020/07/07 02:33:54 rin Exp $	*/
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Chris G. Demetriou
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
 @@ -18,27 +18,27 @@
+ *
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_rascons.c,v 1.15 2020/07/07 02:10:20 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_rascons.c,v 1.16 2020/07/07 02:33:54 rin Exp $");
 #include "wsdisplay.h"
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <dev/ofw/openfirm.h>
 @@ -276,22 +276,34 @@ rascons_init_rasops(int node, struct ras
 		char buffer[128];
 		snprintf(buffer, 128, "bits %08x c %d w %d -> %d %d\n",
 		    (uint32_t)ri->ri_bits, cols, width, ri->ri_xorigin, ri->ri_yorigin);
 		OF_write(console_instance, buffer, strlen(buffer));
 #endif
 	} else {
 		/* use as much of the screen as the font permits */
 		rasops_init(ri, height/8, width/8);
 		ri->ri_caps = WSSCREEN_WSCOLORS;
 		rasops_reconfig(ri, height / ri->ri_font->fontheight,
 		    width / ri->ri_font->fontwidth);
+	}
 	if (depth == 8 && ofw_quiesce) {
 		/*
 		 * Open Firmware will be quiesced. This is last chance to
 		 * set color palette via ``color!'' method.
 		 */
 		for (int i = 0; i < 256; i++) {
 			OF_call_method_1("color!", console_instance, 4,
 			    rasops_cmap[3 * i], rasops_cmap[3 * i + 1],
 			    rasops_cmap[3 * i + 2], i);
+		}
+	}
 	return true;
+}
 #else	/* NWSDISPLAY > 0 */
 int
 rascons_cnattach(void)
+{
 	return -1;
+}
 #endif

 @@ -1,14 +1,14 @@
-/* $NetBSD: ofwoea_machdep.c,v 1.49 2020/07/06 10:59:37 rin Exp $ */
+/* $NetBSD: ofwoea_machdep.c,v 1.50 2020/07/07 02:33:54 rin Exp $ */
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tim Rightnour
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.49 2020/07/06 10:59:37 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.50 2020/07/07 02:33:54 rin Exp $");
 #include "ksyms.h"
 #include "wsdisplay.h"
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_modular.h"
 #include "opt_multiprocessor.h"
 #include "opt_oea.h"
 #include "opt_ofwoea.h"
 #include "opt_ppcarch.h"
 #endif
 @@ -116,26 +116,28 @@ char model_name[64];
 void *startsym, *endsym;
 #endif
 #if PPC_OEA601
 #define TIMEBASE_FREQ (1000000000)  /* RTC register */
 #endif
 #ifdef TIMEBASE_FREQ
 u_int timebase_freq = TIMEBASE_FREQ;
 #else
 u_int timebase_freq = 0;
 #endif
 int ofw_quiesce;
 extern int ofwmsr;
 extern int chosen;
 extern uint32_t ticks_per_sec;
 extern uint32_t ns_per_tick;
 extern uint32_t ticks_per_intr;
 static int save_ofmap(struct ofw_translations *, int);
 static void restore_ofmap(struct ofw_translations *, int);
 static void set_timebase(void);
 extern void cpu_spinstart(u_int);
 extern volatile u_int cpu_spinstart_ack;
 @@ -166,41 +168,44 @@ ofwoea_initppc(u_int startkernel, u_int
 	/* get model name and perform model-specific actions */
 	memset(model_name, 0, sizeof(model_name));
 	node = OF_finddevice("/");
 	if (node != -1) {
 		l = OF_getprop(node, "model", model_name, sizeof(model_name));
 		if (l == -1)
 			OF_getprop(node, "name", model_name,
 			    sizeof(model_name));
 		model_init();
+	}
 	if (strncmp(model_name, "PowerMac11,2", 12) == 0 ||
 	    strncmp(model_name, "PowerMac12,1", 12) == 0)
-		OF_quiesce();
+		ofw_quiesce = 1;
 	/* switch CPUs to full speed */
 	if  (strncmp(model_name, "PowerMac7,", 10) == 0) {
 		int clock_ih = OF_open("/u3/i2c/i2c-hwclock");
 		if (clock_ih != 0) {
 			OF_call_method_1("slew-high", clock_ih, 0);
+		}
+	}
 	/* Initialize bus_space */
 	ofwoea_bus_space_init();
 	ofwoea_consinit();
 	if (ofw_quiesce)
 		OF_quiesce();
 #if defined(MULTIPROCESSOR) && defined(ofppc)
 	for (i=1; i < CPU_MAXNUM; i++) {
 		snprintf(cpupath, sizeof(cpupath), "/cpus/@%x", i);
 		node = OF_finddevice(cpupath);
 		if (node <= 0)
 			continue;
 		aprint_verbose("Starting up CPU %d %s\n", i, cpupath);
 		OF_start_cpu(node, (u_int)cpu_spinstart, i);
 		for (l=0; l < 100000000; l++) {
 			if (cpu_spinstart_ack == i) {
 				aprint_verbose("CPU %d spun up.\n", i);
 				break;
+			}