diff options
| author |  Uros Bizjak <ubizjak@gmail.com>
| 2020-07-09 17:08:57 +0200 |
|---|---|---|
| committer |  Herbert Xu <herbert@gondor.apana.org.au>
| 2020-07-16 21:49:07 +1000 |
| commit | d7866e503bdca854e6bc64521f030404d7cab642 (patch) | |
| tree | dbac9ae33c05a64b014151bd0f42d963f23dde3b /arch/x86/crypto/crc32c-pcl-intel-asm_64.S | |
| parent | crypto: ccp - Silence strncpy warning (diff) | |
| download | linux-d7866e503bdca854e6bc64521f030404d7cab642.tar.gz linux-d7866e503bdca854e6bc64521f030404d7cab642.tar.bz2 linux-d7866e503bdca854e6bc64521f030404d7cab642.zip | |
crypto: x86 - Remove include/asm/inst.h
Current minimum required version of binutils is 2.23,
which supports PSHUFB, PCLMULQDQ, PEXTRD, AESKEYGENASSIST,
AESIMC, AESENC, AESENCLAST, AESDEC, AESDECLAST and MOVQ
instruction mnemonics.
Substitute macros from include/asm/inst.h with a proper
instruction mnemonics in various assmbly files from
x86/crypto directory, and remove now unneeded file.
The patch was tested by calculating and comparing sha256sum
hashes of stripped object files before and after the patch,
to be sure that executable code didn't change.
Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
CC: Herbert Xu <herbert@gondor.apana.org.au>
CC: "David S. Miller" <davem@davemloft.net>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Ingo Molnar <mingo@redhat.com>
CC: Borislav Petkov <bp@alien8.de>
CC: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/x86/crypto/crc32c-pcl-intel-asm_64.S')
| -rw-r--r-- | arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S index 8501ec4532f4..d84c8bf64f02 100644 --- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S +++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S @@ -43,7 +43,6 @@ * SOFTWARE. */ -#include <asm/inst.h> #include <linux/linkage.h> #include <asm/nospec-branch.h> @@ -225,10 +224,10 @@ LABEL crc_ %i subq %rax, tmp # tmp -= rax*24 movq crc_init, %xmm1 # CRC for block 1 - PCLMULQDQ 0x00,%xmm0,%xmm1 # Multiply by K2 + pclmulqdq $0x00, %xmm0, %xmm1 # Multiply by K2 movq crc1, %xmm2 # CRC for block 2 - PCLMULQDQ 0x10, %xmm0, %xmm2 # Multiply by K1 + pclmulqdq $0x10, %xmm0, %xmm2 # Multiply by K1 pxor %xmm2,%xmm1 movq %xmm1, %rax |