 @@ -1,14 +1,14 @@
-/*	$NetBSD: clock.c,v 1.14 2014/03/03 15:36:36 macallan Exp $	*/
+/*	$NetBSD: clock.c,v 1.15 2014/03/18 14:34:31 macallan 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,66 +23,78 @@
  * 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.14 2014/03/03 15:36:36 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.15 2014/03/18 14:34:31 macallan Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/timetc.h>
 #include <uvm/uvm_extern.h>
 #include <powerpc/psl.h>
 #include <powerpc/spr.h>
 #if defined (PPC_OEA) || defined(PPC_OEA64) || defined (PPC_OEA64_BRIDGE)
 #include <powerpc/oea/spr.h>
 #elif defined (PPC_BOOKE)
 #include <powerpc/booke/spr.h>
 #elif defined (PPC_IBM4XX)
 #include <powerpc/ibm4xx/spr.h>
 #else
 #error unknown powerpc variant
 #endif
 void decr_intr(struct clockframe *);
 void init_powerpc_tc(void);
 static u_int get_powerpc_timecount(struct timecounter *);
 #ifdef PPC_OEA601
 static u_int get_601_timecount(struct timecounter *);
 #endif
 uint32_t ticks_per_sec;
 uint32_t ns_per_tick;
 uint32_t ticks_per_intr = 0;
 #ifdef PPC_OEA601
 static struct timecounter powerpc_601_timecounter = {
 	get_601_timecount,	/* get_timecount */
 ,			/* no poll_pps */
 x7fffffff,		/* counter_mask */
 ,			/* frequency */
 	"rtc",			/* name */
 ,			/* quality */
 	NULL,			/* tc_priv */
 	NULL			/* tc_next */
 };
 #endif
 static struct timecounter powerpc_timecounter = {
 	get_powerpc_timecount,	/* get_timecount */
 ,			/* no poll_pps */
 x7fffffff,		/* counter_mask */
 ,			/* frequency */
 #if PPC_OEA601
 	"rtc",			/* name */
 #else
 	"mftb",			/* name */
 #endif
 ,			/* quality */
 	NULL,			/* tc_priv */
 	NULL			/* tc_next */
 };
 /*
  * Start the real-time and statistics clocks. Leave stathz 0 since there
  * are no other timers available.
  */
 void
 cpu_initclocks(void)
+{
 	struct cpu_info * const ci = curcpu();
 @@ -112,27 +124,27 @@ cpu_initclocks(void)
  * but that would be a drag.
  */
 void
 setstatclockrate(int arg)
+{
 	/* Nothing we can do */
+}
 void
 decr_intr(struct clockframe *cfp)
+{
 	struct cpu_info * const ci = curcpu();
-	int msr;
+	const register_t msr = mfmsr();
 	int pri;
 	u_long tb;
 	long ticks;
 	int nticks;
 	/* Check whether we are initialized */
 	if (!ticks_per_intr)
 		return;
 	/*
 	 * Based on the actual time delay since the last decrementer reload,
 	 * we arrange for earlier interrupt next time.
 	 */
 @@ -153,42 +165,41 @@ decr_intr(struct clockframe *cfp)
 		/*
 		 * lasttb is used during microtime. Set it to the virtual
 		 * start of this tick interval.
 		 */
 #ifdef PPC_OEA601
 		if ((mfpvr() >> 16) == MPC601)
 			tb = rtc_nanosecs();
 		else
 #endif
 			__asm volatile ("mftb %0" : "=r"(tb));
 		ci->ci_lasttb = tb + ticks - ticks_per_intr;
 		ci->ci_idepth++;
-		/*
+		mtmsr(msr | PSL_EE);
 		 * Reenable interrupts
 		 */
 		__asm volatile ("mfmsr %0; ori %0, %0, %1; mtmsr %0"
 			      : "=r"(msr) : "K"(PSL_EE));
 		/*
 		 * Do standard timer interrupt stuff.
 		 * Do softclock stuff only on the last iteration.
 		 */
 		while (--nticks > 0)
 			hardclock(cfp);
 		hardclock(cfp);
 		mtmsr(msr);
 		ci->ci_idepth--;
+	}
 	mtmsr(msr | PSL_EE);
 	splx(pri);
 	mtmsr(msr);
+}
 /*
  * Wait for about n microseconds (at least!).
  */
 void
 delay(unsigned int n)
+{
 #ifdef _ARCH_PPC64
 	uint64_t tb, scratch;
 #else
 	uint64_t tb;
 	uint32_t tbh, tbl, scratch;
 @@ -231,31 +242,52 @@ delay(unsigned int n)
 			      : "cr0");
 #endif
+	}
+}
 static u_int
 get_powerpc_timecount(struct timecounter *tc)
+{
 	u_long tb;
 	int msr, scratch;
 	__asm volatile ("mfmsr %0; andi. %1,%0,%2; mtmsr %1"
 		      : "=r"(msr), "=r"(scratch) : "K"((u_short)~PSL_EE));
 	tb = (u_int)(mftb() & 0x7fffffff);
 	mtmsr(msr);
 	return tb;
+}
 #ifdef PPC_OEA601
-	if ((mfpvr() >> 16) == MPC601)
+static u_int
-		tb = rtc_nanosecs();
+get_601_timecount(struct timecounter *tc)
 	else
-#endif
+	u_long tb;
-		__asm volatile ("mftb %0" : "=r"(tb));
+	int msr, scratch;
 	__asm volatile ("mfmsr %0; andi. %1,%0,%2; mtmsr %1"
 		      : "=r"(msr), "=r"(scratch) : "K"((u_short)~PSL_EE));
 	tb = rtc_nanosecs();
 	mtmsr(msr);
 	return tb;
+}
 #endif
 void
 init_powerpc_tc(void)
+{
-	/* from machdep initialization */
+	struct timecounter *tc;
 	powerpc_timecounter.tc_frequency = ticks_per_sec;
-	tc_init(&powerpc_timecounter);
+#ifdef PPC_OEA601
 	if ((mfpvr() >> 16) == MPC601) {
 		tc = &powerpc_601_timecounter;
 	} else
 #endif
 		tc = &powerpc_timecounter;
 	tc->tc_frequency = ticks_per_sec;
 	tc_init(tc);
+}