| Message ID | alpine.DEB.2.21.2204291529070.9383@angie.orcam.me.uk |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] MIPS: IP27: Remove incorrect `cpu_has_fpu' override | expand |
Maciej W. Rozycki <macro@orcam.me.uk> 于2022年4月29日周五 22:57写道： > > Remove unsupported forcing of `cpu_has_fpu' to 1, which makes the `nofpu' > kernel parameter non-functional, and also causes a link error: > > ld: arch/mips/kernel/traps.o: in function `trap_init': > ./arch/mips/include/asm/msa.h:(.init.text+0x348): undefined reference to `handle_fpe' > ld: ./arch/mips/include/asm/msa.h:(.init.text+0x354): undefined reference to `handle_fpe' > ld: ./arch/mips/include/asm/msa.h:(.init.text+0x360): undefined reference to `handle_fpe' > > where the CONFIG_MIPS_FP_SUPPORT configuration option has been chosen. > Sorry, but I have a question. From the code in arch/mips/kernel/genex.S:567, 'handle_fpe’‘s definition is controlled by CONFIG_MIPS_FP_SUPPORT. Then how can it still report such error when the CONFIG_MIPS_FP_SUPPORT configuration option has been chosen. Stephen.
On Sat, 30 Apr 2022, Stephen Zhang wrote: > > Remove unsupported forcing of `cpu_has_fpu' to 1, which makes the `nofpu' > > kernel parameter non-functional, and also causes a link error: > > > > ld: arch/mips/kernel/traps.o: in function `trap_init': > > ./arch/mips/include/asm/msa.h:(.init.text+0x348): undefined reference to `handle_fpe' > > ld: ./arch/mips/include/asm/msa.h:(.init.text+0x354): undefined reference to `handle_fpe' > > ld: ./arch/mips/include/asm/msa.h:(.init.text+0x360): undefined reference to `handle_fpe' > > > > where the CONFIG_MIPS_FP_SUPPORT configuration option has been chosen. > > > > Sorry, but I have a question. From the code in > arch/mips/kernel/genex.S:567, 'handle_fpe’‘s > definition is controlled by CONFIG_MIPS_FP_SUPPORT. Then how can it > still report such > error when the CONFIG_MIPS_FP_SUPPORT configuration option has been chosen. Good catch, thanks! For some reason I inverted the condition in my mind as I wrote the change description. I have now posted v2 with the mistake corrected. Maciej
Index: linux-macro/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h =================================================================== --- linux-macro.orig/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h +++ linux-macro/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h @@ -25,7 +25,6 @@ #define cpu_has_4kex 1 #define cpu_has_3k_cache 0 #define cpu_has_4k_cache 1 -#define cpu_has_fpu 1 #define cpu_has_nofpuex 0 #define cpu_has_32fpr 1 #define cpu_has_counter 1
Remove unsupported forcing of `cpu_has_fpu' to 1, which makes the `nofpu' kernel parameter non-functional, and also causes a link error: ld: arch/mips/kernel/traps.o: in function `trap_init': ./arch/mips/include/asm/msa.h:(.init.text+0x348): undefined reference to `handle_fpe' ld: ./arch/mips/include/asm/msa.h:(.init.text+0x354): undefined reference to `handle_fpe' ld: ./arch/mips/include/asm/msa.h:(.init.text+0x360): undefined reference to `handle_fpe' where the CONFIG_MIPS_FP_SUPPORT configuration option has been chosen. Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk> Fixes: 0ebb2f4159af ("MIPS: IP27: Update/restructure CPU overrides") Cc: stable@vger.kernel.org # v4.2+ --- arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h | 1 - 1 file changed, 1 deletion(-) linux-mips-ip27-cpu-has-fpu.diff