diff options
author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2013-01-19 06:38:55 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-01-19 18:16:47 -0500 |
commit | 8309b745bbaf3fe3df7fc67de51d0049b51452c5 (patch) | |
tree | 22e9120030d3ae87a06bbc4cc12dd9e251ae0cc5 /arch/x86/crypto | |
parent | 3f299743839ae0a4c183035c36aa1e2807e53fe4 (diff) |
crypto: aesni-intel - add ENDPROC statements for assembler functions
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/x86/crypto')
-rw-r--r-- | arch/x86/crypto/aesni-intel_asm.S | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S index 3470624d7835..04b797767b9e 100644 --- a/arch/x86/crypto/aesni-intel_asm.S +++ b/arch/x86/crypto/aesni-intel_asm.S | |||
@@ -1262,7 +1262,6 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst | |||
1262 | * poly = x^128 + x^127 + x^126 + x^121 + 1 | 1262 | * poly = x^128 + x^127 + x^126 + x^121 + 1 |
1263 | * | 1263 | * |
1264 | *****************************************************************************/ | 1264 | *****************************************************************************/ |
1265 | |||
1266 | ENTRY(aesni_gcm_dec) | 1265 | ENTRY(aesni_gcm_dec) |
1267 | push %r12 | 1266 | push %r12 |
1268 | push %r13 | 1267 | push %r13 |
@@ -1437,6 +1436,7 @@ _return_T_done_decrypt: | |||
1437 | pop %r13 | 1436 | pop %r13 |
1438 | pop %r12 | 1437 | pop %r12 |
1439 | ret | 1438 | ret |
1439 | ENDPROC(aesni_gcm_dec) | ||
1440 | 1440 | ||
1441 | 1441 | ||
1442 | /***************************************************************************** | 1442 | /***************************************************************************** |
@@ -1700,10 +1700,12 @@ _return_T_done_encrypt: | |||
1700 | pop %r13 | 1700 | pop %r13 |
1701 | pop %r12 | 1701 | pop %r12 |
1702 | ret | 1702 | ret |
1703 | ENDPROC(aesni_gcm_enc) | ||
1703 | 1704 | ||
1704 | #endif | 1705 | #endif |
1705 | 1706 | ||
1706 | 1707 | ||
1708 | .align 4 | ||
1707 | _key_expansion_128: | 1709 | _key_expansion_128: |
1708 | _key_expansion_256a: | 1710 | _key_expansion_256a: |
1709 | pshufd $0b11111111, %xmm1, %xmm1 | 1711 | pshufd $0b11111111, %xmm1, %xmm1 |
@@ -1715,6 +1717,8 @@ _key_expansion_256a: | |||
1715 | movaps %xmm0, (TKEYP) | 1717 | movaps %xmm0, (TKEYP) |
1716 | add $0x10, TKEYP | 1718 | add $0x10, TKEYP |
1717 | ret | 1719 | ret |
1720 | ENDPROC(_key_expansion_128) | ||
1721 | ENDPROC(_key_expansion_256a) | ||
1718 | 1722 | ||
1719 | .align 4 | 1723 | .align 4 |
1720 | _key_expansion_192a: | 1724 | _key_expansion_192a: |
@@ -1739,6 +1743,7 @@ _key_expansion_192a: | |||
1739 | movaps %xmm1, 0x10(TKEYP) | 1743 | movaps %xmm1, 0x10(TKEYP) |
1740 | add $0x20, TKEYP | 1744 | add $0x20, TKEYP |
1741 | ret | 1745 | ret |
1746 | ENDPROC(_key_expansion_192a) | ||
1742 | 1747 | ||
1743 | .align 4 | 1748 | .align 4 |
1744 | _key_expansion_192b: | 1749 | _key_expansion_192b: |
@@ -1758,6 +1763,7 @@ _key_expansion_192b: | |||
1758 | movaps %xmm0, (TKEYP) | 1763 | movaps %xmm0, (TKEYP) |
1759 | add $0x10, TKEYP | 1764 | add $0x10, TKEYP |
1760 | ret | 1765 | ret |
1766 | ENDPROC(_key_expansion_192b) | ||
1761 | 1767 | ||
1762 | .align 4 | 1768 | .align 4 |
1763 | _key_expansion_256b: | 1769 | _key_expansion_256b: |
@@ -1770,6 +1776,7 @@ _key_expansion_256b: | |||
1770 | movaps %xmm2, (TKEYP) | 1776 | movaps %xmm2, (TKEYP) |
1771 | add $0x10, TKEYP | 1777 | add $0x10, TKEYP |
1772 | ret | 1778 | ret |
1779 | ENDPROC(_key_expansion_256b) | ||
1773 | 1780 | ||
1774 | /* | 1781 | /* |
1775 | * int aesni_set_key(struct crypto_aes_ctx *ctx, const u8 *in_key, | 1782 | * int aesni_set_key(struct crypto_aes_ctx *ctx, const u8 *in_key, |
@@ -1882,6 +1889,7 @@ ENTRY(aesni_set_key) | |||
1882 | popl KEYP | 1889 | popl KEYP |
1883 | #endif | 1890 | #endif |
1884 | ret | 1891 | ret |
1892 | ENDPROC(aesni_set_key) | ||
1885 | 1893 | ||
1886 | /* | 1894 | /* |
1887 | * void aesni_enc(struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src) | 1895 | * void aesni_enc(struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src) |
@@ -1903,6 +1911,7 @@ ENTRY(aesni_enc) | |||
1903 | popl KEYP | 1911 | popl KEYP |
1904 | #endif | 1912 | #endif |
1905 | ret | 1913 | ret |
1914 | ENDPROC(aesni_enc) | ||
1906 | 1915 | ||
1907 | /* | 1916 | /* |
1908 | * _aesni_enc1: internal ABI | 1917 | * _aesni_enc1: internal ABI |
@@ -1960,6 +1969,7 @@ _aesni_enc1: | |||
1960 | movaps 0x70(TKEYP), KEY | 1969 | movaps 0x70(TKEYP), KEY |
1961 | AESENCLAST KEY STATE | 1970 | AESENCLAST KEY STATE |
1962 | ret | 1971 | ret |
1972 | ENDPROC(_aesni_enc1) | ||
1963 | 1973 | ||
1964 | /* | 1974 | /* |
1965 | * _aesni_enc4: internal ABI | 1975 | * _aesni_enc4: internal ABI |
@@ -2068,6 +2078,7 @@ _aesni_enc4: | |||
2068 | AESENCLAST KEY STATE3 | 2078 | AESENCLAST KEY STATE3 |
2069 | AESENCLAST KEY STATE4 | 2079 | AESENCLAST KEY STATE4 |
2070 | ret | 2080 | ret |
2081 | ENDPROC(_aesni_enc4) | ||
2071 | 2082 | ||
2072 | /* | 2083 | /* |
2073 | * void aesni_dec (struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src) | 2084 | * void aesni_dec (struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src) |
@@ -2090,6 +2101,7 @@ ENTRY(aesni_dec) | |||
2090 | popl KEYP | 2101 | popl KEYP |
2091 | #endif | 2102 | #endif |
2092 | ret | 2103 | ret |
2104 | ENDPROC(aesni_dec) | ||
2093 | 2105 | ||
2094 | /* | 2106 | /* |
2095 | * _aesni_dec1: internal ABI | 2107 | * _aesni_dec1: internal ABI |
@@ -2147,6 +2159,7 @@ _aesni_dec1: | |||
2147 | movaps 0x70(TKEYP), KEY | 2159 | movaps 0x70(TKEYP), KEY |
2148 | AESDECLAST KEY STATE | 2160 | AESDECLAST KEY STATE |
2149 | ret | 2161 | ret |
2162 | ENDPROC(_aesni_dec1) | ||
2150 | 2163 | ||
2151 | /* | 2164 | /* |
2152 | * _aesni_dec4: internal ABI | 2165 | * _aesni_dec4: internal ABI |
@@ -2255,6 +2268,7 @@ _aesni_dec4: | |||
2255 | AESDECLAST KEY STATE3 | 2268 | AESDECLAST KEY STATE3 |
2256 | AESDECLAST KEY STATE4 | 2269 | AESDECLAST KEY STATE4 |
2257 | ret | 2270 | ret |
2271 | ENDPROC(_aesni_dec4) | ||
2258 | 2272 | ||
2259 | /* | 2273 | /* |
2260 | * void aesni_ecb_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src, | 2274 | * void aesni_ecb_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src, |
@@ -2312,6 +2326,7 @@ ENTRY(aesni_ecb_enc) | |||
2312 | popl LEN | 2326 | popl LEN |
2313 | #endif | 2327 | #endif |
2314 | ret | 2328 | ret |
2329 | ENDPROC(aesni_ecb_enc) | ||
2315 | 2330 | ||
2316 | /* | 2331 | /* |
2317 | * void aesni_ecb_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src, | 2332 | * void aesni_ecb_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src, |
@@ -2370,6 +2385,7 @@ ENTRY(aesni_ecb_dec) | |||
2370 | popl LEN | 2385 | popl LEN |
2371 | #endif | 2386 | #endif |
2372 | ret | 2387 | ret |
2388 | ENDPROC(aesni_ecb_dec) | ||
2373 | 2389 | ||
2374 | /* | 2390 | /* |
2375 | * void aesni_cbc_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src, | 2391 | * void aesni_cbc_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src, |
@@ -2411,6 +2427,7 @@ ENTRY(aesni_cbc_enc) | |||
2411 | popl IVP | 2427 | popl IVP |
2412 | #endif | 2428 | #endif |
2413 | ret | 2429 | ret |
2430 | ENDPROC(aesni_cbc_enc) | ||
2414 | 2431 | ||
2415 | /* | 2432 | /* |
2416 | * void aesni_cbc_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src, | 2433 | * void aesni_cbc_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src, |
@@ -2501,6 +2518,7 @@ ENTRY(aesni_cbc_dec) | |||
2501 | popl IVP | 2518 | popl IVP |
2502 | #endif | 2519 | #endif |
2503 | ret | 2520 | ret |
2521 | ENDPROC(aesni_cbc_dec) | ||
2504 | 2522 | ||
2505 | #ifdef __x86_64__ | 2523 | #ifdef __x86_64__ |
2506 | .align 16 | 2524 | .align 16 |
@@ -2527,6 +2545,7 @@ _aesni_inc_init: | |||
2527 | MOVQ_R64_XMM TCTR_LOW INC | 2545 | MOVQ_R64_XMM TCTR_LOW INC |
2528 | MOVQ_R64_XMM CTR TCTR_LOW | 2546 | MOVQ_R64_XMM CTR TCTR_LOW |
2529 | ret | 2547 | ret |
2548 | ENDPROC(_aesni_inc_init) | ||
2530 | 2549 | ||
2531 | /* | 2550 | /* |
2532 | * _aesni_inc: internal ABI | 2551 | * _aesni_inc: internal ABI |
@@ -2555,6 +2574,7 @@ _aesni_inc: | |||
2555 | movaps CTR, IV | 2574 | movaps CTR, IV |
2556 | PSHUFB_XMM BSWAP_MASK IV | 2575 | PSHUFB_XMM BSWAP_MASK IV |
2557 | ret | 2576 | ret |
2577 | ENDPROC(_aesni_inc) | ||
2558 | 2578 | ||
2559 | /* | 2579 | /* |
2560 | * void aesni_ctr_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src, | 2580 | * void aesni_ctr_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src, |
@@ -2615,4 +2635,5 @@ ENTRY(aesni_ctr_enc) | |||
2615 | movups IV, (IVP) | 2635 | movups IV, (IVP) |
2616 | .Lctr_enc_just_ret: | 2636 | .Lctr_enc_just_ret: |
2617 | ret | 2637 | ret |
2638 | ENDPROC(aesni_ctr_enc) | ||
2618 | #endif | 2639 | #endif |