libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix /proc/cpuinfo topology info on newer AMD CPUs 

* fhandler_proc.cc (format_proc_cpuinfo): Handle AMDs providing
        extended topology info in CPUID leaf 0x8000001e.  Fix handling of
        AMD CPUs providing extended legacy core info in CPUID leaf 0x80000008.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2015-08-17 16:35:41 +02:00
parent ede983934c
commit 37b6936f8b
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2015-08-17 Corinna Vinschen <corinna@vinschen.de>
* fhandler_proc.cc (format_proc_cpuinfo): Handle AMDs providing
extended topology info in CPUID leaf 0x8000001e. Fix handling of
AMD CPUs providing extended legacy core info in CPUID leaf 0x80000008.
2015-08-17 Orgad Shaneh <orgads@gmail.com> 2015-08-17 Orgad Shaneh <orgads@gmail.com>
* mkglobals_h: Handle CRLF earlier. * mkglobals_h: Handle CRLF earlier.

30
winsup/cygwin/fhandler_proc.cc
View File

@ -896,21 +896,37 @@ format_proc_cpuinfo (void *, char *&destbuf)
} }
else if (is_amd) else if (is_amd)
{ {
if (maxe >= 0x80000008) if (maxe >= 0x8000001e)
{
uint32_t cus, core_info;
cpuid (&unused, &unused, &core_info, &unused, 0x80000008);
cpuid (&unused, &cus, &unused, &unused, 0x8000001e);
siblings = (core_info & 0xff) + 1;
logical_bits = (core_info >> 12) & 0xf;
cus = ((cus >> 8) & 0x3) + 1;
ht_bits = mask_bits (cus);
cpu_cores = siblings >> ht_bits;
}
else if (maxe >= 0x80000008)
{ {
uint32_t core_info; uint32_t core_info;
cpuid (&unused, &unused, &core_info, &unused, 0x80000008); cpuid (&unused, &unused, &core_info, &unused, 0x80000008);
cpu_cores = (core_info & 0xff) + 1; siblings = (core_info & 0xff) + 1;
siblings = cpu_cores; cpu_cores = siblings;
logical_bits = (core_info >> 12) & 0xf;
if (!logical_bits)
logical_bits = mask_bits (siblings);
ht_bits = 0;
} }
else else
{ {
cpu_cores = (extra_info >> 16) & 0xff; siblings = (extra_info >> 16) & 0xff;
siblings = cpu_cores; cpu_cores = siblings;
logical_bits = mask_bits (siblings);
ht_bits = 0;
} }
logical_bits = mask_bits (cpu_cores);
ht_bits = 0;
} }
phys_id = initial_apic_id >> logical_bits; phys_id = initial_apic_id >> logical_bits;
core_id = (initial_apic_id & ((1 << logical_bits) - 1)) >> ht_bits; core_id = (initial_apic_id & ((1 << logical_bits) - 1)) >> ht_bits;