 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.5 2010/08/08 16:58:41 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.6 2010/08/09 04:18:48 jruoho Exp $ */
 /*-
  * Copyright (c) 2010 Jukka Ruohonen <jruohonen@iki.fi>
  * 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
 @@ -17,27 +17,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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: acpi_cpu_md.c,v 1.5 2010/08/08 16:58:41 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.6 2010/08/09 04:18:48 jruoho Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kcore.h>
 #include <sys/sysctl.h>
 #include <sys/xcall.h>
 #include <x86/cpu.h>
 #include <x86/cpufunc.h>
 #include <x86/cputypes.h>
 #include <x86/cpuvar.h>
 #include <x86/cpu_msr.h>
 #include <x86/machdep.h>
 @@ -206,56 +206,40 @@ acpicpu_md_idle_enter(int method, int st
 			x86_enable_intr();
 			return;
+		}
 		x86_stihlt();
 		break;
+	}
+}
 int
 acpicpu_md_pstate_start(void)
+{
-	switch (cpu_vendor) {
+	cpu_freq_sysctl_get = acpicpu_md_pstate_sysctl_get;
 	cpu_freq_sysctl_set = acpicpu_md_pstate_sysctl_set;
-	case CPUVENDOR_INTEL:
+	cpu_freq_sysctl_all = acpicpu_md_pstate_sysctl_all;
 		est_sysctl_get = acpicpu_md_pstate_sysctl_get;
 		est_sysctl_set = acpicpu_md_pstate_sysctl_set;
 		est_sysctl_all = acpicpu_md_pstate_sysctl_all;
 		break;
 	default:
 		return ENODEV;
 	return 0;
+}
 int
 acpicpu_md_pstate_stop(void)
+{
-	switch (cpu_vendor) {
+	cpu_freq_sysctl_get = NULL;
 	cpu_freq_sysctl_set = NULL;
-	case CPUVENDOR_INTEL:
+	cpu_freq_sysctl_all = NULL;
 		est_sysctl_get = NULL;
 		est_sysctl_set = NULL;
 		est_sysctl_all = NULL;
 		break;
 	default:
 		return ENODEV;
 	return 0;
+}
 static int
 acpicpu_md_pstate_sysctl_get(SYSCTLFN_ARGS)
+{
 	struct cpu_info *ci = curcpu();
 	struct acpicpu_softc *sc;
 	struct sysctlnode node;
 	uint32_t freq;
 	int err;

 @@ -1,14 +1,14 @@
-/* 	$NetBSD: cpuvar.h,v 1.35 2010/08/08 16:58:42 jruoho Exp $ */
+/* 	$NetBSD: cpuvar.h,v 1.36 2010/08/09 04:18:48 jruoho Exp $ */
 /*-
  * Copyright (c) 2000, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by RedBack Networks Inc.
+ *
  * Author: Bill Sommerfeld
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -132,28 +132,28 @@ void coretemp_register(struct cpu_info *
 #ifdef INTEL_ONDEMAND_CLOCKMOD
 void clockmod_init(void);
 #endif
 #ifdef ENHANCED_SPEEDSTEP
 void	est_init(int);
 int	via_get_bus_clock(struct cpu_info *);
 int	viac7_get_bus_clock(struct cpu_info *);
 int	p3_get_bus_clock(struct cpu_info *);
 int	p4_get_bus_clock(struct cpu_info *);
 #endif
-extern int (*est_sysctl_get)(SYSCTLFN_PROTO);
+extern int (*cpu_freq_sysctl_get)(SYSCTLFN_PROTO);
-extern int (*est_sysctl_set)(SYSCTLFN_PROTO);
+extern int (*cpu_freq_sysctl_set)(SYSCTLFN_PROTO);
-extern int (*est_sysctl_all)(SYSCTLFN_PROTO);
+extern int (*cpu_freq_sysctl_all)(SYSCTLFN_PROTO);
 void	cpu_get_tsc_freq(struct cpu_info *);
 void	pat_init(struct cpu_info *);
 extern int cpu_vendor;
 extern bool x86_mp_online;
 extern uint32_t cpu_feature[5];
 #endif /* _KERNEL */
 #endif /* !_X86_CPUVAR_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.c,v 1.74 2010/08/04 10:02:12 jruoho Exp $	*/
