x86: Populate COMMON_CPUID_INDEX_80000001 for Intel CPUs [BZ #23459]

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
	[BZ #23459]
	* sysdeps/x86/cpu-features.c (get_extended_indices): New
	function.
	(init_cpu_features): Call get_extended_indices for both Intel
	and AMD CPUs.
	* sysdeps/x86/cpu-features.h (COMMON_CPUID_INDEX_80000001):
	Remove "for AMD" comment.

(cherry picked from commit be525a69a6630abc83144c0a96474f2e26da7443)

diff --git a/ChangeLog b/ChangeLog
index 831579524d6a9624c4955b4631a2a45d6fad4551..7e22bd1dfcd95e96276bc9d5be850172d1fdb6b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-07-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+       [BZ #23459]
+       * sysdeps/x86/cpu-features.c (get_extended_indices): New
+       function.
+       (init_cpu_features): Call get_extended_indices for both Intel
+       and AMD CPUs.
+       * sysdeps/x86/cpu-features.h (COMMON_CPUID_INDEX_80000001):
+       Remove "for AMD" comment.
+
 2018-07-29  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #23456]

diff --git a/NEWS b/NEWS
index e0c11b1ea96486841498aeedbd4e9f17a61a1334..61ac02cd691fefe659b1e96ac48212b309a43aa9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -148,6 +148,7 @@ The following bugs are resolved with this release:
   [23349] Various glibc headers no longer compatible with <linux/time.h>
   [23363] stdio-common/tst-printf.c has non-free license
   [23456] Wrong index_cpu_LZCNT
+  [23459] COMMON_CPUID_INDEX_80000001 isn't populated for Intel processors
 \f
 Version 2.26
 

diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
index 87aaa8683ccd300392f75d8c2023180ed82d1511..a66d468b20982d697e37687bbfda7cf5649d4f86 100644 (file)
--- a/sysdeps/x86/cpu-features.c
+++ b/sysdeps/x86/cpu-features.c
@@ -30,6 +30,20 @@ extern void TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *)
   attribute_hidden;
 #endif
 
+static void
+get_extended_indices (struct cpu_features *cpu_features)
+{
+  unsigned int eax, ebx, ecx, edx;
+  __cpuid (0x80000000, eax, ebx, ecx, edx);
+  if (eax >= 0x80000001)
+    __cpuid (0x80000001,
+            cpu_features->cpuid[COMMON_CPUID_INDEX_80000001].eax,
+            cpu_features->cpuid[COMMON_CPUID_INDEX_80000001].ebx,
+            cpu_features->cpuid[COMMON_CPUID_INDEX_80000001].ecx,
+            cpu_features->cpuid[COMMON_CPUID_INDEX_80000001].edx);
+
+}
+
 static void
 get_common_indeces (struct cpu_features *cpu_features,
                    unsigned int *family, unsigned int *model,
@@ -205,6 +219,8 @@ init_cpu_features (struct cpu_features *cpu_features)
       get_common_indeces (cpu_features, &family, &model, &extended_model,
                          &stepping);
 
+      get_extended_indices (cpu_features);
+
       if (family == 0x06)
        {
          model += extended_model;
@@ -324,16 +340,9 @@ init_cpu_features (struct cpu_features *cpu_features)
       get_common_indeces (cpu_features, &family, &model, &extended_model,
                          &stepping);
 
-      ecx = cpu_features->cpuid[COMMON_CPUID_INDEX_1].ecx;
+      get_extended_indices (cpu_features);
 
-      unsigned int eax;
-      __cpuid (0x80000000, eax, ebx, ecx, edx);
-      if (eax >= 0x80000001)
-       __cpuid (0x80000001,
-                cpu_features->cpuid[COMMON_CPUID_INDEX_80000001].eax,
-                cpu_features->cpuid[COMMON_CPUID_INDEX_80000001].ebx,
-                cpu_features->cpuid[COMMON_CPUID_INDEX_80000001].ecx,
-                cpu_features->cpuid[COMMON_CPUID_INDEX_80000001].edx);
+      ecx = cpu_features->cpuid[COMMON_CPUID_INDEX_1].ecx;
 
       if (HAS_ARCH_FEATURE (AVX_Usable))
        {

diff --git a/sysdeps/x86/cpu-features.h b/sysdeps/x86/cpu-features.h
index a6fae060143201af601a064f14a3185796251b96..e4eb6bf41a4dff1e7508a7932f2254f9ab08475e 100644 (file)
--- a/sysdeps/x86/cpu-features.h
+++ b/sysdeps/x86/cpu-features.h
@@ -196,7 +196,7 @@ enum
   {
     COMMON_CPUID_INDEX_1 = 0,
     COMMON_CPUID_INDEX_7,
-    COMMON_CPUID_INDEX_80000001,       /* for AMD */
+    COMMON_CPUID_INDEX_80000001,
     /* Keep the following line at the end.  */
     COMMON_CPUID_INDEX_MAX
   };