 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_cpufreq.c,v 1.5 2011/10/20 06:48:24 jruoho Exp $ */
+/*	$NetBSD: subr_cpufreq.c,v 1.6 2011/10/25 11:35:49 jruoho Exp $ */
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jukka Ruohonen.
+ *
  * 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
 @@ -20,27 +20,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``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: subr_cpufreq.c,v 1.5 2011/10/20 06:48:24 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cpufreq.c,v 1.6 2011/10/25 11:35:49 jruoho Exp $");
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/cpufreq.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/time.h>
 #include <sys/xcall.h>
 static int	 cpufreq_latency(void);
 static uint32_t	 cpufreq_get_max(void);
 static uint32_t	 cpufreq_get_min(void);
 static uint32_t	 cpufreq_get_raw(struct cpu_info *);
 @@ -146,68 +146,68 @@ cpufreq_register(struct cpufreq *cf)
 void
 cpufreq_deregister(void)
+{
 	mutex_enter(&cpufreq_lock);
 	memset(cf_backend, 0, sizeof(*cf_backend));
 	mutex_exit(&cpufreq_lock);
+}
 static int
 cpufreq_latency(void)
+{
 	struct cpufreq *cf = cf_backend;
-	struct timespec nta, ntb;
+	struct timeval nta, ntb;
 	const uint32_t n = 10;
 	uint32_t i, j, l, m;
 	uint64_t s;
 	l = cpufreq_get_min();
 	m = cpufreq_get_max();
 	/*
 	 * For each state, sample the average transition
 	 * latency required to set the state for all CPUs.
 	 */
 	for (i = 0; i < cf->cf_state_count; i++) {
 		for (s = 0, j = 0; j < n; j++) {
 			/*
 			 * Attempt to exclude possible
 			 * caching done by the backend.
 			 */
 			if (i == 0)
 				cpufreq_set_all_raw(l);
 			else {
 				cpufreq_set_all_raw(m);
+			}
-			nta.tv_sec = nta.tv_nsec = 0;
+			nta.tv_sec = nta.tv_usec = 0;
-			ntb.tv_sec = ntb.tv_nsec = 0;
+			ntb.tv_sec = ntb.tv_usec = 0;
-			nanotime(&nta);
+			microtime(&nta);
 			cpufreq_set_all_raw(cf->cf_state[i].cfs_freq);
-			nanotime(&ntb);
+			microtime(&ntb);
-			timespecsub(&ntb, &nta, &ntb);
+			timersub(&ntb, &nta, &ntb);
 			if (ntb.tv_sec != 0 ||
-			    ntb.tv_nsec > CPUFREQ_LATENCY_MAX)
+			    ntb.tv_usec > CPUFREQ_LATENCY_MAX)
 				continue;
 			if (s >= UINT64_MAX - CPUFREQ_LATENCY_MAX)
 				break;
-			s += ntb.tv_nsec;
+			s += ntb.tv_usec;
+		}
 		/*
 		 * Consider the backend unsuitable if
 		 * the transition latency was too high.
 		 */
 		if (s == 0)
 			return EMSGSIZE;
 		cf->cf_state[i].cfs_latency = s / n;
+	}
 	return 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpufreq.h,v 1.3 2011/09/30 04:01:21 jruoho Exp $ */
+/*	$NetBSD: cpufreq.h,v 1.4 2011/10/25 11:35:49 jruoho Exp $ */
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jukka Ruohonen.
+ *
  * 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
 @@ -34,35 +34,35 @@
 #ifndef _KERNEL
 #include <stdbool.h>
 #endif
 #ifdef _KERNEL
 #ifndef _SYS_XCALL_H_
 #include <sys/xcall.h>
 #endif
 #endif
 #define CPUFREQ_NAME_MAX	 16
 #define CPUFREQ_STATE_MAX	 32
-#define CPUFREQ_LATENCY_MAX	 UINT16_MAX	  /* Maximum per-CPU latency */
+#define CPUFREQ_LATENCY_MAX	 UINT16_MAX
 #define CPUFREQ_STATE_ENABLED	 UINT32_MAX
 #define CPUFREQ_STATE_DISABLED	 UINT32_MAX - 1
 struct cpufreq_state {
 	uint32_t		 cfs_freq;	  /* MHz  */
 	uint32_t		 cfs_power;	  /* mW   */
-	uint32_t		 cfs_latency;	  /* nsec */
+	uint32_t		 cfs_latency;	  /* usec */
 	uint32_t		 cfs_index;
 	uint32_t		 cfs_reserved[5];
 };
 struct cpufreq {
 	char			 cf_name[CPUFREQ_NAME_MAX];
 	uint32_t		 cf_state_count;
 	uint32_t		 cf_state_target;
 	uint32_t		 cf_state_current;
 	uint32_t		 cf_reserved[5];
 	u_int			 cf_index;
 #ifdef _KERNEL