Skip to content

Commit 394d71b

Browse files
James Hogangregkh
authored andcommitted
MIPS: Force o32 fp64 support on 32bit MIPS64r6 kernels
commit 2e6c7747730296a6d4fd700894286db1132598c4 upstream. When a 32-bit kernel is configured to support MIPS64r6 (CPU_MIPS64_R6), MIPS_O32_FP64_SUPPORT won't be selected as it should be because MIPS32_O32 is disabled (o32 is already the default ABI available on 32-bit kernels). This results in userland FP breakage as CP0_Status.FR is read-only 1 since r6 (when an FPU is present) so __enable_fpu() will fail to clear FR. This causes the FPU emulator to get used which will incorrectly emulate 32-bit FPU registers. Force o32 fp64 support in this case by also selecting MIPS_O32_FP64_SUPPORT from CPU_MIPS64_R6 if 32BIT. Fixes: 4e9d324 ("MIPS: Require O32 FP64 support for MIPS64 with O32 compat") Signed-off-by: James Hogan <james.hogan@imgtec.com> Reviewed-by: Paul Burton <paul.burton@imgtec.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/15310/ Signed-off-by: James Hogan <james.hogan@imgtec.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 0f5d172 commit 394d71b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/mips/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1412,7 +1412,7 @@ config CPU_MIPS32_R6
14121412
select CPU_SUPPORTS_MSA
14131413
select GENERIC_CSUM
14141414
select HAVE_KVM
1415-
select MIPS_O32_FP64_SUPPORT
1415+
select MIPS_O32_FP64_SUPPORT if 32BIT
14161416
help
14171417
Choose this option to build a kernel for release 6 or later of the
14181418
MIPS32 architecture. New MIPS processors, starting with the Warrior

0 commit comments

Comments
 (0)