aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/crypto/aesni-intel_asm.S
diff options
context:
space:
mode:
authorMathias Krause <minipli@googlemail.com>2010-11-28 19:35:39 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2010-11-28 19:35:39 -0500
commit559ad0ff1368baea14dbc3207d55b02bd69bda4b (patch)
treec1f329dd3b3084e0df26cc6436586265f79bf838 /arch/x86/crypto/aesni-intel_asm.S
parentc762be637503b833012457087133c1292fd6056d (diff)
crypto: aesni-intel - Fixed build error on x86-32
Exclude AES-GCM code for x86-32 due to heavy usage of 64-bit registers not available on x86-32. While at it, fixed unregister order in aesni_exit(). Signed-off-by: Mathias Krause <minipli@googlemail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/x86/crypto/aesni-intel_asm.S')
-rw-r--r--arch/x86/crypto/aesni-intel_asm.S5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
index f592e03dc375..d528fde219d2 100644
--- a/arch/x86/crypto/aesni-intel_asm.S
+++ b/arch/x86/crypto/aesni-intel_asm.S
@@ -32,6 +32,7 @@
32#include <linux/linkage.h> 32#include <linux/linkage.h>
33#include <asm/inst.h> 33#include <asm/inst.h>
34 34
35#ifdef __x86_64__
35.data 36.data
36POLY: .octa 0xC2000000000000000000000000000001 37POLY: .octa 0xC2000000000000000000000000000001
37TWOONE: .octa 0x00000001000000000000000000000001 38TWOONE: .octa 0x00000001000000000000000000000001
@@ -84,6 +85,7 @@ enc: .octa 0x2
84#define arg8 STACK_OFFSET+16(%r14) 85#define arg8 STACK_OFFSET+16(%r14)
85#define arg9 STACK_OFFSET+24(%r14) 86#define arg9 STACK_OFFSET+24(%r14)
86#define arg10 STACK_OFFSET+32(%r14) 87#define arg10 STACK_OFFSET+32(%r14)
88#endif
87 89
88 90
89#define STATE1 %xmm0 91#define STATE1 %xmm0
@@ -130,6 +132,7 @@ enc: .octa 0x2
130#endif 132#endif
131 133
132 134
135#ifdef __x86_64__
133/* GHASH_MUL MACRO to implement: Data*HashKey mod (128,127,126,121,0) 136/* GHASH_MUL MACRO to implement: Data*HashKey mod (128,127,126,121,0)
134* 137*
135* 138*
@@ -1255,7 +1258,7 @@ _return_T_done_encrypt:
1255 pop %r13 1258 pop %r13
1256 pop %r12 1259 pop %r12
1257 ret 1260 ret
1258 1261#endif
1259 1262
1260 1263
1261_key_expansion_128: 1264_key_expansion_128: