* linux-next: manual merge of the tip tree with the crypto-current tree
@ 2015-10-09 1:47 Stephen Rothwell
2015-10-09 1:52 ` Ben Hutchings
2015-10-09 2:09 ` Stephen Rothwell
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2015-10-09 1:47 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Ben Hutchings, Dave Hansen
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/crypto/camellia_aesni_avx_glue.c
index bacaa13acac5,12e729bfe71b..000000000000
--- 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)) {
pr_info("CPU feature '%s' is not supported.\n", feature_name);
return -ENODEV;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the tip tree with the crypto-current tree
2015-10-09 1:47 linux-next: manual merge of the tip tree with the crypto-current tree Stephen Rothwell
@ 2015-10-09 1:52 ` Ben Hutchings
2015-10-09 2:09 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Ben Hutchings @ 2015-10-09 1:52 UTC (permalink / raw)
To: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra
Cc: linux-next, linux-kernel, Dave Hansen
[-- Attachment #1: Type: text/plain, Size: 1495 bytes --]
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.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 811 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the tip tree with the crypto-current tree
2015-10-09 1:47 linux-next: manual merge of the tip tree with the crypto-current tree Stephen Rothwell
2015-10-09 1:52 ` Ben Hutchings
@ 2015-10-09 2:09 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2015-10-09 2:09 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Ben Hutchings, Dave Hansen
Hi all,
On Fri, 9 Oct 2015 12:47:00 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> diff --cc arch/x86/crypto/camellia_aesni_avx_glue.c
> index bacaa13acac5,12e729bfe71b..000000000000
> --- 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)) {
OOPS, I clearly meant to remove that line as well (which I have now done).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-09 2:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-09 1:47 linux-next: manual merge of the tip tree with the crypto-current tree Stephen Rothwell
2015-10-09 1:52 ` Ben Hutchings
2015-10-09 2:09 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).