diff options
author | jkim <jkim@FreeBSD.org> | 2008-10-22 17:30:37 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2008-10-22 17:30:37 +0000 |
commit | a62bf181b53f6d819c63b2d584ae3c1acedf2b6e (patch) | |
tree | c45b816f5f58210a2af174eaf0580c5a30d0e9fc | |
parent | 3667673537759b789eadce36fa09143b45b442a1 (diff) | |
download | FreeBSD-src-a62bf181b53f6d819c63b2d584ae3c1acedf2b6e.zip FreeBSD-src-a62bf181b53f6d819c63b2d584ae3c1acedf2b6e.tar.gz |
Add AMD Family 0Fh, Model 6Bh, Stepping 2 to the list of invariant TSCs
and fix i386 test.
-rw-r--r-- | sys/amd64/amd64/identcpu.c | 9 | ||||
-rw-r--r-- | sys/i386/i386/identcpu.c | 13 |
2 files changed, 16 insertions, 6 deletions
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c index 5cdb91f..76b0e55 100644 --- a/sys/amd64/amd64/identcpu.c +++ b/sys/amd64/amd64/identcpu.c @@ -347,12 +347,17 @@ printcpuinfo(void) "AuthenticAMD") == 0) cpu_feature &= ~CPUID_HTT; + /* + * If this CPU supports P-state invariant TSC then + * mention the capability. + */ if (!tsc_is_invariant && (strcmp(cpu_vendor, "AuthenticAMD") == 0 && ((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 || - AMD64_CPU_FAMILY(cpu_id) >= 0x10))) { + AMD64_CPU_FAMILY(cpu_id) >= 0x10 || + cpu_id == 0x60fb2))) { tsc_is_invariant = 1; - printf("\n P-state invariant TSC"); + printf("\n TSC: P-state invariant"); } /* diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c index 8f306a1..4e694f2 100644 --- a/sys/i386/i386/identcpu.c +++ b/sys/i386/i386/identcpu.c @@ -841,12 +841,17 @@ printcpuinfo(void) "AuthenticAMD") == 0) cpu_feature &= ~CPUID_HTT; + /* + * If this CPU supports P-state invariant TSC then + * mention the capability. + */ if (!tsc_is_invariant && - ((strcmp(cpu_vendor, "AuthenticAMD") == 0 && - (amd_pminfo & AMDPM_TSC_INVARIANT) != 0) || - I386_CPU_FAMILY(cpu_id) >= 0x10)) { + (strcmp(cpu_vendor, "AuthenticAMD") == 0 && + ((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 || + AMD64_CPU_FAMILY(cpu_id) >= 0x10 || + cpu_id == 0x60fb2))) { tsc_is_invariant = 1; - printf("\n P-state invariant TSC"); + printf("\n TSC: P-state invariant"); } /* |