From 0c0c75a824defdab369267916efa9fb10ff1cc5b Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Wed, 22 Oct 2008 17:30:37 +0000 Subject: [PATCH] Add AMD Family 0Fh, Model 6Bh, Stepping 2 to the list of invariant TSCs and fix i386 test. --- sys/amd64/amd64/identcpu.c | 9 +++++++-- 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 5cdb91fbe06f..76b0e55cdac8 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 8f306a11c634..4e694f2e253e 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"); } /*