[PATCH 3/4] m68k: Add helpers to read and write the 68060's PCR

From: Daniel Palmer

Date: Thu Nov 19 2026 - 07:40:28 EST


We access the PCR in a few places and the next commit will
add another so refactor the PCR accesses into a little helper.

Signed-off-by: Daniel Palmer <daniel@xxxxxxxx>
---
arch/m68k/atari/config.c | 7 ++-----
arch/m68k/include/asm/m68060.h | 19 +++++++++++++++++++
arch/m68k/kernel/setup_mm.c | 7 ++-----
3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index bdafc86241b7..a63117891410 100644
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -47,6 +47,7 @@
#include <asm/hwtest.h>
#include <asm/io.h>
#include <asm/config.h>
+#include <asm/m68060.h>

#include "atari.h"

@@ -512,11 +513,7 @@ static void atari_reset(void)
unsigned long jmp_addr040 = virt_to_phys(&&jmp_addr_label040);
if (CPU_IS_060) {
/* 68060: clear PCR to turn off superscalar operation */
- asm volatile ("\n"
- " .chip 68060\n"
- " movec %0,%%pcr\n"
- " .chip 68k"
- : : "d" (0));
+ m68060_set_pcr(0);
}

asm volatile ("\n"
diff --git a/arch/m68k/include/asm/m68060.h b/arch/m68k/include/asm/m68060.h
index a69ccde11693..3d9d0f1a741f 100644
--- a/arch/m68k/include/asm/m68060.h
+++ b/arch/m68k/include/asm/m68060.h
@@ -12,4 +12,23 @@
#define M68060_PCR_DFP 0x00000002 /* disable the FPU */
#define M68060_PCR_ESS 0x00000001 /* enable superscalar dispatch */

+#ifndef __ASSEMBLY__
+
+#include <linux/types.h>
+
+static inline u32 m68060_get_pcr(void)
+{
+ u32 pcr;
+
+ asm volatile (".chip 68060; movec %%pcr,%0; .chip 68k" : "=d" (pcr));
+ return pcr;
+}
+
+static inline void m68060_set_pcr(u32 pcr)
+{
+ asm volatile (".chip 68060; movec %0,%%pcr; .chip 68k" : : "d" (pcr));
+}
+
+#endif /* __ASSEMBLY__ */
+
#endif /* _ASM_M68K_M68060_H */
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 7abff6266837..41b595256ad1 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -230,14 +230,11 @@ void __init setup_arch(char **cmdline_p)
#endif

if (CPU_IS_060) {
- u32 pcr;
+ u32 pcr = m68060_get_pcr();

- asm (".chip 68060; movec %%pcr,%0; .chip 68k"
- : "=d" (pcr));
if (FIELD_GET(M68060_PCR_REVISION, pcr) <= 5) {
pr_warn("Enabling workaround for errata I14\n");
- asm (".chip 68060; movec %0,%%pcr; .chip 68k"
- : : "d" (pcr | M68060_PCR_I14));
+ m68060_set_pcr(pcr | M68060_PCR_I14);
}
}

--
2.55.0