Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 564ec0ec authored by Huang Ying's avatar Huang Ying Committed by Herbert Xu
Browse files

crypto: ghash-clmulni-intel - Use gas macro for PCLMULQDQ-NI and PSHUFB 



Old binutils do not support PCLMULQDQ-NI and PSHUFB, to make kernel
can be compiled by them, .byte code is used instead of assembly
instructions. But the readability and flexibility of raw .byte code is
not good.

So corresponding assembly instruction like gas macro is used instead.

Signed-off-by: default avatarHuang Ying <ying.huang@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent b369e521

arch/x86/crypto/ghash-clmulni-intel_asm.S

+10 −19
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
 */

 */





#include <linux/linkage.h>

#include <linux/linkage.h>

#include <asm/i387.h>

#include <asm/inst.h>





.align 16

.align 16

.Lbswap_mask:

.Lbswap_mask:
@@ -56,12 +56,9 @@ __clmul_gf128mul_ble: 
	pxor DATA, T2

	pxor DATA, T2

	pxor SHASH, T3

	pxor SHASH, T3





	# pclmulqdq $0x00, SHASH, DATA	# DATA = a0 * b0

	PCLMULQDQ 0x00 SHASH DATA	# DATA = a0 * b0

	.byte 0x66, 0x0f, 0x3a, 0x44, 0xc1, 0x00

	PCLMULQDQ 0x11 SHASH T1		# T1 = a1 * b1

	# pclmulqdq $0x11, SHASH, T1	# T1 = a1 * b1

	PCLMULQDQ 0x00 T3 T2		# T2 = (a1 + a0) * (b1 + b0)

	.byte 0x66, 0x0f, 0x3a, 0x44, 0xd1, 0x11

	# pclmulqdq $0x00, T3, T2	# T2 = (a1 + a0) * (b1 + b0)

	.byte 0x66, 0x0f, 0x3a, 0x44, 0xdc, 0x00

	pxor DATA, T2

	pxor DATA, T2

	pxor T1, T2			# T2 = a0 * b1 + a1 * b0

	pxor T1, T2			# T2 = a0 * b1 + a1 * b0
@@ -101,11 +98,9 @@ ENTRY(clmul_ghash_mul) 
	movups (%rdi), DATA

	movups (%rdi), DATA

	movups (%rsi), SHASH

	movups (%rsi), SHASH

	movaps .Lbswap_mask, BSWAP

	movaps .Lbswap_mask, BSWAP

	# pshufb BSWAP, DATA

	PSHUFB_XMM BSWAP DATA

	PSHUFB_XMM5_XMM0

	call __clmul_gf128mul_ble

	call __clmul_gf128mul_ble

	# pshufb BSWAP, DATA

	PSHUFB_XMM BSWAP DATA

	.byte 0x66, 0x0f, 0x38, 0x00, 0xc5

	movups DATA, (%rdi)

	movups DATA, (%rdi)

	ret

	ret
@@ -119,21 +114,18 @@ ENTRY(clmul_ghash_update) 
	movaps .Lbswap_mask, BSWAP

	movaps .Lbswap_mask, BSWAP

	movups (%rdi), DATA

	movups (%rdi), DATA

	movups (%rcx), SHASH

	movups (%rcx), SHASH

	# pshufb BSWAP, DATA

	PSHUFB_XMM BSWAP DATA

	PSHUFB_XMM5_XMM0

.align 4

.align 4

.Lupdate_loop:

.Lupdate_loop:

	movups (%rsi), IN1

	movups (%rsi), IN1

	# pshufb BSWAP, IN1

	PSHUFB_XMM BSWAP IN1

	PSHUFB_XMM5_XMM6

	pxor IN1, DATA

	pxor IN1, DATA

	call __clmul_gf128mul_ble

	call __clmul_gf128mul_ble

	sub $16, %rdx

	sub $16, %rdx

	add $16, %rsi

	add $16, %rsi

	cmp $16, %rdx

	cmp $16, %rdx

	jge .Lupdate_loop

	jge .Lupdate_loop

	# pshufb BSWAP, DATA

	PSHUFB_XMM BSWAP DATA

	PSHUFB_XMM5_XMM0

	movups DATA, (%rdi)

	movups DATA, (%rdi)

.Lupdate_just_ret:

.Lupdate_just_ret:

	ret

	ret
@@ -146,8 +138,7 @@ ENTRY(clmul_ghash_update) 
ENTRY(clmul_ghash_setkey)

ENTRY(clmul_ghash_setkey)

	movaps .Lbswap_mask, BSWAP

	movaps .Lbswap_mask, BSWAP

	movups (%rsi), %xmm0

	movups (%rsi), %xmm0

	# pshufb BSWAP, %xmm0

	PSHUFB_XMM BSWAP %xmm0

	PSHUFB_XMM5_XMM0

	movaps %xmm0, %xmm1

	movaps %xmm0, %xmm1

	psllq $1, %xmm0

	psllq $1, %xmm0

	psrlq $63, %xmm1

	psrlq $63, %xmm1