Subject: Re: linux-next: manual merge of the tip tree with the crypto-current tree

From: Ben Hutchings <[email-masked]>
Date: Fri, 09 Oct 2015 02:52:27 +0100

On Fri, 2015-10-09 at 12:47 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   arch/x86/crypto/camellia_aesni_avx_glue.c
> 
> between commit:
> 
>   92b279070dd6 ("crypto: camellia_aesni_avx - Fix CPU feature checks")
> 
> from the crypto-current tree and commit:
> 
>   d91cab78133d ("x86/fpu: Rename XSAVE macros")
> 
> from the tip tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

> --- a/arch/x86/crypto/camellia_aesni_avx_glue.c
> +++ b/arch/x86/crypto/camellia_aesni_avx_glue.c
> @@@ -554,12 -554,8 +554,14 @@@ static int __init camellia_aesni_init(v
>   {
>         const char *feature_name;
>   
>  +      if (!cpu_has_avx || !cpu_has_aes || !cpu_has_osxsave) {
>  +              pr_info("AVX or AES-NI instructions are not detected.\n");
>  +              return -ENODEV;
>  +      }
>  +
>  +      if (!cpu_has_xfeatures(XSTATE_SSE | XSTATE_YMM, &feature_name)) {
> +       if (!cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM,
> +                               &feature_name)) {

Eh, that's not going to work.  You need to keep the second
if (!cpu_has_xfeatures()) condition and delete the first.

Ben.

>                 pr_info("CPU feature '%s' is not supported.\n", feature_name);
>                 return -ENODEV;
>         }
-- 
Ben Hutchings
If the facts do not conform to your theory, they must be disposed of.