Skip to content

Commit fcf2778

Browse files
ardbiesheuvelherbertx
authored andcommitted
crypto: arm/crct10dif - Use existing mov_l macro instead of __adrl
Reviewed-by: Eric Biggers <[email protected]> Signed-off-by: Ard Biesheuvel <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
1 parent 779cee8 commit fcf2778

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

arch/arm/crypto/crct10dif-ce-core.S

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,6 @@ CPU_LE( vrev64.8 q12, q12 )
144144
veor.8 \dst_reg, \dst_reg, \src_reg
145145
.endm
146146

147-
.macro __adrl, out, sym
148-
movw \out, #:lower16:\sym
149-
movt \out, #:upper16:\sym
150-
.endm
151-
152147
//
153148
// u16 crc_t10dif_pmull(u16 init_crc, const u8 *buf, size_t len);
154149
//
@@ -160,7 +155,7 @@ ENTRY(crc_t10dif_pmull)
160155
cmp len, #256
161156
blt .Lless_than_256_bytes
162157

163-
__adrl fold_consts_ptr, .Lfold_across_128_bytes_consts
158+
mov_l fold_consts_ptr, .Lfold_across_128_bytes_consts
164159

165160
// Load the first 128 data bytes. Byte swapping is necessary to make
166161
// the bit order match the polynomial coefficient order.
@@ -262,7 +257,7 @@ CPU_LE( vrev64.8 q0, q0 )
262257
vswp q0l, q0h
263258

264259
// q1 = high order part of second chunk: q7 left-shifted by 'len' bytes.
265-
__adrl r3, .Lbyteshift_table + 16
260+
mov_l r3, .Lbyteshift_table + 16
266261
sub r3, r3, len
267262
vld1.8 {q2}, [r3]
268263
vtbl.8 q1l, {q7l-q7h}, q2l
@@ -324,7 +319,7 @@ CPU_LE( vrev64.8 q0, q0 )
324319
.Lless_than_256_bytes:
325320
// Checksumming a buffer of length 16...255 bytes
326321

327-
__adrl fold_consts_ptr, .Lfold_across_16_bytes_consts
322+
mov_l fold_consts_ptr, .Lfold_across_16_bytes_consts
328323

329324
// Load the first 16 data bytes.
330325
vld1.64 {q7}, [buf]!

0 commit comments

Comments
 (0)