svn commit: r216272 - in head/sys: amd64/amd64 i386/i386

John Baldwin jhb at freebsd.org
Tue Dec 7 22:22:40 UTC 2010


On Tuesday, December 07, 2010 5:12:02 pm Jung-uk Kim wrote:
> Author: jkim
> Date: Tue Dec  7 22:12:02 2010
> New Revision: 216272
> URL: http://svn.freebsd.org/changeset/base/216272
> 
> Log:
>   Probe P-state invariant TSC from rightful place.
> 
> Modified:
>   head/sys/amd64/amd64/identcpu.c
>   head/sys/amd64/amd64/tsc.c
>   head/sys/i386/i386/identcpu.c
>   head/sys/i386/i386/tsc.c
> 
> Modified: head/sys/amd64/amd64/identcpu.c
> 
==============================================================================
> --- head/sys/amd64/amd64/identcpu.c	Tue Dec  7 22:00:48 2010	(r216271)
> +++ head/sys/amd64/amd64/identcpu.c	Tue Dec  7 22:12:02 2010	(r216272)
> @@ -392,28 +392,6 @@ printcpuinfo(void)
>  			 * If this CPU supports P-state invariant TSC then
>  			 * mention the capability.
>  			 */
> -			switch (cpu_vendor_id) {
> -			case CPU_VENDOR_AMD:
> -				if ((amd_pminfo & AMDPM_TSC_INVARIANT) ||
> -				    CPUID_TO_FAMILY(cpu_id) >= 0x10 ||
> -				    cpu_id == 0x60fb2)
> -					tsc_is_invariant = 1;
> -				break;
> -			case CPU_VENDOR_INTEL:
> -				if ((amd_pminfo & AMDPM_TSC_INVARIANT) ||
> -				    (CPUID_TO_FAMILY(cpu_id) == 0x6 &&
> -				    CPUID_TO_MODEL(cpu_id) >= 0xe) ||
> -				    (CPUID_TO_FAMILY(cpu_id) == 0xf &&
> -				    CPUID_TO_MODEL(cpu_id) >= 0x3))
> -					tsc_is_invariant = 1;
> -				break;
> -			case CPU_VENDOR_CENTAUR:
> -				if (CPUID_TO_FAMILY(cpu_id) == 0x6 &&
> -				    CPUID_TO_MODEL(cpu_id) >= 0xf &&
> -				    (rdmsr(0x1203) & 0x100000000ULL) == 0)
> -					tsc_is_invariant = 1;
> -				break;
> -			}
>  			if (tsc_is_invariant)
>  				printf("\n  TSC: P-state invariant");

Doesn't that break this printf?

-- 
John Baldwin


More information about the svn-src-head mailing list