 @@ -1,14 +1,14 @@
-/*	$NetBSD: tsc.c,v 1.21 2008/11/25 15:40:30 ad Exp $	*/
+/*	$NetBSD: tsc.c,v 1.22 2008/12/15 12:46:28 ad Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, 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.
 @@ -17,51 +17,54 @@
  * ``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: tsc.c,v 1.21 2008/11/25 15:40:30 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.22 2008/12/15 12:46:28 ad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/timetc.h>
 #include <sys/lwp.h>
 #include <sys/atomic.h>
 #include <sys/kernel.h>
 #include <sys/cpu.h>
 #include <machine/cpu_counter.h>
 #include <machine/cpuvar.h>
 #include <machine/cpufunc.h>
 #include <machine/specialreg.h>
 #include <machine/cputypes.h>
 #include "tsc.h"
 u_int	tsc_get_timecount(struct timecounter *);
 uint64_t	tsc_freq;
 int64_t		tsc_drift_max = 250;	/* max cycles */
 int64_t		tsc_drift_observed;
 static volatile int64_t	tsc_sync_val;
 static volatile struct cpu_info	*tsc_sync_cpu;
 static struct timecounter tsc_timecounter = {
 	.tc_get_timecount = tsc_get_timecount,
 	.tc_counter_mask = ~0U,
 	.tc_name = "TSC",
 	.tc_quality = 3000,
 };
 void
 tsc_tc_init(void)
+{
 	struct cpu_info *ci;
 	uint32_t descs[4];
 	bool safe;
 @@ -158,69 +161,77 @@ tsc_sync_drift(int64_t drift)
 	if (drift > tsc_drift_observed)
 		tsc_drift_observed = drift;
+}
 /*
  * Called during startup of APs, by the boot processor.  Interrupts
  * are disabled on entry.
  */
 void
 tsc_sync_bp(struct cpu_info *ci)
+{
 	uint64_t tsc;
-	/* Clear remote result, pending later update. */
+	if (atomic_swap_ptr(&tsc_sync_cpu, ci) != NULL) {
-	ci->ci_data.cpu_cc_skew = 0x7fffffffffffffffLL;
+		panic("tsc_sync_bp: 1");
+	}
 	/* Flag it and read our TSC. */
 	atomic_or_uint(&ci->ci_flags, CPUF_SYNCTSC);
 	tsc = rdmsr(MSR_TSC) >> 1;
 	/* Wait for remote to complete, and read ours again. */
 	while ((ci->ci_flags & CPUF_SYNCTSC) != 0) {
 		__insn_barrier();
+	}
 	tsc += (rdmsr(MSR_TSC) >> 1);
 	/* Wait for the results to come in. */
-	while (ci->ci_data.cpu_cc_skew == 0x7fffffffffffffffLL) {
+	while (tsc_sync_cpu == ci) {
 		x86_pause();
+	}
 	if (tsc_sync_cpu != NULL) {
 		panic("tsc_sync_bp: 2");
+	}
 	/* Compute final value to adjust for skew. */
-	ci->ci_data.cpu_cc_skew = tsc - ci->ci_data.cpu_cc_skew;
+	ci->ci_data.cpu_cc_skew = tsc - tsc_sync_val;
+}
 /*
  * Called during startup of AP, by the AP itself.  Interrupts are
  * disabled on entry.
  */
 void
 tsc_sync_ap(struct cpu_info *ci)
+{
 	uint64_t tsc;
 	/* Wait for go-ahead from primary. */
 	while ((ci->ci_flags & CPUF_SYNCTSC) == 0) {
 		__insn_barrier();
+	}
 	tsc = (rdmsr(MSR_TSC) >> 1);
 	/* Instruct primary to read its counter. */
 	atomic_and_uint(&ci->ci_flags, ~CPUF_SYNCTSC);
 	tsc += (rdmsr(MSR_TSC) >> 1);
 	/* Post result.  Ensure the whole value goes out atomically. */
-	(void)atomic_swap_64(&ci->ci_data.cpu_cc_skew, tsc);
+	(void)atomic_swap_64(&tsc_sync_val, tsc);
 	if (atomic_swap_ptr(&tsc_sync_cpu, NULL) != ci) {
 		panic("tsc_sync_ap");
+	}
+}
 uint64_t
 cpu_frequency(struct cpu_info *ci)
+{
 	return ci->ci_data.cpu_cc_freq;
+}
 int
 cpu_hascounter(void)
+{