 @@ -1,14 +1,14 @@
-/*	$NetBSD: gtmr.c,v 1.35 2018/09/16 13:21:36 jmcneill Exp $	*/
+/*	$NetBSD: gtmr.c,v 1.36 2018/09/30 10:34:38 skrll Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas
+ *
  * 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: gtmr.c,v 1.35 2018/09/16 13:21:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.36 2018/09/30 10:34:38 skrll Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/kernel.h>
 #include <sys/percpu.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/timetc.h>
 #include <prop/proplib.h>
 @@ -110,32 +110,26 @@ gtmr_attach(device_t parent, device_t se
 	KASSERT(sc->sc_freq != 0);
 	humanize_number(freqbuf, sizeof(freqbuf), sc->sc_freq, "Hz", 1000);
 	aprint_naive("\n");
 	aprint_normal(": ARM Generic Timer (%s)\n", freqbuf);
 	if (prop_dictionary_get_bool(dict, "sun50i-a64-unstable-timer", &flag) && flag) {
 		sc->sc_flags |= GTMR_FLAG_SUN50I_A64_UNSTABLE_TIMER;
 		aprint_debug_dev(self, "enabling Allwinner A64 timer workaround\n");
+	}
 	/*
 	 * Enable the virtual counter to be accessed from usermode.
 	 */
 	gtmr_cntk_ctl_write(gtmr_cntk_ctl_read() |
 	    CNTKCTL_PL0VCTEN | CNTKCTL_PL0PCTEN);
 	self->dv_private = sc;
 	sc->sc_dev = self;
 #ifdef DIAGNOSTIC
 	sc->sc_percpu = percpu_alloc(sizeof(struct gtmr_percpu));
 #endif
 	evcnt_attach_dynamic(&sc->sc_ev_missing_ticks, EVCNT_TYPE_MISC, NULL,
 	    device_xname(self), "missing interrupts");
 	if (mpcaa->mpcaa_irq != -1) {
 		sc->sc_global_ih = intr_establish(mpcaa->mpcaa_irq, IPL_CLOCK,
 		    IST_LEVEL | IST_MPSAFE, gtmr_intr, NULL);
 @@ -185,26 +179,33 @@ gtmr_read_cntvct(struct gtmr_softc *sc)
 	return gtmr_cntvct_read();
+}
 void
 gtmr_init_cpu_clock(struct cpu_info *ci)
+{
 	struct gtmr_softc * const sc = &gtmr_sc;
 	KASSERT(ci == curcpu());
 	int s = splsched();
 	/*
 	 * Allow the virtual and physical counters to be accessed from
 	 * usermode. (PL0)
 	 */
 	gtmr_cntk_ctl_write(gtmr_cntk_ctl_read() |
 	    CNTKCTL_PL0VCTEN | CNTKCTL_PL0PCTEN);
 	/*
 	 * enable timer and stop masking the timer.
 	 */
 	gtmr_cntv_ctl_write(CNTCTL_ENABLE);
 	/*
 	 * Get now and update the compare timer.
 	 */
 	arm_isb();
 	ci->ci_lastintr = gtmr_read_cntvct(sc);
 	gtmr_cntv_tval_write(sc->sc_autoinc);
 	splx(s);
 	KASSERT(gtmr_read_cntvct(sc) != 0);
+}