Correct Intel processor level type mask from CPUID

Intel CPUID with EAX == 11 returns:

ECX Bits 07 - 00: Level number. Same value in ECX input.
    Bits 15 - 08: Level type.
    ^^^^^^^^^^^^^^^^^^^^^^^^ This is level type.
    Bits 31 - 16: Reserved.

Intel processor level type mask should be 0xff00, not 0xff0.

	[BZ #20119]
	* sysdeps/x86/cacheinfo.c (init_cacheinfo): Correct Intel
	processor level type mask for CPUID with EAX == 11.

diff --git a/ChangeLog b/ChangeLog
index 8adf828d1b6f5bde9cf21d94127b490d3476e202..7ba904d0be4f8322e09aa582aa987f2c071076f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-05-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+       [BZ #20119]
+       * sysdeps/x86/cacheinfo.c (init_cacheinfo): Correct Intel
+       processor level type mask for CPUID with EAX == 11.
+
 2016-05-19  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/x86/cacheinfo.c (init_cacheinfo): Skip counting

diff --git a/sysdeps/x86/cacheinfo.c b/sysdeps/x86/cacheinfo.c
index 1f46d9de2012740387a41f5f4285588400306a85..020d3fd3970c9b1f92dc93c364a539443bfd05e3 100644 (file)
--- a/sysdeps/x86/cacheinfo.c
+++ b/sysdeps/x86/cacheinfo.c
@@ -552,7 +552,7 @@ init_cacheinfo (void)
                      __cpuid_count (11, i++, eax, ebx, ecx, edx);
 
                      int shipped = ebx & 0xff;
-                     int type = ecx & 0xff0;
+                     int type = ecx & 0xff00;
                      if (shipped == 0 || type == 0)
                        break;
                      else if (type == 0x200)