Commit 5f5305de authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

raid6: skip avx512 checks 



It is no longer necessary to check for CONFIG_AS_AVX512, since the minimum
assembler version is now from binutils-2.30 and this always supports it.

Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 118c40b7

lib/raid6/algos.c

+0 −6
Original line number Diff line number Diff line
@@ -28,10 +28,8 @@ EXPORT_SYMBOL_GPL(raid6_call); 


const struct raid6_calls * const raid6_algos[] = {

#if defined(__i386__) && !defined(__arch_um__)

#ifdef CONFIG_AS_AVX512

	&raid6_avx512x2,

	&raid6_avx512x1,

#endif

	&raid6_avx2x2,

	&raid6_avx2x1,

	&raid6_sse2x2,
@@ -42,11 +40,9 @@ const struct raid6_calls * const raid6_algos[] = { 
	&raid6_mmxx1,

#endif

#if defined(__x86_64__) && !defined(__arch_um__)

#ifdef CONFIG_AS_AVX512

	&raid6_avx512x4,

	&raid6_avx512x2,

	&raid6_avx512x1,

#endif

	&raid6_avx2x4,

	&raid6_avx2x2,

	&raid6_avx2x1,
@@ -96,9 +92,7 @@ EXPORT_SYMBOL_GPL(raid6_datap_recov); 


const struct raid6_recov_calls *const raid6_recov_algos[] = {

#ifdef CONFIG_X86

#ifdef CONFIG_AS_AVX512

	&raid6_recov_avx512,

#endif

	&raid6_recov_avx2,

	&raid6_recov_ssse3,

#endif

lib/raid6/avx512.c

+0 −4
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
 *

 */



#ifdef CONFIG_AS_AVX512



#include <linux/raid/pq.h>

#include "x86.h"
@@ -560,5 +558,3 @@ const struct raid6_calls raid6_avx512x4 = { 
	.priority = 2		/* Prefer AVX512 over priority 1 (SSE2 and others) */

};

#endif
 


#endif /* CONFIG_AS_AVX512 */

lib/raid6/recov_avx512.c

+0 −6
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ 
 * Author: Megha Dey <megha.dey@linux.intel.com>

 */



#ifdef CONFIG_AS_AVX512



#include <linux/raid/pq.h>

#include "x86.h"
@@ -377,7 +375,3 @@ const struct raid6_recov_calls raid6_recov_avx512 = { 
#endif

	.priority = 3,

};
 


#else

#warning "your version of binutils lacks AVX512 support"

#endif

lib/raid6/test/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -54,9 +54,6 @@ endif 
ifeq ($(IS_X86),yes)

        OBJS   += mmx.o sse1.o sse2.o avx2.o recov_ssse3.o recov_avx2.o avx512.o recov_avx512.o

        CFLAGS += -DCONFIG_X86

        CFLAGS += $(shell echo "vpmovm2b %k1, %zmm5" |          \

                    gcc -c -x assembler - >/dev/null 2>&1 &&    \

                    rm ./-.o && echo -DCONFIG_AS_AVX512=1)

else ifeq ($(HAS_NEON),yes)

        OBJS   += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o

        CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1