[PATCH 1/4] m68k: Add and use wrapper for FPU inline asm
From: Daniel Palmer
Date: Thu Nov 19 2026 - 07:40:21 EST
The assembler will refuse to assemble instructions that aren't
supported on the current "chip". This includes the FPU instructions.
For inline asm blocks that need to use chip specific instructions
we manually set chip to the one needed to get the assembler to take
the instructions and since chip propagates to all of the following
inline asm blocks in the same source file we set it to generic "68k"
after the instructions.
The problem with this is that in a kernel built for only the 68040 or
68060 "68k" doesn't allow for the FPU instructions. Currently if the
above pattern happens earlier in the same file (maybe via an include)
chip will be set to 68k and FPU instructions will fail to assemble.
FPU instructions are a bit of pain because we also need to consider
coldfire. Coldfire doesn't want the same chip as classic m68k.
Add FPU_ASM() to wrap FPU instruction inline asm and do the right
chip dance for classic m68k and coldfire, and use it in signal.c
where the fsave/frestore were duplicated for coldfire.
Signed-off-by: Daniel Palmer <daniel@xxxxxxxx>
---
arch/m68k/include/asm/fpu.h | 6 ++++
arch/m68k/kernel/process.c | 19 ++++++-----
arch/m68k/kernel/setup_mm.c | 2 +-
arch/m68k/kernel/signal.c | 63 +++++++++----------------------------
4 files changed, 32 insertions(+), 58 deletions(-)
diff --git a/arch/m68k/include/asm/fpu.h b/arch/m68k/include/asm/fpu.h
index ab12be88d75f..5ff246444e67 100644
--- a/arch/m68k/include/asm/fpu.h
+++ b/arch/m68k/include/asm/fpu.h
@@ -21,4 +21,10 @@
#define FPSTATESIZE (0)
#endif
+#ifdef CONFIG_COLDFIRE
+#define FPU_ASM(insns) insns
+#else
+#define FPU_ASM(insns) ".chip 68k/68881\n\t" insns "\n\t.chip 68k"
+#endif
+
#endif /* __M68K_FPU_H */
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index f5a07a70e938..ef76d2aea12c 100644
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -34,6 +34,7 @@
#include <linux/uaccess.h>
#include <linux/elfcore.h>
+#include <asm/fpu.h>
#include <asm/traps.h>
#include <asm/machdep.h>
#include <asm/setup.h>
@@ -97,7 +98,7 @@ void flush_thread(void)
#ifdef CONFIG_FPU
if (!FPU_IS_EMU) {
unsigned long zero = 0;
- asm volatile("frestore %0": :"m" (zero));
+ asm volatile (FPU_ASM("frestore %0") : : "m" (zero));
}
#endif
}
@@ -182,7 +183,8 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args)
#ifdef CONFIG_FPU
if (!FPU_IS_EMU) {
/* Copy the current fpu state */
- asm volatile ("fsave %0" : : "m" (p->thread.fpstate[0]) : "memory");
+ asm volatile (FPU_ASM("fsave %0")
+ : : "m" (p->thread.fpstate[0]) : "memory");
if (!CPU_IS_060 ? p->thread.fpstate[0] : p->thread.fpstate[2]) {
if (CPU_IS_COLDFIRE) {
@@ -197,8 +199,8 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args)
"m" (p->thread.fpcntl[2])
: "memory");
} else {
- asm volatile ("fmovemx %/fp0-%/fp7,%0\n\t"
- "fmoveml %/fpiar/%/fpcr/%/fpsr,%1"
+ asm volatile (FPU_ASM("fmovemx %/fp0-%/fp7,%0\n\t"
+ "fmoveml %/fpiar/%/fpcr/%/fpsr,%1")
:
: "m" (p->thread.fp[0]),
"m" (p->thread.fpcntl[0])
@@ -207,7 +209,8 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args)
}
/* Restore the state in case the fpu was busy */
- asm volatile ("frestore %0" : : "m" (p->thread.fpstate[0]));
+ asm volatile (FPU_ASM("frestore %0")
+ : : "m" (p->thread.fpstate[0]));
}
#endif /* CONFIG_FPU */
@@ -235,7 +238,7 @@ int elf_core_copy_task_fpregs(struct task_struct *t, elf_fpregset_t *fpu)
char fpustate[216];
/* First dump the fpu context to avoid protocol violation. */
- asm volatile ("fsave %0" :: "m" (fpustate[0]) : "memory");
+ asm volatile (FPU_ASM("fsave %0") : : "m" (fpustate[0]) : "memory");
if (!CPU_IS_060 ? !fpustate[0] : !fpustate[2])
return 0;
@@ -251,11 +254,11 @@ int elf_core_copy_task_fpregs(struct task_struct *t, elf_fpregset_t *fpu)
"m" (fpu->fpregs[0])
: "memory");
} else {
- asm volatile ("fmovem %/fpiar/%/fpcr/%/fpsr,%0"
+ asm volatile (FPU_ASM("fmovem %/fpiar/%/fpcr/%/fpsr,%0")
:
: "m" (fpu->fpcntl[0])
: "memory");
- asm volatile ("fmovemx %/fp0-%/fp7,%0"
+ asm volatile (FPU_ASM("fmovemx %/fp0-%/fp7,%0")
:
: "m" (fpu->fpregs[0])
: "memory");
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index c7e8de0d34bb..51b5881078cd 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -223,7 +223,7 @@ void __init setup_arch(char **cmdline_p)
/* clear the fpu if we have one */
if (m68k_fputype & (FPU_68881|FPU_68882|FPU_68040|FPU_68060|FPU_COLDFIRE)) {
volatile int zero = 0;
- asm volatile ("frestore %0" : : "m" (zero));
+ asm volatile (FPU_ASM("frestore %0") : : "m" (zero));
}
#endif
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c
index e628b859ef21..fa36d519de69 100644
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
@@ -45,6 +45,7 @@
#include <linux/extable.h>
#include <linux/resume_user_mode.h>
+#include <asm/fpu.h>
#include <asm/setup.h>
#include <linux/uaccess.h>
#include <asm/traps.h>
@@ -306,24 +307,15 @@ static inline int restore_fpu_state(struct sigcontext *sc)
"m" (sc->sc_fpcntl[1]),
"m" (sc->sc_fpcntl[2]));
} else {
- __asm__ volatile (".chip 68k/68881\n\t"
- "fmovemx %0,%%fp0-%%fp1\n\t"
- "fmoveml %1,%%fpcr/%%fpsr/%%fpiar\n\t"
- ".chip 68k"
+ __asm__ volatile (FPU_ASM("fmovemx %0,%%fp0-%%fp1\n\t"
+ "fmoveml %1,%%fpcr/%%fpsr/%%fpiar")
: /* no outputs */
: "m" (*sc->sc_fpregs),
"m" (*sc->sc_fpcntl));
}
}
- if (CPU_IS_COLDFIRE) {
- __asm__ volatile ("frestore %0" : : "m" (*sc->sc_fpstate));
- } else {
- __asm__ volatile (".chip 68k/68881\n\t"
- "frestore %0\n\t"
- ".chip 68k"
- : : "m" (*sc->sc_fpstate));
- }
+ __asm__ volatile (FPU_ASM("frestore %0") : : "m" (*sc->sc_fpstate));
err = 0;
out:
@@ -397,10 +389,8 @@ static inline int rt_restore_fpu_state(struct ucontext __user *uc)
"m" (fpregs.f_fpcntl[1]),
"m" (fpregs.f_fpcntl[2]));
} else {
- __asm__ volatile (".chip 68k/68881\n\t"
- "fmovemx %0,%%fp0-%%fp7\n\t"
- "fmoveml %1,%%fpcr/%%fpsr/%%fpiar\n\t"
- ".chip 68k"
+ __asm__ volatile (FPU_ASM("fmovemx %0,%%fp0-%%fp7\n\t"
+ "fmoveml %1,%%fpcr/%%fpsr/%%fpiar")
: /* no outputs */
: "m" (*fpregs.f_fpregs),
"m" (*fpregs.f_fpcntl));
@@ -411,14 +401,7 @@ static inline int rt_restore_fpu_state(struct ucontext __user *uc)
context_size))
goto out;
- if (CPU_IS_COLDFIRE) {
- __asm__ volatile ("frestore %0" : : "m" (*fpstate));
- } else {
- __asm__ volatile (".chip 68k/68881\n\t"
- "frestore %0\n\t"
- ".chip 68k"
- : : "m" (*fpstate));
- }
+ __asm__ volatile (FPU_ASM("frestore %0") : : "m" (*fpstate));
err = 0;
out:
@@ -437,15 +420,8 @@ static inline void save_fpu_state(struct sigcontext *sc, struct pt_regs *regs)
return;
}
- if (CPU_IS_COLDFIRE) {
- __asm__ volatile ("fsave %0"
- : : "m" (*sc->sc_fpstate) : "memory");
- } else {
- __asm__ volatile (".chip 68k/68881\n\t"
- "fsave %0\n\t"
- ".chip 68k"
- : : "m" (*sc->sc_fpstate) : "memory");
- }
+ __asm__ volatile (FPU_ASM("fsave %0")
+ : : "m" (*sc->sc_fpstate) : "memory");
if (CPU_IS_060 ? sc->sc_fpstate[2] : sc->sc_fpstate[0]) {
fpu_version = sc->sc_fpstate[0];
@@ -469,10 +445,8 @@ static inline void save_fpu_state(struct sigcontext *sc, struct pt_regs *regs)
: /* no inputs */
: "memory");
} else {
- __asm__ volatile (".chip 68k/68881\n\t"
- "fmovemx %%fp0-%%fp1,%0\n\t"
- "fmoveml %%fpcr/%%fpsr/%%fpiar,%1\n\t"
- ".chip 68k"
+ __asm__ volatile (FPU_ASM("fmovemx %%fp0-%%fp1,%0\n\t"
+ "fmoveml %%fpcr/%%fpsr/%%fpiar,%1")
: "=m" (*sc->sc_fpregs),
"=m" (*sc->sc_fpcntl)
: /* no inputs */
@@ -497,14 +471,7 @@ static inline int rt_save_fpu_state(struct ucontext __user *uc, struct pt_regs *
return err;
}
- if (CPU_IS_COLDFIRE) {
- __asm__ volatile ("fsave %0" : : "m" (*fpstate) : "memory");
- } else {
- __asm__ volatile (".chip 68k/68881\n\t"
- "fsave %0\n\t"
- ".chip 68k"
- : : "m" (*fpstate) : "memory");
- }
+ __asm__ volatile (FPU_ASM("fsave %0") : : "m" (*fpstate) : "memory");
err |= __put_user(*(long *)fpstate, (long __user *)&uc->uc_fpstate);
if (CPU_IS_060 ? fpstate[2] : fpstate[0]) {
@@ -531,10 +498,8 @@ static inline int rt_save_fpu_state(struct ucontext __user *uc, struct pt_regs *
: /* no inputs */
: "memory");
} else {
- __asm__ volatile (".chip 68k/68881\n\t"
- "fmovemx %%fp0-%%fp7,%0\n\t"
- "fmoveml %%fpcr/%%fpsr/%%fpiar,%1\n\t"
- ".chip 68k"
+ __asm__ volatile (FPU_ASM("fmovemx %%fp0-%%fp7,%0\n\t"
+ "fmoveml %%fpcr/%%fpsr/%%fpiar,%1")
: "=m" (*fpregs.f_fpregs),
"=m" (*fpregs.f_fpcntl)
: /* no inputs */
--
2.55.0