 @@ -1,25 +1,27 @@
-#	$NetBSD: std.explora,v 1.5 2011/06/20 17:44:33 matt Exp $
+#	$NetBSD: std.explora,v 1.6 2021/03/05 06:06:34 rin Exp $
+#
 # Standard/required options for NetBSD/explora.
 machine	evbppc powerpc
 include		"conf/std"	# MI standard options
 # standard ("mandatory") kernel options.
 options 	PPC_IBM4XX	# IBM 40x family
 options 	PPC_IBM403	# IBM 403GCX
 # Executable support:
 options 	EXEC_ELF32	# (native) ELF32 binary support
 options 	EXEC_AOUT	# (native) a.out binary support (deprecated)
 options 	EXEC_SCRIPT	# shell script support
 makeoptions	TEXTADDR=0x10000
 makeoptions	BOARDTYPE="explora"
 makeoptions	PPCDIR="ibm4xx"
 options 	PPC_INTR_IMPL="<powerpc/intr.h>"
 options 	INTSTK=8192
 options 	PPC_CPU_FREQ=66000000	# XXX hack for pckbc_cnattach()
 include		"arch/evbppc/conf/files.explora"

 @@ -1,14 +1,14 @@
-/*	$NetBSD: consinit.c,v 1.9 2012/10/13 17:58:53 jdc Exp $	*/
+/*	$NetBSD: consinit.c,v 1.10 2021/03/05 06:06:34 rin Exp $	*/
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Juergen Hannken-Illjes.
+ *
  * 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,50 +20,51 @@
  * ``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: consinit.c,v 1.9 2012/10/13 17:58:53 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.10 2021/03/05 06:06:34 rin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <machine/explora.h>
 #include <sys/bus.h>
 #include "com.h"
 #if NCOM > 0
 #include <sys/termios.h>
 #include <dev/ic/comreg.h>
 #include <dev/ic/comvar.h>
 #endif
 #include "pckbc.h"
 #if (NPCKBC > 0)
 #include <dev/isa/isareg.h>
 #include <dev/ic/i8042reg.h>
 #include <dev/ic/pckbcvar.h>
 #endif
 #include "pckbd.h"
 #include <evbppc/explora/dev/elbvar.h>
 #include <powerpc/ibm4xx/cpu.h>
 #include "opt_explora.h"
 #ifndef COM_CONSOLE_SPEED
 #define COM_CONSOLE_SPEED	9600
 #endif
 void
 consinit(void)
