[PATCH 2/2] raid6/x86: register avx512 after avx2
Christoph Hellwig <[email protected]>
| Newsgroups | gmane.linux.raid |
|---|---|
| Message-ID | <[email protected]> |
This way non-benchmarks configs still get avx512 if supported. Signed-off-by: Christoph Hellwig <[email protected]> --- lib/raid/raid6/x86/pq_arch.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/raid/raid6/x86/pq_arch.h b/lib/raid/raid6/x86/pq_arch.h index 28e395eb04d1..02f8843b0537 100644 --- a/lib/raid/raid6/x86/pq_arch.h +++ b/lib/raid/raid6/x86/pq_arch.h @@ -60,16 +60,16 @@ static inline bool raid6_has_sse1_or_mmxext(void) static __always_inline void __init arch_raid6_init(void) { if (raid6_has_avx2()) { + raid6_algo_add(&raid6_avx2x1); + raid6_algo_add(&raid6_avx2x2); + if (IS_ENABLED(CONFIG_X86_64)) + raid6_algo_add(&raid6_avx2x4); if (raid6_has_avx512()) { raid6_algo_add(&raid6_avx512x1); raid6_algo_add(&raid6_avx512x2); if (IS_ENABLED(CONFIG_X86_64)) raid6_algo_add(&raid6_avx512x4); } - raid6_algo_add(&raid6_avx2x1); - raid6_algo_add(&raid6_avx2x2); - if (IS_ENABLED(CONFIG_X86_64)) - raid6_algo_add(&raid6_avx2x4); } else if (IS_ENABLED(CONFIG_X86_64) || raid6_has_sse2()) { /* x86_64 can assume SSE2 as baseline */ raid6_algo_add(&raid6_sse2x1); -- 2.53.0