* [PATCH v2] MIPS: include: fpu.h: Allow 64-bit FPU on a 64-bit MIPS R6 CPU
@ 2015-07-16 14:30 Markos Chandras
2015-07-16 14:30 ` Markos Chandras
2015-07-17 8:06 ` Ralf Baechle
0 siblings, 2 replies; 3+ messages in thread
From: Markos Chandras @ 2015-07-16 14:30 UTC (permalink / raw)
To: linux-mips; +Cc: Markos Chandras, stable
Commit 6134d94923d0 ("MIPS: asm: fpu: Allow 64-bit FPU on MIPS32 R6")
added support for 64-bit FPU on a 32-bit MIPS R6 processor but it missed
the 64-bit CPU case leading to FPU failures when requesting FR=1 mode
(which is always the case for MIPS R6 userland) when running a 32-bit
kernel on a 64-bit CPU. We also fix the MIPS R2 case.
Cc: <stable@vger.kernel.org> # 4.0+
Fixes: 6134d94923d0 ("MIPS: asm: fpu: Allow 64-bit FPU on MIPS32 R6")
Reviewed-by: Paul Burton <paul.burton@imgtec.com>
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
---
arch/mips/include/asm/fpu.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/include/asm/fpu.h b/arch/mips/include/asm/fpu.h
index 084780b355aa..1b0625189835 100644
--- a/arch/mips/include/asm/fpu.h
+++ b/arch/mips/include/asm/fpu.h
@@ -74,7 +74,7 @@ static inline int __enable_fpu(enum fpu_mode mode)
goto fr_common;
case FPU_64BIT:
-#if !(defined(CONFIG_CPU_MIPS32_R2) || defined(CONFIG_CPU_MIPS32_R6) \
+#if !(defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6) \
|| defined(CONFIG_64BIT))
/* we only have a 32-bit FPU */
return SIGFPE;
--
2.4.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH v2] MIPS: include: fpu.h: Allow 64-bit FPU on a 64-bit MIPS R6 CPU 2015-07-16 14:30 [PATCH v2] MIPS: include: fpu.h: Allow 64-bit FPU on a 64-bit MIPS R6 CPU Markos Chandras @ 2015-07-16 14:30 ` Markos Chandras 2015-07-17 8:06 ` Ralf Baechle 1 sibling, 0 replies; 3+ messages in thread From: Markos Chandras @ 2015-07-16 14:30 UTC (permalink / raw) To: linux-mips; +Cc: Markos Chandras, stable Commit 6134d94923d0 ("MIPS: asm: fpu: Allow 64-bit FPU on MIPS32 R6") added support for 64-bit FPU on a 32-bit MIPS R6 processor but it missed the 64-bit CPU case leading to FPU failures when requesting FR=1 mode (which is always the case for MIPS R6 userland) when running a 32-bit kernel on a 64-bit CPU. We also fix the MIPS R2 case. Cc: <stable@vger.kernel.org> # 4.0+ Fixes: 6134d94923d0 ("MIPS: asm: fpu: Allow 64-bit FPU on MIPS32 R6") Reviewed-by: Paul Burton <paul.burton@imgtec.com> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> --- arch/mips/include/asm/fpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/include/asm/fpu.h b/arch/mips/include/asm/fpu.h index 084780b355aa..1b0625189835 100644 --- a/arch/mips/include/asm/fpu.h +++ b/arch/mips/include/asm/fpu.h @@ -74,7 +74,7 @@ static inline int __enable_fpu(enum fpu_mode mode) goto fr_common; case FPU_64BIT: -#if !(defined(CONFIG_CPU_MIPS32_R2) || defined(CONFIG_CPU_MIPS32_R6) \ +#if !(defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6) \ || defined(CONFIG_64BIT)) /* we only have a 32-bit FPU */ return SIGFPE; -- 2.4.5 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] MIPS: include: fpu.h: Allow 64-bit FPU on a 64-bit MIPS R6 CPU 2015-07-16 14:30 [PATCH v2] MIPS: include: fpu.h: Allow 64-bit FPU on a 64-bit MIPS R6 CPU Markos Chandras 2015-07-16 14:30 ` Markos Chandras @ 2015-07-17 8:06 ` Ralf Baechle 1 sibling, 0 replies; 3+ messages in thread From: Ralf Baechle @ 2015-07-17 8:06 UTC (permalink / raw) To: Markos Chandras; +Cc: linux-mips, stable Thanks, applied. Ralf ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-17 8:06 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-07-16 14:30 [PATCH v2] MIPS: include: fpu.h: Allow 64-bit FPU on a 64-bit MIPS R6 CPU Markos Chandras 2015-07-16 14:30 ` Markos Chandras 2015-07-17 8:06 ` Ralf Baechle
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox