Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't look at CPUID_TM in cpu_feature if vendor is AMD because it has a 

totally different meaning...  (Namely, Long Mode ability, which is, well,
expected on family 15 models.)
This commit is contained in:
cube 2006-10-08 23:58:14 +00:00
parent d189b90166
commit a109a81207
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/i386/i386/identcpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: identcpu.c,v 1.45 2006/10/08 15:50:42 cube Exp $ */ /* $NetBSD: identcpu.c,v 1.46 2006/10/08 23:58:14 cube Exp $ */
/*- /*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc. * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.45 2006/10/08 15:50:42 cube Exp $"); __KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.46 2006/10/08 23:58:14 cube Exp $");
#include "opt_cputype.h" #include "opt_cputype.h"
#include "opt_enhanced_speedstep.h" #include "opt_enhanced_speedstep.h"
@ -1461,7 +1461,7 @@ identifycpu(struct cpu_info *ci)
x86_print_cacheinfo(ci); x86_print_cacheinfo(ci);
if (cpu_feature & CPUID_TM) { if (vendor != CPUVENDOR_AMD && (cpu_feature & CPUID_TM)) {
if (rdmsr(MSR_MISC_ENABLE) & (1 << 3)) { if (rdmsr(MSR_MISC_ENABLE) & (1 << 3)) {
if ((cpu_feature2 & CPUID2_TM2) && if ((cpu_feature2 & CPUID2_TM2) &&
(rdmsr(MSR_THERM2_CTL) & (1 << 16))) (rdmsr(MSR_THERM2_CTL) & (1 << 16)))