+ stable

On Fri, Oct 30, 2020 at 12:04 PM Jian Cai caij2003@gmail.com wrote:

From: Arnd Bergmann arnd@arndb.de

commit 44623b2818f4 ("crypto: x86/crc32c - fix building with clang ias") 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 34fdce6981b969] Signed-off-by: Jian Cai jiancai@google.com

---

Thanks Nathan! This patch addresses Nathan's comments regarding format and note.

arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S index d9b734d0c8cc..3c6e01520a97 100644 --- 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
  

-- 2.29.1.341.ge80a0c044ae-goog