diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-05-08 10:46:22 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-11 15:08:01 +0800 |
| commit | 6499e8cfaa8f5d041b20af24d8409dec9f3ac3d0 (patch) | |
| tree | 4a5b9fdec8e3932b44fc2ea0dd8d0e739630bb7c /arch/arm/crypto | |
| parent | c80ae7ca372606a3971dcdfa3420275cf17ef6b6 (diff) | |
| download | op-kernel-dev-6499e8cfaa8f5d041b20af24d8409dec9f3ac3d0.zip op-kernel-dev-6499e8cfaa8f5d041b20af24d8409dec9f3ac3d0.tar.gz | |
crypto: arm/aes - streamline AES-192 code path
This trims off a couple of instructions of the total size of the
core AES transform by reordering the final branch in the AES-192
code path with the rounds that are performed regardless of whether
the branch is taken or not. Other than the slight size reduction,
this has no performance benefit.
Fix up a comment regarding the prototype of this function while
we're at it.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/arm/crypto')
| -rw-r--r-- | arch/arm/crypto/aes-ce-core.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/crypto/aes-ce-core.S b/arch/arm/crypto/aes-ce-core.S index 8cfa468..987aa63 100644 --- a/arch/arm/crypto/aes-ce-core.S +++ b/arch/arm/crypto/aes-ce-core.S @@ -101,15 +101,14 @@ \dround q10, q11 blo 0f @ AES-128: 10 rounds vld1.8 {q10-q11}, [ip]! - beq 1f @ AES-192: 12 rounds \dround q12, q13 + beq 1f @ AES-192: 12 rounds vld1.8 {q12-q13}, [ip] \dround q10, q11 0: \fround q12, q13, q14 bx lr -1: \dround q12, q13 - \fround q10, q11, q14 +1: \fround q10, q11, q14 bx lr .endm @@ -122,8 +121,8 @@ * q2 : third in/output block (_3x version only) * q8 : first round key * q9 : secound round key - * ip : address of 3rd round key * q14 : final round key + * r2 : address of round key array * r3 : number of rounds */ .align 6 |
