Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1242987 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-10-09 03:50 +0200 |
| Last post | 2015-10-09 04:10 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the tip tree with the crypto-current tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-09 03:50 +0200
Re: linux-next: manual merge of the tip tree with the crypto-current tree Ben Hutchings <ben@decadent.org.uk> - 2015-10-09 04:00 +0200
Re: linux-next: manual merge of the tip tree with the crypto-current tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-09 04:10 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-10-09 03:50 +0200 |
| Subject | linux-next: manual merge of the tip tree with the crypto-current tree |
| Message-ID | <qhuYO-4mT-3@gated-at.bofh.it> |
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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Ben Hutchings <ben@decadent.org.uk> |
|---|---|
| Date | 2015-10-09 04:00 +0200 |
| Subject | Re: linux-next: manual merge of the tip tree with the crypto-current tree |
| Message-ID | <qhv8u-4y8-3@gated-at.bofh.it> |
| In reply to | #1242987 |
[Multipart message — attachments visible in raw view] — view raw
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.
[toc] | [prev] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-10-09 04:10 +0200 |
| Subject | Re: linux-next: manual merge of the tip tree with the crypto-current tree |
| Message-ID | <qhvi9-4YJ-3@gated-at.bofh.it> |
| In reply to | #1242987 |
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web