Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7192df97 authored by Randy Dunlap's avatar Randy Dunlap Committed by Greg Kroah-Hartman
Browse files

mips: DEC: honor CONFIG_MIPS_FP_SUPPORT=n 



[ Upstream commit 97bf0395c226907e1a9b908511a35192bf1e09bb ]

Include the DECstation interrupt handler in opting out of
FPU support.

Fixes a linker error:

mips-linux-ld: arch/mips/dec/int-handler.o: in function `fpu':
(.text+0x148): undefined reference to `handle_fpe_int'

Fixes: 183b40f9 ("MIPS: Allow FP support to be disabled")
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Cc: Paul Burton <paulburton@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Maciej W. Rozycki <macro@orcam.me.uk>
Cc: linux-mips@vger.kernel.org
Acked-by: default avatarMaciej W. Rozycki <macro@orcam.me.uk>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 10705a43

arch/mips/dec/int-handler.S

+3 −3
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ 
		 */

		mfc0	t0,CP0_CAUSE		# get pending interrupts

		mfc0	t1,CP0_STATUS

#ifdef CONFIG_32BIT

#if defined(CONFIG_32BIT) && defined(CONFIG_MIPS_FP_SUPPORT)

		lw	t2,cpu_fpu_mask

#endif

		andi	t0,ST0_IM		# CAUSE.CE may be non-zero!
@@ -139,7 +139,7 @@ 


		beqz	t0,spurious



#ifdef CONFIG_32BIT

#if defined(CONFIG_32BIT) && defined(CONFIG_MIPS_FP_SUPPORT)

		 and	t2,t0

		bnez	t2,fpu			# handle FPU immediately

#endif
@@ -280,7 +280,7 @@ handle_it: 
		j	dec_irq_dispatch

		 nop



#ifdef CONFIG_32BIT

#if defined(CONFIG_32BIT) && defined(CONFIG_MIPS_FP_SUPPORT)

fpu:

		lw	t0,fpu_kstat_irq

		nop

arch/mips/dec/setup.c

+2 −1
Original line number Diff line number Diff line
@@ -766,7 +766,8 @@ void __init arch_init_irq(void) 
		dec_interrupt[DEC_IRQ_HALT] = -1;



	/* Register board interrupts: FPU and cascade. */

	if (dec_interrupt[DEC_IRQ_FPU] >= 0 && cpu_has_fpu) {

	if (IS_ENABLED(CONFIG_MIPS_FP_SUPPORT) &&

	    dec_interrupt[DEC_IRQ_FPU] >= 0 && cpu_has_fpu) {

		struct irq_desc *desc_fpu;

		int irq_fpu;