Module Name: src
Committed By: msaitoh
Date: Mon Apr 6 09:24:50 UTC 2020
Modified Files:
src/sys/arch/x86/include: specialreg.h
src/sys/arch/x86/x86: tsc.c
Log Message:
Rename CPUID_APM_TSC to CPUID_APM_ITSC. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/x86/x86/tsc.c
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/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.160 src/sys/arch/x86/include/specialreg.h:1.161
--- src/sys/arch/x86/include/specialreg.h:1.160 Mon Apr 6 02:36:49 2020
+++ src/sys/arch/x86/include/specialreg.h Mon Apr 6 09:24:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: specialreg.h,v 1.160 2020/04/06 02:36:49 msaitoh Exp $ */
+/* $NetBSD: specialreg.h,v 1.161 2020/04/06 09:24:49 msaitoh Exp $ */
/*
* Copyright (c) 2014-2019 The NetBSD Foundation, Inc.
@@ -697,8 +697,10 @@
"\35" "L2IPERFC" "\36" "MWAITX" "\37" "B30" "\40" "B31"
/*
- * AMD Advanced Power Management
+ * Advanced Power Management
* CPUID Fn8000_0007 %edx
+ *
+ * Only ITSC is for both Intel and AMD. Others are only for AMD.
*/
#define CPUID_APM_TS 0x00000001 /* Temperature Sensor */
#define CPUID_APM_FID 0x00000002 /* Frequency ID control */
@@ -708,7 +710,7 @@
#define CPUID_APM_STC 0x00000020 /* Software thermal control (STC) */
#define CPUID_APM_100 0x00000040 /* 100MHz multiplier control */
#define CPUID_APM_HWP 0x00000080 /* HW P-State control */
-#define CPUID_APM_TSC 0x00000100 /* TSC invariant (Intel, too) */
+#define CPUID_APM_ITSC 0x00000100 /* invariant TSC */
#define CPUID_APM_CPB 0x00000200 /* Core performance boost */
#define CPUID_APM_EFF 0x00000400 /* Effective Frequency (read-only) */
#define CPUID_APM_PROCFI 0x00000800 /* Proc Feedback Interface */
Index: src/sys/arch/x86/x86/tsc.c
diff -u src/sys/arch/x86/x86/tsc.c:1.39 src/sys/arch/x86/x86/tsc.c:1.40
--- src/sys/arch/x86/x86/tsc.c:1.39 Fri Apr 3 03:05:39 2020
+++ src/sys/arch/x86/x86/tsc.c Mon Apr 6 09:24:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tsc.c,v 1.39 2020/04/03 03:05:39 knakahara Exp $ */
+/* $NetBSD: tsc.c,v 1.40 2020/04/06 09:24:50 msaitoh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.39 2020/04/03 03:05:39 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.40 2020/04/06 09:24:50 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -135,7 +135,7 @@ tsc_is_invariant(void)
x86_cpuid(0x80000000, descs);
if (descs[0] >= 0x80000007) {
x86_cpuid(0x80000007, descs);
- invariant = (descs[3] & CPUID_APM_TSC) != 0;
+ invariant = (descs[3] & CPUID_APM_ITSC) != 0;
}
}
