mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
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: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
@@ -28,10 +28,8 @@ EXPORT_SYMBOL_GPL(raid6_call);
|
|||||||
|
|
||||||
const struct raid6_calls * const raid6_algos[] = {
|
const struct raid6_calls * const raid6_algos[] = {
|
||||||
#if defined(__i386__) && !defined(__arch_um__)
|
#if defined(__i386__) && !defined(__arch_um__)
|
||||||
#ifdef CONFIG_AS_AVX512
|
|
||||||
&raid6_avx512x2,
|
&raid6_avx512x2,
|
||||||
&raid6_avx512x1,
|
&raid6_avx512x1,
|
||||||
#endif
|
|
||||||
&raid6_avx2x2,
|
&raid6_avx2x2,
|
||||||
&raid6_avx2x1,
|
&raid6_avx2x1,
|
||||||
&raid6_sse2x2,
|
&raid6_sse2x2,
|
||||||
@@ -42,11 +40,9 @@ const struct raid6_calls * const raid6_algos[] = {
|
|||||||
&raid6_mmxx1,
|
&raid6_mmxx1,
|
||||||
#endif
|
#endif
|
||||||
#if defined(__x86_64__) && !defined(__arch_um__)
|
#if defined(__x86_64__) && !defined(__arch_um__)
|
||||||
#ifdef CONFIG_AS_AVX512
|
|
||||||
&raid6_avx512x4,
|
&raid6_avx512x4,
|
||||||
&raid6_avx512x2,
|
&raid6_avx512x2,
|
||||||
&raid6_avx512x1,
|
&raid6_avx512x1,
|
||||||
#endif
|
|
||||||
&raid6_avx2x4,
|
&raid6_avx2x4,
|
||||||
&raid6_avx2x2,
|
&raid6_avx2x2,
|
||||||
&raid6_avx2x1,
|
&raid6_avx2x1,
|
||||||
@@ -96,9 +92,7 @@ EXPORT_SYMBOL_GPL(raid6_datap_recov);
|
|||||||
|
|
||||||
const struct raid6_recov_calls *const raid6_recov_algos[] = {
|
const struct raid6_recov_calls *const raid6_recov_algos[] = {
|
||||||
#ifdef CONFIG_X86
|
#ifdef CONFIG_X86
|
||||||
#ifdef CONFIG_AS_AVX512
|
|
||||||
&raid6_recov_avx512,
|
&raid6_recov_avx512,
|
||||||
#endif
|
|
||||||
&raid6_recov_avx2,
|
&raid6_recov_avx2,
|
||||||
&raid6_recov_ssse3,
|
&raid6_recov_ssse3,
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -17,8 +17,6 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef CONFIG_AS_AVX512
|
|
||||||
|
|
||||||
#include <linux/raid/pq.h>
|
#include <linux/raid/pq.h>
|
||||||
#include "x86.h"
|
#include "x86.h"
|
||||||
|
|
||||||
@@ -560,5 +558,3 @@ const struct raid6_calls raid6_avx512x4 = {
|
|||||||
.priority = 2 /* Prefer AVX512 over priority 1 (SSE2 and others) */
|
.priority = 2 /* Prefer AVX512 over priority 1 (SSE2 and others) */
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* CONFIG_AS_AVX512 */
|
|
||||||
|
|||||||
@@ -6,8 +6,6 @@
|
|||||||
* Author: Megha Dey <megha.dey@linux.intel.com>
|
* Author: Megha Dey <megha.dey@linux.intel.com>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef CONFIG_AS_AVX512
|
|
||||||
|
|
||||||
#include <linux/raid/pq.h>
|
#include <linux/raid/pq.h>
|
||||||
#include "x86.h"
|
#include "x86.h"
|
||||||
|
|
||||||
@@ -377,7 +375,3 @@ const struct raid6_recov_calls raid6_recov_avx512 = {
|
|||||||
#endif
|
#endif
|
||||||
.priority = 3,
|
.priority = 3,
|
||||||
};
|
};
|
||||||
|
|
||||||
#else
|
|
||||||
#warning "your version of binutils lacks AVX512 support"
|
|
||||||
#endif
|
|
||||||
|
|||||||
@@ -54,9 +54,6 @@ endif
|
|||||||
ifeq ($(IS_X86),yes)
|
ifeq ($(IS_X86),yes)
|
||||||
OBJS += mmx.o sse1.o sse2.o avx2.o recov_ssse3.o recov_avx2.o avx512.o recov_avx512.o
|
OBJS += mmx.o sse1.o sse2.o avx2.o recov_ssse3.o recov_avx2.o avx512.o recov_avx512.o
|
||||||
CFLAGS += -DCONFIG_X86
|
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)
|
else ifeq ($(HAS_NEON),yes)
|
||||||
OBJS += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o
|
OBJS += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o
|
||||||
CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1
|
CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1
|
||||||
|
|||||||
Reference in New Issue
Block a user