[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Andy Polyakov]

The branch OpenSSL_1_0_2-stable has been updated
       via  540739d8757f88fe65832b644b0e0077ddb4d6d1 (commit)
      from  f2d779931abd5cbfea249f8290c95b909562d7c7 (commit)


- Log -----------------------------------------------------------------
commit 540739d8757f88fe65832b644b0e0077ddb4d6d1
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun Mar 5 20:38:36 2017 +0100

    crypto/x86_64cpuid.pl: move extended feature detection upwards.
    
    Exteneded feature flags were not pulled on AMD processors, as result a
    number of extensions were effectively masked on Ryzen. It should have
    been reported for Excavator since it implements AVX2 extension, but
    apparently nobody noticed or cared...
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit f8418d87e191e46b81e1b9548326ab2876fa0907)

-----------------------------------------------------------------------

Summary of changes:
 crypto/x86_64cpuid.pl | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/crypto/x86_64cpuid.pl b/crypto/x86_64cpuid.pl
index d208d02..a430ab9 100644
--- a/crypto/x86_64cpuid.pl
+++ b/crypto/x86_64cpuid.pl
@@ -63,6 +63,16 @@ OPENSSL_ia32_cpuid:
 	cpuid
 	mov	%eax,%r11d		# max value for standard query level
 
+	cmp	\$7,%eax
+	jb	.Lno_extended_info
+
+	mov	\$7,%eax
+	xor	%ecx,%ecx
+	cpuid
+	mov	%ebx,8(%rdi)
+
+.Lno_extended_info:
+
 	xor	%eax,%eax
 	cmp	\$0x756e6547,%ebx	# "Genu"
 	setne	%al
@@ -127,14 +137,6 @@ OPENSSL_ia32_cpuid:
 	shr	\$14,%r10d
 	and	\$0xfff,%r10d		# number of cores -1 per L1D
 
-	cmp	\$7,%r11d
-	jb	.Lnocacheinfo
-
-	mov	\$7,%eax
-	xor	%ecx,%ecx
-	cpuid
-	mov	%ebx,8(%rdi)
-
 .Lnocacheinfo:
 	mov	\$1,%eax
 	cpuid