diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-11-30 08:53:37 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-11-30 09:01:31 -0800 |
| commit | 9627da32ec76600244e7723e99b9d4e27691f1ff (patch) | |
| tree | c7e2715dc3aa3782eb482d20ac6053325c3d312e /sysdeps/x86/cpu-features.c | |
| parent | 5f75f6bdf830e66aa6bd6eef675dbdc144b771c6 (diff) | |
Update family and model detection for AMD CPUs
AMD CPUs uses the similar encoding scheme for extended family and model
as Intel CPUs as shown in:
http://support.amd.com/TechDocs/25481.pdf
This patch updates get_common_indeces to get family and model for both
Intel and AMD CPUs when family == 0x0f.
[BZ #19214]
* sysdeps/x86/cpu-features.c (get_common_indeces): Add an
argument to return extended model. Update family and model
with extended family and model when family == 0x0f.
(init_cpu_features): Updated.
Diffstat (limited to 'sysdeps/x86/cpu-features.c')
| -rw-r--r-- | sysdeps/x86/cpu-features.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c index b03451dde1..fba3ef02a7 100644 --- a/sysdeps/x86/cpu-features.c +++ b/sysdeps/x86/cpu-features.c @@ -21,7 +21,8 @@ static inline void get_common_indeces (struct cpu_features *cpu_features, - unsigned int *family, unsigned int *model) + unsigned int *family, unsigned int *model, + unsigned int *extended_model) { unsigned int eax; __cpuid (1, eax, cpu_features->cpuid[COMMON_CPUID_INDEX_1].ebx, @@ -30,6 +31,12 @@ get_common_indeces (struct cpu_features *cpu_features, GLRO(dl_x86_cpu_features).cpuid[COMMON_CPUID_INDEX_1].eax = eax; *family = (eax >> 8) & 0x0f; *model = (eax >> 4) & 0x0f; + *extended_model = (eax >> 12) & 0xf0; + if (*family == 0x0f) + { + *family += (eax >> 20) & 0xff; + *model += *extended_model; + } } static inline void @@ -53,19 +60,13 @@ init_cpu_features (struct cpu_features *cpu_features) /* This spells out "GenuineIntel". */ if (ebx == 0x756e6547 && ecx == 0x6c65746e && edx == 0x49656e69) { + unsigned int extended_model; + kind = arch_kind_intel; - get_common_indeces (cpu_features, &family, &model); + get_common_indeces (cpu_features, &family, &model, &extended_model); - unsigned int eax = cpu_features->cpuid[COMMON_CPUID_INDEX_1].eax; - unsigned int extended_family = (eax >> 20) & 0xff; - unsigned int extended_model = (eax >> 12) & 0xf0; - if (family == 0x0f) - { - family += extended_family; - model += extended_model; - } - else if (family == 0x06) + if (family == 0x06) { ecx = cpu_features->cpuid[COMMON_CPUID_INDEX_1].ecx; model += extended_model; @@ -132,9 +133,11 @@ init_cpu_features (struct cpu_features *cpu_features) /* This spells out "AuthenticAMD". */ else if (ebx == 0x68747541 && ecx == 0x444d4163 && edx == 0x69746e65) { + unsigned int extended_model; + kind = arch_kind_amd; - get_common_indeces (cpu_features, &family, &model); + get_common_indeces (cpu_features, &family, &model, &extended_model); ecx = cpu_features->cpuid[COMMON_CPUID_INDEX_1].ecx; |