[PATCH] md: RAID6: clean up CPUID and FPU enter/exit code

- Use kernel_fpu_begin() and kernel_fpu_end()
- Use boot_cpu_has() for feature testing even in userspace

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 4 insertions, 13 deletions

diff --git a/drivers/md/raid6sse1.c b/drivers/md/raid6sse1.c
index f7e7859f71aa..f0a1ba8f40ba 100644
--- a/drivers/md/raid6sse1.c
+++ b/drivers/md/raid6sse1.c
@@ -33,16 +33,10 @@ extern const struct raid6_mmx_constants {
 
 static int raid6_have_sse1_or_mmxext(void)
 {
-#ifdef __KERNEL__
         /* Not really boot_cpu but "all_cpus" */
         return boot_cpu_has(X86_FEATURE_MMX) &&
                 (boot_cpu_has(X86_FEATURE_XMM) ||
                  boot_cpu_has(X86_FEATURE_MMXEXT));
-#else
-        /* User space test code - this incorrectly breaks on some Athlons */
-        u32 features = cpuid_features();
-        return ( (features & (5<<23)) == (5<<23) );
-#endif
 }
 
 /*
@@ -53,14 +47,12 @@ static void raid6_sse11_gen_syndrome(int disks, size_t bytes, void **ptrs)
         u8 **dptr = (u8 **)ptrs;
         u8 *p, *q;
         int d, z, z0;
-        raid6_mmx_save_t sa;
 
         z0 = disks - 3;         /* Highest data disk */
         p = dptr[z0+1];         /* XOR parity */
         q = dptr[z0+2];         /* RS syndrome */
 
-        /* This is really MMX code, not SSE */
-        raid6_before_mmx(&sa);
+        kernel_fpu_begin();
 
         asm volatile("movq %0,%%mm0" : : "m" (raid6_mmx_constants.x1d));
         asm volatile("pxor %mm5,%mm5"); /* Zero temp */
@@ -94,8 +86,8 @@ static void raid6_sse11_gen_syndrome(int disks, size_t bytes, void **ptrs)
                 asm volatile("movntq %%mm4,%0" : "=m" (q[d]));
         }
 
-        raid6_after_mmx(&sa);
         asm volatile("sfence" : : : "memory");
+        kernel_fpu_end();
 }
 
 const struct raid6_calls raid6_sse1x1 = {
@@ -113,13 +105,12 @@ static void raid6_sse12_gen_syndrome(int disks, size_t bytes, void **ptrs)
         u8 **dptr = (u8 **)ptrs;
         u8 *p, *q;
         int d, z, z0;
-        raid6_mmx_save_t sa;
 
         z0 = disks - 3;         /* Highest data disk */
         p = dptr[z0+1];         /* XOR parity */
         q = dptr[z0+2];         /* RS syndrome */
 
-        raid6_before_mmx(&sa);
+        kernel_fpu_begin();
 
         asm volatile("movq %0,%%mm0" : : "m" (raid6_mmx_constants.x1d));
         asm volatile("pxor %mm5,%mm5"); /* Zero temp */
@@ -157,8 +148,8 @@ static void raid6_sse12_gen_syndrome(int disks, size_t bytes, void **ptrs)
                 asm volatile("movntq %%mm6,%0" : "=m" (q[d+8]));
         }
 
-        raid6_after_mmx(&sa);
         asm volatile("sfence" : :: "memory");
+        kernel_fpu_end();
 }
 
 const struct raid6_calls raid6_sse1x2 = {