d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use newly introduced cpu_vendor_id to make invariant TSC detection more

Browse Source 
clearer and merge r185295 to amd64.
This commit is contained in:
Jung-uk Kim 2008-11-26 19:29:33 +00:00
parent 5113aa0af3
commit 0eec8b9141
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/amd64/amd64/identcpu.c
View File

@ -360,14 +360,20 @@ printcpuinfo(void)
* If this CPU supports P-state invariant TSC then
* mention the capability.
*/
if (!tsc_is_invariant &&
(cpu_vendor_id == CPU_VENDOR_AMD &&
((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 ||
AMD64_CPU_FAMILY(cpu_id) >= 0x10 ||
cpu_id == 0x60fb2))) {
tsc_is_invariant = 1;
printf("\n TSC: P-state invariant");
switch (cpu_vendor_id) {
case CPU_VENDOR_AMD:
if ((amd_pminfo & AMDPM_TSC_INVARIANT) ||
AMD64_CPU_FAMILY(cpu_id) >= 0x10 ||
cpu_id == 0x60fb2)
tsc_is_invariant = 1;
break;
case CPU_VENDOR_INTEL:
if (amd_pminfo & AMDPM_TSC_INVARIANT)
tsc_is_invariant = 1;
break;
}
if (tsc_is_invariant)
printf("\n TSC: P-state invariant");
/*
* If this CPU supports HTT or CMP then mention the

21
sys/i386/i386/identcpu.c
View File

@ -864,15 +864,20 @@ printcpuinfo(void)
* If this CPU supports P-state invariant TSC then
* mention the capability.
*/
if (!tsc_is_invariant &&
((cpu_vendor_id == CPU_VENDOR_AMD ||
cpu_vendor_id == CPU_VENDOR_INTEL) &&
((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 ||
I386_CPU_FAMILY(cpu_id) >= 0x10 ||
cpu_id == 0x60fb2))) {
tsc_is_invariant = 1;
printf("\n TSC: P-state invariant");
switch (cpu_vendor_id) {
case CPU_VENDOR_AMD:
if ((amd_pminfo & AMDPM_TSC_INVARIANT) ||
I386_CPU_FAMILY(cpu_id) >= 0x10 ||
cpu_id == 0x60fb2)
tsc_is_invariant = 1;
break;
case CPU_VENDOR_INTEL:
if (amd_pminfo & AMDPM_TSC_INVARIANT)
tsc_is_invariant = 1;
break;
}
if (tsc_is_invariant)
printf("\n TSC: P-state invariant");
/*
* If this CPU supports HTT or CMP then mention the