+/*	$NetBSD: cpu.c,v 1.75 2010/08/09 04:18:48 jruoho Exp $	*/
 /*-
  * Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Bill Sommerfeld of RedBack Networks Inc, and by Andrew Doran.
+ *
  * 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.
 @@ -52,27 +52,27 @@
  * 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 AUTHOR AND 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: cpu.c,v 1.74 2010/08/04 10:02:12 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.75 2010/08/09 04:18:48 jruoho Exp $");
 #include "opt_ddb.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
 #include "opt_mtrr.h"
 #include "lapic.h"
 #include "ioapic.h"
 #ifdef i386
 #include "npx.h"
 #endif
 #include <sys/param.h>
 @@ -175,26 +175,30 @@ uint32_t cpu_feature[5]; /* X86 CPUID fe
 			  *	[1] basic features %ecx
 			  *	[2] extended features %edx
 			  *	[3] extended features %ecx
 			  *	[4] VIA padlock features
 			  */
 extern char x86_64_doubleflt_stack[];
 bool x86_mp_online;
 paddr_t mp_trampoline_paddr = MP_TRAMPOLINE;
 static vaddr_t cmos_data_mapping;
 struct cpu_info *cpu_starting;
 int (*cpu_freq_sysctl_get)(SYSCTLFN_PROTO) = NULL;
 int (*cpu_freq_sysctl_set)(SYSCTLFN_PROTO) = NULL;
 int (*cpu_freq_sysctl_all)(SYSCTLFN_PROTO) = NULL;
 void    	cpu_hatch(void *);
 static void    	cpu_boot_secondary(struct cpu_info *ci);
 static void    	cpu_start_secondary(struct cpu_info *ci);
 static void	cpu_copy_trampoline(void);
 /*
  * Runs once per boot once multiprocessor goo has been detected and
  * the local APIC on the boot processor has been mapped.
+ *
  * Called from lapic_boot_init() (from mpbios_scan()).
  */
 void
 cpu_init_first(void)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: est.c,v 1.16 2010/08/08 16:58:42 jruoho Exp $	*/
+/*	$NetBSD: est.c,v 1.17 2010/08/09 04:18:49 jruoho Exp $	*/
 /*
  * Copyright (c) 2003 Michael Eriksson.
  * 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.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -71,27 +71,27 @@
  *   Table 3-4, 3-5, 3-6, Voltage and Current Specifications.
  *   http://www.intel.com/design/mobile/datashts/302189.htm
+ *
  * - Linux cpufreq patches, speedstep-centrino.c.
  *   Encoding of MSR_PERF_CTL and MSR_PERF_STATUS.
  *   http://www.codemonkey.org.uk/projects/cpufreq/cpufreq-2.4.22-pre6-1.gz
+ *
  *   ACPI objects: _PCT is MSR location, _PSS is freq/voltage, _PPC is caps.
  */
 /* #define EST_DEBUG */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: est.c,v 1.16 2010/08/08 16:58:42 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: est.c,v 1.17 2010/08/09 04:18:49 jruoho Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 #include <sys/once.h>
 #include <sys/xcall.h>
 #include <x86/cpuvar.h>
 #include <x86/cputypes.h>
 #include <x86/cpu_msr.h>
 @@ -1002,58 +1002,54 @@ static char		*freq_names;
 static struct fqlist    fake_fqlist;
 static int 		est_node_target, est_node_current;
 static const char 	est_desc[] = "Enhanced SpeedStep";
 static int		lvendor, bus_clock;
 static int		est_init_once(void);
 static void		est_init_main(int);
 static int		est_sysctl_helper(SYSCTLFN_PROTO);
 static int		est_sysctl_helper_get(SYSCTLFN_PROTO);
 static int		est_sysctl_helper_set(SYSCTLFN_PROTO);
 static int		est_sysctl_helper_all(SYSCTLFN_PROTO);
 int (*est_sysctl_get)(SYSCTLFN_PROTO) = NULL;
 int (*est_sysctl_set)(SYSCTLFN_PROTO) = NULL;
 int (*est_sysctl_all)(SYSCTLFN_PROTO) = NULL;
 static int
 est_sysctl_helper_get(SYSCTLFN_ARGS)
+{
-	if (est_sysctl_get != NULL)
+	if (cpu_freq_sysctl_get != NULL)
-		return (*est_sysctl_get)(SYSCTLFN_CALL(rnode));
+		return (*cpu_freq_sysctl_get)(SYSCTLFN_CALL(rnode));
 	return est_sysctl_helper(SYSCTLFN_CALL(rnode));
+}
 static int
 est_sysctl_helper_set(SYSCTLFN_ARGS)
+{
-	if (est_sysctl_set != NULL)
+	if (cpu_freq_sysctl_set != NULL)
-		return (*est_sysctl_set)(SYSCTLFN_CALL(rnode));
+		return (*cpu_freq_sysctl_set)(SYSCTLFN_CALL(rnode));
 	return est_sysctl_helper(SYSCTLFN_CALL(rnode));
+}
 static int
 est_sysctl_helper_all(SYSCTLFN_ARGS)
+{
 	struct sysctlnode node;
 	int err;
-	if (est_sysctl_all != NULL)
+	if (cpu_freq_sysctl_all != NULL)
-		return (*est_sysctl_all)(SYSCTLFN_CALL(rnode));
+		return (*cpu_freq_sysctl_all)(SYSCTLFN_CALL(rnode));
 	if (freq_names == NULL)
 		return ENXIO;
 	node = *rnode;
 	node.sysctl_data = freq_names;
 	err = sysctl_lookup(SYSCTLFN_CALL(&node));
 	if (err != 0 || newp == NULL)
 		return err;
 	return 0;