crypto: arm64/ghash-ce - use frame_push/pop macros consistently

Use the frame_push and frame_pop macros to set up the stack frame so
that return address protections will be enabled automically when
configured.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/arm64/crypto/ghash-ce-core.S b/arch/arm64/crypto/ghash-ce-core.S
index ebe5558..23ee9a5 100644 (file)
--- a/arch/arm64/crypto/ghash-ce-core.S
+++ b/arch/arm64/crypto/ghash-ce-core.S
@@ -436,9 +436,7 @@ SYM_FUNC_END(pmull_ghash_update_p8)
 
        .align          6
        .macro          pmull_gcm_do_crypt, enc
-       stp             x29, x30, [sp, #-32]!
-       mov             x29, sp
-       str             x19, [sp, #24]
+       frame_push      1
 
        load_round_keys x7, x6, x8
 
@@ -529,7 +527,7 @@ CPU_LE(     rev             w8, w8          )
        .endif
        bne             0b
 
-3:     ldp             x19, x10, [sp, #24]
+3:     ldr             x10, [sp, #.Lframe_local_offset]
        cbz             x10, 5f                         // output tag?
 
        ld1             {INP3.16b}, [x10]               // load lengths[]
@@ -562,7 +560,7 @@ CPU_LE(     rev             w8, w8          )
        smov            w0, v0.b[0]                     // return b0
        .endif
 
-4:     ldp             x29, x30, [sp], #32
+4:     frame_pop
        ret
 
 5: