diff mbox

Fixed family and model detection for AMD CPU's

Message ID CAMe9rOocLpTK8aevo7j-Xf5zqgVRN9Fd7bn6NW980aqo7yLQdQ@mail.gmail.com
State New, archived
Headers

Commit Message

H.J. Lu Nov. 24, 2015, 1:22 p.m. UTC 
  On Tue, Nov 24, 2015 at 2:58 AM, Pawar, Amit <Amit.Pawar@amd.com> wrote:
> Please find the attached recreated patch to this mail. Bugzilla ID included in Glibc Changelog and git commit log.
>
> Problem: In GLIBC Family and model values detection are incorrect.
> Why this fix?
> Based on arch ISA flags string and memory routines are selected. In future patches, will be defining ISA flags based on family
> and model values which will help in selecting the correct string or memory routines.
>
> Is it OK to apply?
>

Try this one instead.

Comments

Pawar, Amit Nov. 25, 2015, 5:17 a.m. UTC | #1 
Changes are done as per the suggestion. Can you or someone please apply this attached patch on behalf of me?

Thanks,
Amit Pawar

-----Original Message-----
From: H.J. Lu [mailto:hjl.tools@gmail.com] 

Sent: Tuesday, November 24, 2015 6:53 PM
To: Pawar, Amit
Cc: Joseph Myers; Florian Weimer; libc-alpha@sourceware.org
Subject: Re: [PATCH] Fixed family and model detection for AMD CPU's

On Tue, Nov 24, 2015 at 2:58 AM, Pawar, Amit <Amit.Pawar@amd.com> wrote:
> Please find the attached recreated patch to this mail. Bugzilla ID included in Glibc Changelog and git commit log.

>

> Problem: In GLIBC Family and model values detection are incorrect.

> Why this fix?

> Based on arch ISA flags string and memory routines are selected. In 

> future patches, will be defining ISA flags based on family and model values which will help in selecting the correct string or memory routines.

>

> Is it OK to apply?

>


Try this one instead.

--
H.J.
diff mbox

Patch

diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
index b03451d..fba3ef0 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;