| From f73328c3192eb4b93d62673cdfb6c0da502a9d71 Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Wed, 27 May 2020 16:17:40 +0200 |
| Subject: crypto: x86/crc32c - fix building with clang ias |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| commit 44623b2818f4a442726639572f44fd9b6d0ef68c upstream. |
| |
| The clang integrated assembler complains about movzxw: |
| |
| arch/x86/crypto/crc32c-pcl-intel-asm_64.S:173:2: error: invalid instruction mnemonic 'movzxw' |
| |
| It seems that movzwq is the mnemonic that it expects instead, |
| and this is what objdump prints when disassembling the file. |
| |
| Fixes: 6a8ce1ef3940 ("crypto: crc32c - Optimize CRC32C calculation with PCLMULQDQ instruction") |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> |
| Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> |
| [jc: Fixed conflicts due to lack of 34fdce6981b9 ("x86: Change {JMP,CALL}_NOSPEC argument")] |
| Signed-off-by: Jian Cai <jiancai@google.com> |
| Cc: Nick Desaulniers <ndesaulniers@google.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S |
| +++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S |
| @@ -170,7 +170,7 @@ continue_block: |
| |
| ## branch into array |
| lea jump_table(%rip), bufp |
| - movzxw (bufp, %rax, 2), len |
| + movzwq (bufp, %rax, 2), len |
| lea crc_array(%rip), bufp |
| lea (bufp, len, 1), bufp |
| JMP_NOSPEC bufp |