Module Name: src
Committed By: jruoho
Date: Fri Mar 4 12:10:50 UTC 2011
Modified Files:
src/sys/arch/x86/acpi: acpi_cpu_md.c
src/sys/dev/acpi: acpi_cpu.h
Log Message:
Rename a badly named constant. Make it correspond with <x86/specialreg.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/x86/acpi/acpi_cpu_md.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/acpi/acpi_cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/acpi/acpi_cpu_md.c
diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.52 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.53
--- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.52 Wed Mar 2 06:23:17 2011
+++ src/sys/arch/x86/acpi/acpi_cpu_md.c Fri Mar 4 12:10:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.52 2011/03/02 06:23:17 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.53 2011/03/04 12:10:49 jruoho Exp $ */
/*-
* Copyright (c) 2010, 2011 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.52 2011/03/02 06:23:17 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.53 2011/03/04 12:10:49 jruoho Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -179,7 +179,7 @@
x86_cpuid(0x00000006, regs);
if ((regs[2] & CPUID_DSPM_HWF) != 0)
- val |= ACPICPU_PDC_P_HW;
+ val |= ACPICPU_PDC_P_HWF;
}
return val;
@@ -248,7 +248,7 @@
x86_cpuid(0x00000006, regs);
if ((regs[2] & CPUID_DSPM_HWF) != 0)
- val |= ACPICPU_FLAG_P_HW;
+ val |= ACPICPU_FLAG_P_HWF;
if ((regs[0] & CPUID_DSPM_IDA) != 0)
val |= ACPICPU_FLAG_P_TURBO;
@@ -338,7 +338,7 @@
x86_cpuid(0x00000006, regs);
if ((regs[2] & CPUID_DSPM_HWF) != 0)
- val |= ACPICPU_FLAG_P_HW;
+ val |= ACPICPU_FLAG_P_HWF;
}
break;
@@ -500,7 +500,7 @@
/*
* Reset the APERF and MPERF counters.
*/
- if ((sc->sc_flags & ACPICPU_FLAG_P_HW) != 0)
+ if ((sc->sc_flags & ACPICPU_FLAG_P_HWF) != 0)
acpicpu_md_pstate_percent_reset(sc);
return acpicpu_md_pstate_sysctl_init();
@@ -658,7 +658,7 @@
if (__predict_false((sc->sc_flags & ACPICPU_FLAG_P) == 0))
return 0;
- if (__predict_false((sc->sc_flags & ACPICPU_FLAG_P_HW) == 0))
+ if (__predict_false((sc->sc_flags & ACPICPU_FLAG_P_HWF) == 0))
return 0;
aperf = sc->sc_pstate_aperf;
@@ -687,7 +687,7 @@
uint64_t xc;
KASSERT((sc->sc_flags & ACPICPU_FLAG_P) != 0);
- KASSERT((sc->sc_flags & ACPICPU_FLAG_P_HW) != 0);
+ KASSERT((sc->sc_flags & ACPICPU_FLAG_P_HWF) != 0);
msr.msr_value = 0;
msr.msr_read = false;
Index: src/sys/dev/acpi/acpi_cpu.h
diff -u src/sys/dev/acpi/acpi_cpu.h:1.35 src/sys/dev/acpi/acpi_cpu.h:1.36
--- src/sys/dev/acpi/acpi_cpu.h:1.35 Tue Mar 1 04:35:48 2011
+++ src/sys/dev/acpi/acpi_cpu.h Fri Mar 4 12:10:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu.h,v 1.35 2011/03/01 04:35:48 jruoho Exp $ */
+/* $NetBSD: acpi_cpu.h,v 1.36 2011/03/04 12:10:50 jruoho Exp $ */
/*-
* Copyright (c) 2010, 2011 Jukka Ruohonen <jruoho...@iki.fi>
@@ -50,7 +50,7 @@
#define ACPICPU_PDC_T_SW __BIT(7) /* SMP Tx (different) */
#define ACPICPU_PDC_C_C1_FFH __BIT(8) /* SMP C1 native beyond halt */
#define ACPICPU_PDC_C_C2C3_FFH __BIT(9) /* SMP C2 and C2 native */
-#define ACPICPU_PDC_P_HW __BIT(11) /* Px hardware coordination */
+#define ACPICPU_PDC_P_HWF __BIT(11) /* Px hardware feedback */
#define ACPICPU_PDC_GAS_HW __BIT(0) /* HW-coordinated state */
#define ACPICPU_PDC_GAS_BM __BIT(1) /* Bus master check required */
@@ -114,7 +114,7 @@
#define ACPICPU_FLAG_P_FFH __BIT(13) /* Native P-states */
#define ACPICPU_FLAG_P_DEP __BIT(14) /* P-state CPU coordination */
-#define ACPICPU_FLAG_P_HW __BIT(15) /* HW coordination supported */
+#define ACPICPU_FLAG_P_HWF __BIT(15) /* HW feedback supported */
#define ACPICPU_FLAG_P_XPSS __BIT(16) /* Microsoft XPSS in use */
#define ACPICPU_FLAG_P_TURBO __BIT(17) /* Turbo Boost / Turbo Core */
#define ACPICPU_FLAG_P_FIDVID __BIT(18) /* AMD "FID/VID algorithm" */
