]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
x86/crc: drop checks of CONFIG_AS_VPCLMULQDQ
authorEric Biggers <ebiggers@kernel.org>
Sat, 31 May 2025 21:13:18 +0000 (14:13 -0700)
committerEric Biggers <ebiggers@kernel.org>
Mon, 30 Jun 2025 16:31:56 +0000 (09:31 -0700)
Now that the minimum binutils version supports VPCLMULQDQ (and the
minimum clang version does too), there is no need to check for assembler
support before compiling code that uses these instructions.

Link: https://lore.kernel.org/r/20250531211318.83677-1-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
arch/x86/lib/crc-pclmul-template.S
arch/x86/lib/crc-pclmul-template.h

index ae0b6144c503c8bd8fc35d94df33958033d1d560..a02f7dc8053e02fb93ef3a3b45a30b339652d71e 100644 (file)
        RET
 .endm
 
-#ifdef CONFIG_AS_VPCLMULQDQ
 #define DEFINE_CRC_PCLMUL_FUNCS(prefix, bits, lsb)                     \
 SYM_FUNC_START(prefix##_pclmul_sse);                                   \
        _crc_pclmul     n=bits, lsb_crc=lsb, vl=16, avx_level=0;        \
@@ -574,9 +573,3 @@ SYM_FUNC_END(prefix##_vpclmul_avx2);                                        \
 SYM_FUNC_START(prefix##_vpclmul_avx512);                               \
        _crc_pclmul     n=bits, lsb_crc=lsb, vl=64, avx_level=512;      \
 SYM_FUNC_END(prefix##_vpclmul_avx512);
-#else
-#define DEFINE_CRC_PCLMUL_FUNCS(prefix, bits, lsb)                     \
-SYM_FUNC_START(prefix##_pclmul_sse);                                   \
-       _crc_pclmul     n=bits, lsb_crc=lsb, vl=16, avx_level=0;        \
-SYM_FUNC_END(prefix##_pclmul_sse);
-#endif // !CONFIG_AS_VPCLMULQDQ
index c5b3bfe11d8da08b3b5eb89048119fad142667eb..51cba520a7dbd296b39c7a52076952cb387f9314 100644 (file)
@@ -27,8 +27,7 @@ DEFINE_STATIC_CALL(prefix##_pclmul, prefix##_pclmul_sse)
 
 #define INIT_CRC_PCLMUL(prefix)                                                \
 do {                                                                   \
-       if (IS_ENABLED(CONFIG_AS_VPCLMULQDQ) &&                         \
-           boot_cpu_has(X86_FEATURE_VPCLMULQDQ) &&                     \
+       if (boot_cpu_has(X86_FEATURE_VPCLMULQDQ) &&                     \
            boot_cpu_has(X86_FEATURE_AVX2) &&                           \
            cpu_has_xfeatures(XFEATURE_MASK_YMM, NULL)) {               \
                if (boot_cpu_has(X86_FEATURE_AVX512BW) &&               \