* [PATCH v3] mips: DEC: honor CONFIG_MIPS_FP_SUPPORT=n
@ 2022-03-04 16:24 Randy Dunlap
2022-03-04 17:56 ` Maciej W. Rozycki
2022-03-07 12:20 ` Thomas Bogendoerfer
0 siblings, 2 replies; 3+ messages in thread
From: Randy Dunlap @ 2022-03-04 16:24 UTC (permalink / raw)
To: linux-kernel
Cc: patches, Randy Dunlap, kernel test robot, Paul Burton,
Thomas Bogendoerfer, Maciej W . Rozycki, linux-mips
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: 183b40f992c8 ("MIPS: Allow FP support to be disabled")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: kernel 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
---
v2: add another ifdef block in int-handler.S; (Maciej)
add an ifdef block in dec/setup.c; (Maciej)
v3: use IS_ENABLED() instead of an ifdef block in dec/setup.c; (Maciej)
arch/mips/dec/int-handler.S | 6 +++---
arch/mips/dec/setup.c | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
--- linux-next-20220303.orig/arch/mips/dec/int-handler.S
+++ linux-next-20220303/arch/mips/dec/int-handler.S
@@ -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
--- linux-next-20220303.orig/arch/mips/dec/setup.c
+++ linux-next-20220303/arch/mips/dec/setup.c
@@ -746,7 +746,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;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] mips: DEC: honor CONFIG_MIPS_FP_SUPPORT=n
2022-03-04 16:24 [PATCH v3] mips: DEC: honor CONFIG_MIPS_FP_SUPPORT=n Randy Dunlap
@ 2022-03-04 17:56 ` Maciej W. Rozycki
2022-03-07 12:20 ` Thomas Bogendoerfer
1 sibling, 0 replies; 3+ messages in thread
From: Maciej W. Rozycki @ 2022-03-04 17:56 UTC (permalink / raw)
To: Randy Dunlap
Cc: linux-kernel, patches, kernel test robot, Paul Burton,
Thomas Bogendoerfer, linux-mips
On Fri, 4 Mar 2022, Randy Dunlap wrote:
> Include the DECstation interrupt handler in opting out of
> FPU support.
Acked-by: Maciej W. Rozycki <macro@orcam.me.uk>
Thank you!
Maciej
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] mips: DEC: honor CONFIG_MIPS_FP_SUPPORT=n
2022-03-04 16:24 [PATCH v3] mips: DEC: honor CONFIG_MIPS_FP_SUPPORT=n Randy Dunlap
2022-03-04 17:56 ` Maciej W. Rozycki
@ 2022-03-07 12:20 ` Thomas Bogendoerfer
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Bogendoerfer @ 2022-03-07 12:20 UTC (permalink / raw)
To: Randy Dunlap
Cc: linux-kernel, patches, kernel test robot, Paul Burton,
Maciej W . Rozycki, linux-mips
On Fri, Mar 04, 2022 at 08:24:27AM -0800, Randy Dunlap wrote:
> 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: 183b40f992c8 ("MIPS: Allow FP support to be disabled")
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Reported-by: kernel 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
> ---
> v2: add another ifdef block in int-handler.S; (Maciej)
> add an ifdef block in dec/setup.c; (Maciej)
> v3: use IS_ENABLED() instead of an ifdef block in dec/setup.c; (Maciej)
>
> arch/mips/dec/int-handler.S | 6 +++---
> arch/mips/dec/setup.c | 3 ++-
> 2 files changed, 5 insertions(+), 4 deletions(-)
applied to mips-next.
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-07 12:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-04 16:24 [PATCH v3] mips: DEC: honor CONFIG_MIPS_FP_SUPPORT=n Randy Dunlap
2022-03-04 17:56 ` Maciej W. Rozycki
2022-03-07 12:20 ` Thomas Bogendoerfer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).