+{
 	bus_space_tag_t tag;
 	static int done = 0;
 #ifndef COM_IS_CONSOLE
 @@ -76,19 +77,22 @@ consinit(void)
 	done = 1;
 #ifdef COM_IS_CONSOLE
 	tag = elb_get_bus_space_tag(BASE_COM);
 	comcnattach(tag, _BUS_SPACE_UNSTRIDE(tag, BASE_COM), COM_CONSOLE_SPEED,
 	    COM_FREQ, COM_TYPE_NORMAL,
 	    (TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8);
 #else
 	/* Clear VRam */
 	memset((void *)BASE_FB, 0, SIZE_FB);
 	tag = elb_get_bus_space_tag(BASE_FB);
 	fb_cnattach(tag, BASE_FB2, (void *)BASE_FB);
 	calc_delayconst();	/* required by pckbc_cnattach() */
 	tag = elb_get_bus_space_tag(BASE_PCKBC);
 	pckbc_cnattach(tag, _BUS_SPACE_UNSTRIDE(tag, BASE_PCKBC),
 	    _BUS_SPACE_UNSTRIDE(tag, BASE_PCKBC2-BASE_PCKBC), PCKBC_KBD_SLOT,
 );
 #endif
+}

 @@ -1,18 +1,18 @@
-#	$NetBSD: files.powerpc,v 1.97 2020/10/21 13:31:51 christos Exp $
+#	$NetBSD: files.powerpc,v 1.98 2021/03/05 06:06:34 rin Exp $
 defflag	opt_altivec.h	ALTIVEC K_ALTIVEC PPC_HAVE_SPE
 defflag	opt_openpic.h	OPENPIC_DISTRIBUTE
-defparam opt_ppcparam.h	L2CR_CONFIG L3CR_CONFIG INTSTK CLOCKBASE VERBOSE_INITPPC
+defparam opt_ppcparam.h	L2CR_CONFIG L3CR_CONFIG INTSTK CLOCKBASE VERBOSE_INITPPC PPC_CPU_FREQ
 defflag	opt_ppcarch.h	PPC_OEA PPC_OEA601 PPC_OEA64 PPC_OEA64_BRIDGE PPC_MPC8XX PPC_IBM4XX PPC_IBM403 PPC_IBM440 PPC_BOOKE
 defflag opt_ppccache.h	CACHE_PROTO_MEI
 defflag opt_pmap.h	PMAPDEBUG PMAPCHECK PMAPCOUNTERS PMAP_MINIMALTLB PMAP_TLBDEBUG
 defparam opt_pmap.h	PTEGCOUNT PMAP_MEMLIMIT
 file	arch/powerpc/powerpc/core_machdep.c		coredump
 file	arch/powerpc/powerpc/fixup.c
 file	arch/powerpc/powerpc/kgdb_machdep.c		kgdb
 file	arch/powerpc/powerpc/kobj_machdep.c		modular
 file	arch/powerpc/powerpc/lock_stubs.S
 file	arch/powerpc/powerpc/openpic.c			openpic
 file	arch/powerpc/powerpc/pmap_subr.c		ppc_oea | ppc_oea64 | ppc_oea64_bridge | ppc_oea601
 file	arch/powerpc/powerpc/powerpc_machdep.c

 @@ -1,14 +1,14 @@
-/*	$NetBSD: clock.c,v 1.31 2021/01/18 04:35:04 rin Exp $	*/
+/*	$NetBSD: clock.c,v 1.32 2021/03/05 06:06:34 rin Exp $	*/
 /*      $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo 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
 @@ -23,30 +23,31 @@
  * 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: clock.c,v 1.31 2021/01/18 04:35:04 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.32 2021/03/05 06:06:34 rin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ppcarch.h"
 #include "opt_ppcparam.h"
 #endif
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/timetc.h>
 #include <sys/cpu.h>
 #include <uvm/uvm_extern.h>
 #include <prop/proplib.h>
 #include <powerpc/spr.h>
 @@ -187,29 +188,37 @@ cpu_initclocks(void)
 	/* Enable PIT & FIT(2^17c = 0.655ms) interrupts and auto-reload */
 	mtspr(SPR_TCR, TCR_PIE | TCR_ARE | TCR_FIE | TCR_PERIOD);
 	init_ppc4xx_tc();
+}
 void
 calc_delayconst(void)
+{
 	prop_number_t freq;
 	freq = prop_dictionary_get(board_properties, "processor-frequency");
 #ifndef PPC_CPU_FREQ
 	KASSERT(freq != NULL);
 #else
 	/* XXX hack for pckbc_cnattach() for Explora */
 	if (freq == NULL)
 		ticks_per_sec = (u_long) PPC_CPU_FREQ;
 	else
 #endif
 		ticks_per_sec = (u_long) prop_number_integer_value(freq);
 	ticks_per_sec = (u_long) prop_number_integer_value(freq);
 	ns_per_tick = 1000000000 / ticks_per_sec;
+}
 static u_int
 get_ppc4xx_timecount(struct timecounter *tc)
+{
 	u_long tb;
 	int msr;
 	__asm volatile ("mfmsr %0; wrteei 0" : "=r"(msr) :);
 	tb = mftbl();
 	__asm volatile ("mtmsr %0" :: "r"(msr));