crypto: x86/aegis,morus - Do not require OSXSAVE for SSE2

WOnder93 · herbertx · commit 24568b47d48e · 2018-09-14T14:08:27.000+08:00
It turns out OSXSAVE needs to be checked only for AVX, not for SSE. Without this patch the affected modules refuse to load on CPUs with SSE2 but without AVX support. Fixes: 877ccce ("crypto: x86/aegis,morus - Fix and simplify CPUID checks") Cc: <stable@vger.kernel.org> # 4.18 Reported-by: Zdenek Kaspar <zkaspar82@gmail.com> Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
diff --git a/arch/x86/crypto/aegis128-aesni-glue.c b/arch/x86/crypto/aegis128-aesni-glue.c
@@ -379,7 +379,6 @@ static int __init crypto_aegis128_aesni_module_init(void)
 {
 	if (!boot_cpu_has(X86_FEATURE_XMM2) ||
 	    !boot_cpu_has(X86_FEATURE_AES) ||
-	    !boot_cpu_has(X86_FEATURE_OSXSAVE) ||
 	    !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))
 		return -ENODEV;
 
diff --git a/arch/x86/crypto/aegis128l-aesni-glue.c b/arch/x86/crypto/aegis128l-aesni-glue.c
@@ -379,7 +379,6 @@ static int __init crypto_aegis128l_aesni_module_init(void)
 {
 	if (!boot_cpu_has(X86_FEATURE_XMM2) ||
 	    !boot_cpu_has(X86_FEATURE_AES) ||
-	    !boot_cpu_has(X86_FEATURE_OSXSAVE) ||
 	    !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))
 		return -ENODEV;
 
diff --git a/arch/x86/crypto/aegis256-aesni-glue.c b/arch/x86/crypto/aegis256-aesni-glue.c
@@ -379,7 +379,6 @@ static int __init crypto_aegis256_aesni_module_init(void)
 {
 	if (!boot_cpu_has(X86_FEATURE_XMM2) ||
 	    !boot_cpu_has(X86_FEATURE_AES) ||
-	    !boot_cpu_has(X86_FEATURE_OSXSAVE) ||
 	    !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))
 		return -ENODEV;
 
diff --git a/arch/x86/crypto/morus1280-sse2-glue.c b/arch/x86/crypto/morus1280-sse2-glue.c
@@ -40,7 +40,6 @@ MORUS1280_DECLARE_ALGS(sse2, "morus1280-sse2", 350);
 static int __init crypto_morus1280_sse2_module_init(void)
 {
 	if (!boot_cpu_has(X86_FEATURE_XMM2) ||
-	    !boot_cpu_has(X86_FEATURE_OSXSAVE) ||
 	    !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))
 		return -ENODEV;
 
diff --git a/arch/x86/crypto/morus640-sse2-glue.c b/arch/x86/crypto/morus640-sse2-glue.c
@@ -40,7 +40,6 @@ MORUS640_DECLARE_ALGS(sse2, "morus640-sse2", 400);
 static int __init crypto_morus640_sse2_module_init(void)
 {
 	if (!boot_cpu_has(X86_FEATURE_XMM2) ||
-	    !boot_cpu_has(X86_FEATURE_OSXSAVE) ||
 	    !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))
 		return -ENODEV;
 

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,6 @@ static int __init crypto_aegis128_aesni_module_init(void)`
`379`	`379`	`{`
`380`	`380`	`if (!boot_cpu_has(X86_FEATURE_XMM2) \|\|`
`381`	`381`	`!boot_cpu_has(X86_FEATURE_AES) \|\|`
`382`		`- !boot_cpu_has(X86_FEATURE_OSXSAVE) \|\|`
`383`	`382`	`!cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))`
`384`	`383`	`return -ENODEV;`
`385`	`384`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ MORUS1280_DECLARE_ALGS(sse2, "morus1280-sse2", 350);`
`40`	`40`	`static int __init crypto_morus1280_sse2_module_init(void)`
`41`	`41`	`{`
`42`	`42`	`if (!boot_cpu_has(X86_FEATURE_XMM2) \|\|`
`43`		`- !boot_cpu_has(X86_FEATURE_OSXSAVE) \|\|`
`44`	`43`	`!cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))`
`45`	`44`	`return -ENODEV;`
`46`	`45`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ MORUS640_DECLARE_ALGS(sse2, "morus640-sse2", 400);`
`40`	`40`	`static int __init crypto_morus640_sse2_module_init(void)`
`41`	`41`	`{`
`42`	`42`	`if (!boot_cpu_has(X86_FEATURE_XMM2) \|\|`
`43`		`- !boot_cpu_has(X86_FEATURE_OSXSAVE) \|\|`
`44`	`43`	`!cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL))`
`45`	`44`	`return -ENODEV;`
`46`	`45`