tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

arm64: crypto: Modernize names for AES function macros

Now that the rest of the code has been converted to the modern START/END
macros the AES_ENTRY() and AES_ENDPROC() macros look out of place and
like they need updating. Rename them to AES_FUNC_START() and AES_FUNC_END()
to line up with the modern style assembly macros.

Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

authored by

Mark Brown and committed by
Catalin Marinas b8e50548 2ca86c34

+28 -28
+2 -2
arch/arm64/crypto/aes-ce.S
··· 9 9 #include <linux/linkage.h> 10 10 #include <asm/assembler.h> 11 11 12 - #define AES_ENTRY(func) SYM_FUNC_START(ce_ ## func) 13 - #define AES_ENDPROC(func) SYM_FUNC_END(ce_ ## func) 12 + #define AES_FUNC_START(func) SYM_FUNC_START(ce_ ## func) 13 + #define AES_FUNC_END(func) SYM_FUNC_END(ce_ ## func) 14 14 15 15 .arch armv8-a+crypto 16 16
+24 -24
arch/arm64/crypto/aes-modes.S
··· 51 51 * int blocks) 52 52 */ 53 53 54 - AES_ENTRY(aes_ecb_encrypt) 54 + AES_FUNC_START(aes_ecb_encrypt) 55 55 stp x29, x30, [sp, #-16]! 56 56 mov x29, sp 57 57 ··· 79 79 .Lecbencout: 80 80 ldp x29, x30, [sp], #16 81 81 ret 82 - AES_ENDPROC(aes_ecb_encrypt) 82 + AES_FUNC_END(aes_ecb_encrypt) 83 83 84 84 85 - AES_ENTRY(aes_ecb_decrypt) 85 + AES_FUNC_START(aes_ecb_decrypt) 86 86 stp x29, x30, [sp, #-16]! 87 87 mov x29, sp 88 88 ··· 110 110 .Lecbdecout: 111 111 ldp x29, x30, [sp], #16 112 112 ret 113 - AES_ENDPROC(aes_ecb_decrypt) 113 + AES_FUNC_END(aes_ecb_decrypt) 114 114 115 115 116 116 /* ··· 126 126 * u32 const rk2[]); 127 127 */ 128 128 129 - AES_ENTRY(aes_essiv_cbc_encrypt) 129 + AES_FUNC_START(aes_essiv_cbc_encrypt) 130 130 ld1 {v4.16b}, [x5] /* get iv */ 131 131 132 132 mov w8, #14 /* AES-256: 14 rounds */ ··· 135 135 enc_switch_key w3, x2, x6 136 136 b .Lcbcencloop4x 137 137 138 - AES_ENTRY(aes_cbc_encrypt) 138 + AES_FUNC_START(aes_cbc_encrypt) 139 139 ld1 {v4.16b}, [x5] /* get iv */ 140 140 enc_prepare w3, x2, x6 141 141 ··· 167 167 .Lcbcencout: 168 168 st1 {v4.16b}, [x5] /* return iv */ 169 169 ret 170 - AES_ENDPROC(aes_cbc_encrypt) 171 - AES_ENDPROC(aes_essiv_cbc_encrypt) 170 + AES_FUNC_END(aes_cbc_encrypt) 171 + AES_FUNC_END(aes_essiv_cbc_encrypt) 172 172 173 - AES_ENTRY(aes_essiv_cbc_decrypt) 173 + AES_FUNC_START(aes_essiv_cbc_decrypt) 174 174 stp x29, x30, [sp, #-16]! 175 175 mov x29, sp 176 176 ··· 181 181 encrypt_block cbciv, w8, x6, x7, w9 182 182 b .Lessivcbcdecstart 183 183 184 - AES_ENTRY(aes_cbc_decrypt) 184 + AES_FUNC_START(aes_cbc_decrypt) 185 185 stp x29, x30, [sp, #-16]! 186 186 mov x29, sp 187 187 ··· 238 238 st1 {cbciv.16b}, [x5] /* return iv */ 239 239 ldp x29, x30, [sp], #16 240 240 ret 241 - AES_ENDPROC(aes_cbc_decrypt) 242 - AES_ENDPROC(aes_essiv_cbc_decrypt) 241 + AES_FUNC_END(aes_cbc_decrypt) 242 + AES_FUNC_END(aes_essiv_cbc_decrypt) 243 243 244 244 245 245 /* ··· 249 249 * int rounds, int bytes, u8 const iv[]) 250 250 */ 251 251 252 - AES_ENTRY(aes_cbc_cts_encrypt) 252 + AES_FUNC_START(aes_cbc_cts_encrypt) 253 253 adr_l x8, .Lcts_permute_table 254 254 sub x4, x4, #16 255 255 add x9, x8, #32 ··· 276 276 st1 {v0.16b}, [x4] /* overlapping stores */ 277 277 st1 {v1.16b}, [x0] 278 278 ret 279 - AES_ENDPROC(aes_cbc_cts_encrypt) 279 + AES_FUNC_END(aes_cbc_cts_encrypt) 280 280 281 - AES_ENTRY(aes_cbc_cts_decrypt) 281 + AES_FUNC_START(aes_cbc_cts_decrypt) 282 282 adr_l x8, .Lcts_permute_table 283 283 sub x4, x4, #16 284 284 add x9, x8, #32 ··· 305 305 st1 {v2.16b}, [x4] /* overlapping stores */ 306 306 st1 {v0.16b}, [x0] 307 307 ret 308 - AES_ENDPROC(aes_cbc_cts_decrypt) 308 + AES_FUNC_END(aes_cbc_cts_decrypt) 309 309 310 310 .section ".rodata", "a" 311 311 .align 6 ··· 324 324 * int blocks, u8 ctr[]) 325 325 */ 326 326 327 - AES_ENTRY(aes_ctr_encrypt) 327 + AES_FUNC_START(aes_ctr_encrypt) 328 328 stp x29, x30, [sp, #-16]! 329 329 mov x29, sp 330 330 ··· 409 409 rev x7, x7 410 410 ins vctr.d[0], x7 411 411 b .Lctrcarrydone 412 - AES_ENDPROC(aes_ctr_encrypt) 412 + AES_FUNC_END(aes_ctr_encrypt) 413 413 414 414 415 415 /* ··· 433 433 uzp1 xtsmask.4s, xtsmask.4s, \tmp\().4s 434 434 .endm 435 435 436 - AES_ENTRY(aes_xts_encrypt) 436 + AES_FUNC_START(aes_xts_encrypt) 437 437 stp x29, x30, [sp, #-16]! 438 438 mov x29, sp 439 439 ··· 518 518 st1 {v2.16b}, [x4] /* overlapping stores */ 519 519 mov w4, wzr 520 520 b .Lxtsencctsout 521 - AES_ENDPROC(aes_xts_encrypt) 521 + AES_FUNC_END(aes_xts_encrypt) 522 522 523 - AES_ENTRY(aes_xts_decrypt) 523 + AES_FUNC_START(aes_xts_decrypt) 524 524 stp x29, x30, [sp, #-16]! 525 525 mov x29, sp 526 526 ··· 612 612 st1 {v2.16b}, [x4] /* overlapping stores */ 613 613 mov w4, wzr 614 614 b .Lxtsdecctsout 615 - AES_ENDPROC(aes_xts_decrypt) 615 + AES_FUNC_END(aes_xts_decrypt) 616 616 617 617 /* 618 618 * aes_mac_update(u8 const in[], u32 const rk[], int rounds, 619 619 * int blocks, u8 dg[], int enc_before, int enc_after) 620 620 */ 621 - AES_ENTRY(aes_mac_update) 621 + AES_FUNC_START(aes_mac_update) 622 622 frame_push 6 623 623 624 624 mov x19, x0 ··· 676 676 ld1 {v0.16b}, [x23] /* get dg */ 677 677 enc_prepare w21, x20, x0 678 678 b .Lmacloop4x 679 - AES_ENDPROC(aes_mac_update) 679 + AES_FUNC_END(aes_mac_update)
+2 -2
arch/arm64/crypto/aes-neon.S
··· 8 8 #include <linux/linkage.h> 9 9 #include <asm/assembler.h> 10 10 11 - #define AES_ENTRY(func) SYM_FUNC_START(neon_ ## func) 12 - #define AES_ENDPROC(func) SYM_FUNC_END(neon_ ## func) 11 + #define AES_FUNC_START(func) SYM_FUNC_START(neon_ ## func) 12 + #define AES_FUNC_END(func) SYM_FUNC_END(neon_ ## func) 13 13 14 14 xtsmask .req v7 15 15 cbciv .req v7