aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/include/asm
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@linux-mips.org>2015-05-12 10:20:57 -0400
committerRalf Baechle <ralf@linux-mips.org>2015-05-12 17:15:49 -0400
commit03dce595270f22d59a6f37e9170287c1afd94bc2 (patch)
tree68e8ae5e92d6dda9b32be45d72025b095913671d /arch/mips/include/asm
parent620b155034570f577470cf5309f741bac6a6e32b (diff)
MIPS: Fix a preemption issue with thread's FPU defaults
Fix "BUG: using smp_processor_id() in preemptible" reported in accesses to thread's FPU defaults: the value to initialise FSCR to at program startup, the FCSR r/w mask and the contents of FIR in full FPU emulation, removing a regression introduced with 9b26616c [MIPS: Respect the ISA level in FCSR handling] and f6843626 [MIPS: math-emu: Set FIR feature flags for full emulation]. Use `boot_cpu_data' to obtain the data from, following the approach that `cpu_has_*' macros take and avoiding the call to `smp_processor_id' made in the reference to `current_cpu_data'. The contents of FSCR have to be consistent across processors in an SMP system, the settings there must not change as a thread is migrated across processors. And the contents of FIR are guaranteed to be consistent in FPU emulation, by definition. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Tested-by: Ezequiel Garcia <ezequiel.garcia@imgtec.com> Tested-by: Paul Martin <paul.martin@codethink.co.uk> Cc: Markos Chandras <Markos.Chandras@imgtec.com> Cc: James Hogan <james.hogan@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/10030/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include/asm')
-rw-r--r--arch/mips/include/asm/elf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
index a594d8ed9698..f19e890b99d2 100644
--- a/arch/mips/include/asm/elf.h
+++ b/arch/mips/include/asm/elf.h
@@ -304,7 +304,7 @@ do { \
304 \ 304 \
305 current->thread.abi = &mips_abi; \ 305 current->thread.abi = &mips_abi; \
306 \ 306 \
307 current->thread.fpu.fcr31 = current_cpu_data.fpu_csr31; \ 307 current->thread.fpu.fcr31 = boot_cpu_data.fpu_csr31; \
308} while (0) 308} while (0)
309 309
310#endif /* CONFIG_32BIT */ 310#endif /* CONFIG_32BIT */
@@ -366,7 +366,7 @@ do { \
366 else \ 366 else \
367 current->thread.abi = &mips_abi; \ 367 current->thread.abi = &mips_abi; \
368 \ 368 \
369 current->thread.fpu.fcr31 = current_cpu_data.fpu_csr31; \ 369 current->thread.fpu.fcr31 = boot_cpu_data.fpu_csr31; \
370 \ 370 \
371 p = personality(current->personality); \ 371 p = personality(current->personality); \
372 if (p != PER_LINUX32 && p != PER_LINUX) \ 372 if (p != PER_LINUX32 && p != PER_LINUX) \