CVS commit: src/sys/arch/virt68k/conf
Module Name:src Committed By: thorpej Date: Fri Jan 19 05:47:15 UTC 2024 Modified Files: src/sys/arch/virt68k/conf: GENERIC Log Message: Revert unintended commit. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/virt68k/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/virt68k/conf/GENERIC diff -u src/sys/arch/virt68k/conf/GENERIC:1.5 src/sys/arch/virt68k/conf/GENERIC:1.6 --- src/sys/arch/virt68k/conf/GENERIC:1.5 Fri Jan 19 05:46:36 2024 +++ src/sys/arch/virt68k/conf/GENERIC Fri Jan 19 05:47:15 2024 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.5 2024/01/19 05:46:36 thorpej Exp $ +# $NetBSD: GENERIC,v 1.6 2024/01/19 05:47:15 thorpej Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/virt68k/conf/std.virt68k" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.5 $" +#ident "GENERIC-$Revision: 1.6 $" makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk @@ -100,9 +100,7 @@ options INET6 # IPV6 options COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out include "conf/compat_netbsd09.config" -options COMPAT_SUNOS -options COMPAT_13 -options COMPAT_16 +#options COMPAT_SUNOS #options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries #options COMPAT_LINUX # compatibility with Linux/m68k binaries #options COMPAT_OSSAUDIO # compatibility with Linux/m68k binaries
CVS commit: src/sys/arch/virt68k/conf
Module Name:src Committed By: thorpej Date: Fri Jan 19 05:47:15 UTC 2024 Modified Files: src/sys/arch/virt68k/conf: GENERIC Log Message: Revert unintended commit. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/virt68k/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/virt68k
Module Name:src
Committed By: thorpej
Date: Fri Jan 19 05:46:36 UTC 2024
Modified Files:
src/sys/arch/virt68k/conf: GENERIC
src/sys/arch/virt68k/include: cpu.h intr.h
src/sys/arch/virt68k/virt68k: intr.c locore.s
Log Message:
Adjust the clockframe to be the same as what the common m68k interrupt
dispatch code expects.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/virt68k/conf/GENERIC
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/virt68k/include/cpu.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/virt68k/include/intr.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/virt68k/virt68k/intr.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/virt68k/virt68k/locore.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/virt68k/conf/GENERIC
diff -u src/sys/arch/virt68k/conf/GENERIC:1.4 src/sys/arch/virt68k/conf/GENERIC:1.5
--- src/sys/arch/virt68k/conf/GENERIC:1.4 Mon Jan 8 05:11:54 2024
+++ src/sys/arch/virt68k/conf/GENERIC Fri Jan 19 05:46:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.4 2024/01/08 05:11:54 thorpej Exp $
+# $NetBSD: GENERIC,v 1.5 2024/01/19 05:46:36 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/virt68k/conf/std.virt68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.4 $"
+#ident "GENERIC-$Revision: 1.5 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -100,7 +100,9 @@ options INET6 # IPV6
options COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out
include "conf/compat_netbsd09.config"
-#options COMPAT_SUNOS
+options COMPAT_SUNOS
+options COMPAT_13
+options COMPAT_16
#options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries
#options COMPAT_LINUX # compatibility with Linux/m68k binaries
#options COMPAT_OSSAUDIO # compatibility with Linux/m68k binaries
Index: src/sys/arch/virt68k/include/cpu.h
diff -u src/sys/arch/virt68k/include/cpu.h:1.5 src/sys/arch/virt68k/include/cpu.h:1.6
--- src/sys/arch/virt68k/include/cpu.h:1.5 Thu Jan 18 14:39:07 2024
+++ src/sys/arch/virt68k/include/cpu.h Fri Jan 19 05:46:36 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.5 2024/01/18 14:39:07 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.6 2024/01/19 05:46:36 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -54,17 +54,17 @@
/*
* Arguments to hardclock and gatherstats encapsulate the previous
* machine state in an opaque clockframe. On the virt68k, we use
- * what the hardware pushes on an interrupt (frame format 0).
+ * what the locore.s glue puts on the stack before calling C-code.
*/
struct clockframe {
- u_short sr; /* sr at time of interrupt */
- u_long pc; /* pc at time of interrupt */
- u_short fmt:4,
- vec:12; /* vector offset (4-word frame) */
+ u_int cf_regs[4]; /* d0,d1,a0,a1 */
+ u_short cf_sr; /* sr at time of interrupt */
+ u_long cf_pc; /* pc at time of interrupt */
+ u_short cf_vo; /* vector offset (4-word frame) */
} __attribute__((packed));
-#define CLKF_USERMODE(framep) (((framep)->sr & PSL_S) == 0)
-#define CLKF_PC(framep) ((framep)->pc)
+#define CLKF_USERMODE(framep) (((framep)->cf_sr & PSL_S) == 0)
+#define CLKF_PC(framep) ((framep)->cf_pc)
/*
* The clock interrupt handler can determine if it's a nested
Index: src/sys/arch/virt68k/include/intr.h
diff -u src/sys/arch/virt68k/include/intr.h:1.1 src/sys/arch/virt68k/include/intr.h:1.2
--- src/sys/arch/virt68k/include/intr.h:1.1 Tue Jan 2 07:41:00 2024
+++ src/sys/arch/virt68k/include/intr.h Fri Jan 19 05:46:36 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.1 2024/01/02 07:41:00 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.2 2024/01/19 05:46:36 thorpej Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -162,7 +162,7 @@ void intr_register_pic(struct device *,
#include
#include
-void intr_dispatch(struct clockframe *);
+void intr_dispatch(struct clockframe);
#endif /* _VIRT68K_INTR_PRIVATE */
#endif /* !_LOCORE */
Index: src/sys/arch/virt68k/virt68k/intr.c
diff -u src/sys/arch/virt68k/virt68k/intr.c:1.2 src/sys/arch/virt68k/virt68k/intr.c:1.3
--- src/sys/arch/virt68k/virt68k/intr.c:1.2 Tue Jan 2 07:48:46 2024
+++ src/sys/arch/virt68k/virt68k/intr.c Fri Jan 19 05:46:36 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.2 2024/01/02 07:48:46 thorpej Exp $ */
+/* $NetBSD: intr.c,v 1.3 2024/01/19 05:46:36 thorpej Exp $ */
/*-
* Copyright (c) 1996, 2023 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.2 2024/01/02 07:48:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.3 2024/01/19 05:46:36 thorpej Exp $");
#define _VIRT68K_INTR_PRIVATE
@@ -47,6 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.2
#include
#include
+#include
+
#include
#include
@@ -267,9 +269,9 @@ intr_string(void *v, char *buf, size_t b
#define VEC_AVINTR 0x18
CVS commit: src/sys/arch/virt68k
Module Name:src Committed By: thorpej Date: Fri Jan 19 05:46:36 UTC 2024 Modified Files: src/sys/arch/virt68k/conf: GENERIC src/sys/arch/virt68k/include: cpu.h intr.h src/sys/arch/virt68k/virt68k: intr.c locore.s Log Message: Adjust the clockframe to be the same as what the common m68k interrupt dispatch code expects. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/virt68k/conf/GENERIC cvs rdiff -u -r1.5 -r1.6 src/sys/arch/virt68k/include/cpu.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/virt68k/include/intr.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/virt68k/virt68k/intr.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/virt68k/virt68k/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/m68k
Module Name:src Committed By: thorpej Date: Fri Jan 19 05:45:28 UTC 2024 Modified Files: src/sys/arch/m68k/include: vectors.h src/sys/arch/m68k/m68k: m68k_intr.c Log Message: Ensuire VECO_TO_VECI() returns an 8-bit index. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/m68k/include/vectors.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/m68k/m68k/m68k_intr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/m68k
Module Name:src
Committed By: thorpej
Date: Fri Jan 19 05:45:28 UTC 2024
Modified Files:
src/sys/arch/m68k/include: vectors.h
src/sys/arch/m68k/m68k: m68k_intr.c
Log Message:
Ensuire VECO_TO_VECI() returns an 8-bit index.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/m68k/include/vectors.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/m68k/m68k/m68k_intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/m68k/include/vectors.h
diff -u src/sys/arch/m68k/include/vectors.h:1.4 src/sys/arch/m68k/include/vectors.h:1.5
--- src/sys/arch/m68k/include/vectors.h:1.4 Sun Jan 14 00:00:15 2024
+++ src/sys/arch/m68k/include/vectors.h Fri Jan 19 05:45:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vectors.h,v 1.4 2024/01/14 00:00:15 thorpej Exp $ */
+/* $NetBSD: vectors.h,v 1.5 2024/01/19 05:45:28 thorpej Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -122,7 +122,7 @@
#define VECI_TRAP(x) ((x) + VECI_TRAP0)
#define VECI_TO_VECO(x) ((x) << 2)
-#define VECO_TO_VECI(x) ((unsigned int)(x) >> 2)
+#define VECO_TO_VECI(x) ((uint8_t)((unsigned int)(x) >> 2))
#ifdef _KERNEL
Index: src/sys/arch/m68k/m68k/m68k_intr.c
diff -u src/sys/arch/m68k/m68k/m68k_intr.c:1.10 src/sys/arch/m68k/m68k/m68k_intr.c:1.11
--- src/sys/arch/m68k/m68k/m68k_intr.c:1.10 Tue Jan 16 02:36:49 2024
+++ src/sys/arch/m68k/m68k/m68k_intr.c Fri Jan 19 05:45:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: m68k_intr.c,v 1.10 2024/01/16 02:36:49 thorpej Exp $ */
+/* $NetBSD: m68k_intr.c,v 1.11 2024/01/19 05:45:28 thorpej Exp $ */
/*-
* Copyright (c) 1996, 2023, 2024 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: m68k_intr.c,v 1.10 2024/01/16 02:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m68k_intr.c,v 1.11 2024/01/19 05:45:28 thorpej Exp $");
#define _M68K_INTR_PRIVATE
@@ -389,7 +389,7 @@ void m68k_intr_autovec(struct clockframe
void
m68k_intr_autovec(struct clockframe frame)
{
- const int ipl = VECO_TO_VECI(frame.cf_vo & 0xfff) - VECI_INTRAV0;
+ const int ipl = VECO_TO_VECI(frame.cf_vo) - VECI_INTRAV0;
struct m68k_intrhand *ih;
bool rv = false;
@@ -420,7 +420,7 @@ void m68k_intr_vectored(struct clockfram
void
m68k_intr_vectored(struct clockframe frame)
{
- const int vec = VECO_TO_VECI(frame.cf_vo & 0xfff);
+ const int vec = VECO_TO_VECI(frame.cf_vo);
const int ipl = (getsr() >> 8) & 7;
struct m68k_intrhand *ih;
CVS commit: src/sys
Module Name:src Committed By: thorpej Date: Fri Jan 19 03:59:47 UTC 2024 Modified Files: src/sys/arch/mvme68k/dev: pcctwo_68k.c zsvar.h src/sys/dev/mvme: pcctwovar.h vme_two_isr.c Log Message: Make sure to include opt_mvmeconf.h. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mvme68k/dev/pcctwo_68k.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mvme68k/dev/zsvar.h cvs rdiff -u -r1.5 -r1.6 src/sys/dev/mvme/pcctwovar.h cvs rdiff -u -r1.17 -r1.18 src/sys/dev/mvme/vme_two_isr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: thorpej Date: Fri Jan 19 03:59:47 UTC 2024 Modified Files: src/sys/arch/mvme68k/dev: pcctwo_68k.c zsvar.h src/sys/dev/mvme: pcctwovar.h vme_two_isr.c Log Message: Make sure to include opt_mvmeconf.h. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mvme68k/dev/pcctwo_68k.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mvme68k/dev/zsvar.h cvs rdiff -u -r1.5 -r1.6 src/sys/dev/mvme/pcctwovar.h cvs rdiff -u -r1.17 -r1.18 src/sys/dev/mvme/vme_two_isr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mvme68k/dev/pcctwo_68k.c diff -u src/sys/arch/mvme68k/dev/pcctwo_68k.c:1.11 src/sys/arch/mvme68k/dev/pcctwo_68k.c:1.12 --- src/sys/arch/mvme68k/dev/pcctwo_68k.c:1.11 Wed Mar 13 06:27:34 2019 +++ src/sys/arch/mvme68k/dev/pcctwo_68k.c Fri Jan 19 03:59:47 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: pcctwo_68k.c,v 1.11 2019/03/13 06:27:34 martin Exp $ */ +/* $NetBSD: pcctwo_68k.c,v 1.12 2024/01/19 03:59:47 thorpej Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -34,7 +34,9 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pcctwo_68k.c,v 1.11 2019/03/13 06:27:34 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcctwo_68k.c,v 1.12 2024/01/19 03:59:47 thorpej Exp $"); + +#include "opt_mvmeconf.h" #include #include Index: src/sys/arch/mvme68k/dev/zsvar.h diff -u src/sys/arch/mvme68k/dev/zsvar.h:1.13 src/sys/arch/mvme68k/dev/zsvar.h:1.14 --- src/sys/arch/mvme68k/dev/zsvar.h:1.13 Mon Aug 9 21:13:06 2021 +++ src/sys/arch/mvme68k/dev/zsvar.h Fri Jan 19 03:59:47 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: zsvar.h,v 1.13 2021/08/09 21:13:06 andvar Exp $ */ +/* $NetBSD: zsvar.h,v 1.14 2024/01/19 03:59:47 thorpej Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -34,6 +34,8 @@ * types for the SCC on the Motorola MVME series of computers. */ +#include "opt_mvmeconf.h" + /* * The MVME-147 provides a 5 MHz clock to the SCC chips. */ Index: src/sys/dev/mvme/pcctwovar.h diff -u src/sys/dev/mvme/pcctwovar.h:1.5 src/sys/dev/mvme/pcctwovar.h:1.6 --- src/sys/dev/mvme/pcctwovar.h:1.5 Sat Oct 27 17:18:27 2012 +++ src/sys/dev/mvme/pcctwovar.h Fri Jan 19 03:59:47 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: pcctwovar.h,v 1.5 2012/10/27 17:18:27 chs Exp $ */ +/* $NetBSD: pcctwovar.h,v 1.6 2024/01/19 03:59:47 thorpej Exp $ */ /*- * Copyright (c) 2000, 2002 The NetBSD Foundation, Inc. @@ -32,6 +32,8 @@ #ifndef _MVME_PCCTWOVAR_H #define _MVME_PCCTWOVAR_H +#include "opt_mvmeconf.h" + /* * Structure used to attach PCC devices. */ Index: src/sys/dev/mvme/vme_two_isr.c diff -u src/sys/dev/mvme/vme_two_isr.c:1.17 src/sys/dev/mvme/vme_two_isr.c:1.18 --- src/sys/dev/mvme/vme_two_isr.c:1.17 Sun Nov 10 21:16:36 2019 +++ src/sys/dev/mvme/vme_two_isr.c Fri Jan 19 03:59:47 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: vme_two_isr.c,v 1.17 2019/11/10 21:16:36 chs Exp $ */ +/* $NetBSD: vme_two_isr.c,v 1.18 2024/01/19 03:59:47 thorpej Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -36,9 +36,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vme_two_isr.c,v 1.17 2019/11/10 21:16:36 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vme_two_isr.c,v 1.18 2024/01/19 03:59:47 thorpej Exp $"); #include "vmetwo.h" +#include "opt_mvmeconf.h" #include #include
CVS commit: src/sys/arch/mvmeppc
Module Name:src Committed By: thorpej Date: Fri Jan 19 03:57:04 UTC 2024 Modified Files: src/sys/arch/mvmeppc/conf: files.mvmeppc src/sys/arch/mvmeppc/mvmeppc: machdep.c platform.c Log Message: opt_mvmetype.h -> opt_mvmeconf.h to match mvme68k (which wins out because it supports more boards). To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mvmeppc/conf/files.mvmeppc cvs rdiff -u -r1.34 -r1.35 src/sys/arch/mvmeppc/mvmeppc/machdep.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mvmeppc/mvmeppc/platform.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mvmeppc/conf/files.mvmeppc diff -u src/sys/arch/mvmeppc/conf/files.mvmeppc:1.15 src/sys/arch/mvmeppc/conf/files.mvmeppc:1.16 --- src/sys/arch/mvmeppc/conf/files.mvmeppc:1.15 Wed Jun 22 18:06:33 2011 +++ src/sys/arch/mvmeppc/conf/files.mvmeppc Fri Jan 19 03:57:04 2024 @@ -1,4 +1,4 @@ -# $NetBSD: files.mvmeppc,v 1.15 2011/06/22 18:06:33 matt Exp $ +# $NetBSD: files.mvmeppc,v 1.16 2024/01/19 03:57:04 thorpej Exp $ # # Motorola's MVMEPPC boards specific configuration info # @@ -8,10 +8,10 @@ maxusers 2 8 64 include "arch/powerpc/pic/files.pic" -defflag opt_mvmetype.h SUPPORT_MVME160X -defflag opt_mvmetype.h SUPPORT_MVME210X -defflag opt_mvmetype.h SUPPORT_MVME230X -defflag opt_mvmetype.h SUPPORT_MVME240X +defflag opt_mvmeconf.h SUPPORT_MVME160X +defflag opt_mvmeconf.h SUPPORT_MVME210X +defflag opt_mvmeconf.h SUPPORT_MVME230X +defflag opt_mvmeconf.h SUPPORT_MVME240X file arch/mvmeppc/mvmeppc/autoconf.c file arch/powerpc/powerpc/clock.c Index: src/sys/arch/mvmeppc/mvmeppc/machdep.c diff -u src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.34 src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.35 --- src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.34 Wed Dec 20 15:29:05 2023 +++ src/sys/arch/mvmeppc/mvmeppc/machdep.c Fri Jan 19 03:57:04 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.34 2023/12/20 15:29:05 thorpej Exp $ */ +/* $NetBSD: machdep.c,v 1.35 2024/01/19 03:57:04 thorpej Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,10 +32,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.34 2023/12/20 15:29:05 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.35 2024/01/19 03:57:04 thorpej Exp $"); #include "opt_compat_netbsd.h" -#include "opt_mvmetype.h" +#include "opt_mvmeconf.h" #include "opt_ddb.h" #include Index: src/sys/arch/mvmeppc/mvmeppc/platform.c diff -u src/sys/arch/mvmeppc/mvmeppc/platform.c:1.5 src/sys/arch/mvmeppc/mvmeppc/platform.c:1.6 --- src/sys/arch/mvmeppc/mvmeppc/platform.c:1.5 Mon Apr 28 20:23:29 2008 +++ src/sys/arch/mvmeppc/mvmeppc/platform.c Fri Jan 19 03:57:04 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: platform.c,v 1.5 2008/04/28 20:23:29 martin Exp $ */ +/* $NetBSD: platform.c,v 1.6 2024/01/19 03:57:04 thorpej Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,9 +30,9 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: platform.c,v 1.5 2008/04/28 20:23:29 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: platform.c,v 1.6 2024/01/19 03:57:04 thorpej Exp $"); -#include "opt_mvmetype.h" +#include "opt_mvmeconf.h" #include #include
CVS commit: src/sys/arch/mvmeppc
Module Name:src Committed By: thorpej Date: Fri Jan 19 03:57:04 UTC 2024 Modified Files: src/sys/arch/mvmeppc/conf: files.mvmeppc src/sys/arch/mvmeppc/mvmeppc: machdep.c platform.c Log Message: opt_mvmetype.h -> opt_mvmeconf.h to match mvme68k (which wins out because it supports more boards). To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mvmeppc/conf/files.mvmeppc cvs rdiff -u -r1.34 -r1.35 src/sys/arch/mvmeppc/mvmeppc/machdep.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mvmeppc/mvmeppc/platform.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/m68k/m68k
Module Name:src Committed By: thorpej Date: Fri Jan 19 03:35:31 UTC 2024 Modified Files: src/sys/arch/m68k/m68k: pmap_motorola.c vm_machdep.c Log Message: Move physaccess(), physunaccess(), and kvtop() from vm_machdep.c to pmap_motorola.c. They're legacy functions tied to that pmap implementation. To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/sys/arch/m68k/m68k/pmap_motorola.c cvs rdiff -u -r1.42 -r1.43 src/sys/arch/m68k/m68k/vm_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/m68k/m68k
Module Name:src
Committed By: thorpej
Date: Fri Jan 19 03:35:31 UTC 2024
Modified Files:
src/sys/arch/m68k/m68k: pmap_motorola.c vm_machdep.c
Log Message:
Move physaccess(), physunaccess(), and kvtop() from vm_machdep.c to
pmap_motorola.c. They're legacy functions tied to that pmap implementation.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/m68k/m68k/pmap_motorola.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/m68k/m68k/vm_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/m68k/m68k/pmap_motorola.c
diff -u src/sys/arch/m68k/m68k/pmap_motorola.c:1.88 src/sys/arch/m68k/m68k/pmap_motorola.c:1.89
--- src/sys/arch/m68k/m68k/pmap_motorola.c:1.88 Thu Jan 18 14:39:06 2024
+++ src/sys/arch/m68k/m68k/pmap_motorola.c Fri Jan 19 03:35:31 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.c,v 1.88 2024/01/18 14:39:06 thorpej Exp $*/
+/* $NetBSD: pmap_motorola.c,v 1.89 2024/01/19 03:35:31 thorpej Exp $*/
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -120,7 +120,7 @@
#include "opt_m68k_arch.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.88 2024/01/18 14:39:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.89 2024/01/19 03:35:31 thorpej Exp $");
#include
#include
@@ -2951,3 +2951,48 @@ pmap_check_wiring(const char *str, vaddr
str, va, pg->wire_count, count);
}
#endif /* DEBUG */
+
+/*
+ * XXX XXX XXX These are legacy remants and should go away XXX XXX XXX
+ * (Cribbed from vm_machdep.c because they're tied to this pmap impl.)
+ */
+
+/*
+ * Map `size' bytes of physical memory starting at `paddr' into
+ * kernel VA space at `vaddr'. Read/write and cache-inhibit status
+ * are specified by `prot'.
+ */
+void
+physaccess(void *vaddr, void *paddr, int size, int prot)
+{
+ pt_entry_t *pte;
+ u_int page;
+
+ pte = kvtopte(vaddr);
+ page = (u_int)paddr & PG_FRAME;
+ for (size = btoc(size); size; size--) {
+ *pte++ = PG_V | prot | page;
+ page += PAGE_SIZE;
+ }
+ TBIAS();
+}
+
+void
+physunaccess(void *vaddr, int size)
+{
+ pt_entry_t *pte;
+
+ pte = kvtopte(vaddr);
+ for (size = btoc(size); size; size--)
+ *pte++ = PG_NV;
+ TBIAS();
+}
+
+/*
+ * Convert kernel VA to physical address
+ */
+int
+kvtop(void *addr)
+{
+ return (int)vtophys((vaddr_t)addr);
+}
Index: src/sys/arch/m68k/m68k/vm_machdep.c
diff -u src/sys/arch/m68k/m68k/vm_machdep.c:1.42 src/sys/arch/m68k/m68k/vm_machdep.c:1.43
--- src/sys/arch/m68k/m68k/vm_machdep.c:1.42 Sun Dec 31 21:59:24 2023
+++ src/sys/arch/m68k/m68k/vm_machdep.c Fri Jan 19 03:35:31 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.42 2023/12/31 21:59:24 thorpej Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.43 2024/01/19 03:35:31 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.42 2023/12/31 21:59:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.43 2024/01/19 03:35:31 thorpej Exp $");
#include
#include
@@ -209,51 +209,3 @@ vunmapbuf(struct buf *bp, vsize_t len)
bp->b_data = bp->b_saveaddr;
bp->b_saveaddr = 0;
}
-
-
-#if defined(M68K_MMU_MOTOROLA) || defined(M68K_MMU_HP)
-
-#include
-
-/*
- * Map `size' bytes of physical memory starting at `paddr' into
- * kernel VA space at `vaddr'. Read/write and cache-inhibit status
- * are specified by `prot'.
- */
-void
-physaccess(void *vaddr, void *paddr, int size, int prot)
-{
- pt_entry_t *pte;
- u_int page;
-
- pte = kvtopte(vaddr);
- page = (u_int)paddr & PG_FRAME;
- for (size = btoc(size); size; size--) {
- *pte++ = PG_V | prot | page;
- page += PAGE_SIZE;
- }
- TBIAS();
-}
-
-void
-physunaccess(void *vaddr, int size)
-{
- pt_entry_t *pte;
-
- pte = kvtopte(vaddr);
- for (size = btoc(size); size; size--)
- *pte++ = PG_NV;
- TBIAS();
-}
-
-/*
- * Convert kernel VA to physical address
- */
-int
-kvtop(void *addr)
-{
- return (int)vtophys((vaddr_t)addr);
-}
-
-#endif
-
CVS commit: src/sys/arch
Module Name:src Committed By: thorpej Date: Fri Jan 19 03:09:05 UTC 2024 Modified Files: src/sys/arch/cesfic/include: intr.h src/sys/arch/hp300/include: intr.h src/sys/arch/luna68k/include: intr.h src/sys/arch/m68k/include: intr.h src/sys/arch/mvme68k/include: intr.h src/sys/arch/news68k/include: intr.h src/sys/arch/next68k/include: intr.h src/sys/arch/sun68k/include: intr.h Log Message: Add _KERNEL guards around most of the definitions in these files. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/cesfic/include/intr.h cvs rdiff -u -r1.38 -r1.39 src/sys/arch/hp300/include/intr.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/luna68k/include/intr.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/m68k/include/intr.h cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mvme68k/include/intr.h cvs rdiff -u -r1.30 -r1.31 src/sys/arch/news68k/include/intr.h cvs rdiff -u -r1.24 -r1.25 src/sys/arch/next68k/include/intr.h cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sun68k/include/intr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src
Committed By: thorpej
Date: Fri Jan 19 03:09:05 UTC 2024
Modified Files:
src/sys/arch/cesfic/include: intr.h
src/sys/arch/hp300/include: intr.h
src/sys/arch/luna68k/include: intr.h
src/sys/arch/m68k/include: intr.h
src/sys/arch/mvme68k/include: intr.h
src/sys/arch/news68k/include: intr.h
src/sys/arch/next68k/include: intr.h
src/sys/arch/sun68k/include: intr.h
Log Message:
Add _KERNEL guards around most of the definitions in these files.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/cesfic/include/intr.h
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/hp300/include/intr.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/luna68k/include/intr.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/m68k/include/intr.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mvme68k/include/intr.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/news68k/include/intr.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/next68k/include/intr.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sun68k/include/intr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cesfic/include/intr.h
diff -u src/sys/arch/cesfic/include/intr.h:1.17 src/sys/arch/cesfic/include/intr.h:1.18
--- src/sys/arch/cesfic/include/intr.h:1.17 Mon Jan 15 19:11:31 2024
+++ src/sys/arch/cesfic/include/intr.h Fri Jan 19 03:09:04 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.17 2024/01/15 19:11:31 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.18 2024/01/19 03:09:04 thorpej Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _LUNA68K_INTR_H_
#define _LUNA68K_INTR_H_
+#ifdef _KERNEL
+
#include
#define MACHINE_PSL_IPL_SOFTCLOCK PSL_IPL1
@@ -44,6 +46,8 @@
#define MACHINE_INTREVCNT_NAMES \
{ "spur", "lev1", "lev2", "lev3", "lev4", "lev5", "clock", "nmi" }
+#endif /* _KERNEL */
+
#include
#endif /* _LUNA68K_INTR_H */
Index: src/sys/arch/hp300/include/intr.h
diff -u src/sys/arch/hp300/include/intr.h:1.38 src/sys/arch/hp300/include/intr.h:1.39
--- src/sys/arch/hp300/include/intr.h:1.38 Tue Jan 16 07:07:00 2024
+++ src/sys/arch/hp300/include/intr.h Fri Jan 19 03:09:04 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.38 2024/01/16 07:07:00 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.39 2024/01/19 03:09:04 thorpej Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _HP300_INTR_H_
#define _HP300_INTR_H_
+#ifdef _KERNEL
+
#include
#define MACHINE_PSL_IPL_SOFTCLOCK PSL_IPL1
@@ -58,8 +60,12 @@
#endif
#endif
+#endif /* _KERNEL */
+
#include
+#ifdef _KERNEL
+
#ifdef _M68K_INTR_PRIVATE
struct hp300_intrhand {
struct m68k_intrhand ih_super;
@@ -87,4 +93,6 @@ intr_disestablish(void *ih)
m68k_intr_disestablish(ih);
}
+#endif /* _KERNEL */
+
#endif /* _HP300_INTR_H */
Index: src/sys/arch/luna68k/include/intr.h
diff -u src/sys/arch/luna68k/include/intr.h:1.18 src/sys/arch/luna68k/include/intr.h:1.19
--- src/sys/arch/luna68k/include/intr.h:1.18 Mon Jan 15 20:10:33 2024
+++ src/sys/arch/luna68k/include/intr.h Fri Jan 19 03:09:04 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.18 2024/01/15 20:10:33 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.19 2024/01/19 03:09:04 thorpej Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _LUNA68K_INTR_H_
#define _LUNA68K_INTR_H_
+#ifdef _KERNEL
+
#include
#define MACHINE_PSL_IPL_SOFTCLOCK PSL_IPL1
@@ -44,6 +46,8 @@
#define MACHINE_INTREVCNT_NAMES \
{ "spur", "lev1", "scsi", "network", "lev4", "clock", "serial", "nmi" }
+#endif /* _KERNEL */
+
#include
#endif /* _LUNA68K_INTR_H */
Index: src/sys/arch/m68k/include/intr.h
diff -u src/sys/arch/m68k/include/intr.h:1.5 src/sys/arch/m68k/include/intr.h:1.6
--- src/sys/arch/m68k/include/intr.h:1.5 Tue Jan 16 01:16:46 2024
+++ src/sys/arch/m68k/include/intr.h Fri Jan 19 03:09:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.5 2024/01/16 01:16:46 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.6 2024/01/19 03:09:05 thorpej Exp $ */
/*-
* Copyright (c) 2023, 2024 The NetBSD Foundation, Inc.
@@ -32,9 +32,16 @@
#ifndef _M68k_INTR_H_
#define _M68k_INTR_H_
-#include
#include
+#if (defined(_KERNEL) && !defined(_LOCORE)) || defined(_KMEMUSER)
+typedef struct {
+ uint16_t _psl; /* physical manifestation of logical IPL_* */
+} ipl_cookie_t;
+#endif
+
+#ifdef _KERNEL
+
/*
* Logical interrupt priority levels -- these are distinct from
* the hardware interrupt priority levels of the m68k.
@@ -61,13 +68,8 @@
#define ISRPRI_TTYNOBUF 3 /* a particularly bad serial port */
#define ISRPRI_AUDIO 4 /* audio devices */
-#if defined(_KERNEL) || defined(_KMEMUSER)
-typedef struct {
- uint16_t _psl; /* physical manifestation of logical IPL_* */
-} ipl_cookie_t;
-#endif
+#ifndef _LOCORE
-#ifdef _KERNEL
extern volatile int idepth; /* interrupt depth */
extern const
CVS commit: src/sys/arch/m68k/include
Module Name:src Committed By: thorpej Date: Thu Jan 18 14:42:09 UTC 2024 Modified Files: src/sys/arch/m68k/include: cpu.h Log Message: Remove a comment that is no longer applicable. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/m68k/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/m68k/include/cpu.h diff -u src/sys/arch/m68k/include/cpu.h:1.20 src/sys/arch/m68k/include/cpu.h:1.21 --- src/sys/arch/m68k/include/cpu.h:1.20 Thu Jan 18 14:39:06 2024 +++ src/sys/arch/m68k/include/cpu.h Thu Jan 18 14:42:09 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.20 2024/01/18 14:39:06 thorpej Exp $ */ +/* $NetBSD: cpu.h,v 1.21 2024/01/18 14:42:09 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -47,24 +47,6 @@ /* * Exported definitions common to Motorola m68k-based ports. - * - * Note that are some port-specific definitions here, such as - * HP and Sun MMU types. These facilitate adding very small - * amounts of port-specific code to what would otherwise be - * identical. The is especially true in the case of the HP - * and other m68k pmaps. - * - * Individual ports are expected to define the following CPP symbols - * in to enable conditional code: - * - * M68K_MMU_MOTOROLA Machine has a Motorola MMU (incl. - *68851, 68030, 68040, 68060) - * - * M68K_MMU_HP Machine has an HP MMU. - * - * Note also that while m68k-generic code conditionalizes on the - * M68K_MMU_HP CPP symbol, none of the HP MMU definitions are in this - * file (since none are used in otherwise sharable code). */ /*
CVS commit: src/sys/arch/m68k/include
Module Name:src Committed By: thorpej Date: Thu Jan 18 14:42:09 UTC 2024 Modified Files: src/sys/arch/m68k/include: cpu.h Log Message: Remove a comment that is no longer applicable. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/m68k/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
/arch/cesfic/include/cpu.h
diff -u src/sys/arch/cesfic/include/cpu.h:1.35 src/sys/arch/cesfic/include/cpu.h:1.36
--- src/sys/arch/cesfic/include/cpu.h:1.35 Mon Jan 15 03:07:14 2024
+++ src/sys/arch/cesfic/include/cpu.h Thu Jan 18 14:39:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.35 2024/01/15 03:07:14 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.36 2024/01/18 14:39:05 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -43,7 +43,6 @@
#if defined(_KERNEL_OPT)
#include "opt_lockdebug.h"
-#include "opt_m68k_arch.h"
#endif
/*
@@ -102,14 +101,6 @@ struct clockframe {
extern int astpending; /* need to trap before returning to user mode */
#define aston() (astpending++)
-#ifndef M68040
-#define M68040
-#endif /* ! M68040 */
-
-#ifndef M68K_MMU_MOTOROLA
-#define M68K_MMU_MOTOROLA
-#endif /* ! M68K_MMU_MOTOROLA */
-
/* locore.s functions */
void doboot(void)
__attribute__((__noreturn__));
Index: src/sys/arch/evbcf/include/cpu.h
diff -u src/sys/arch/evbcf/include/cpu.h:1.6 src/sys/arch/evbcf/include/cpu.h:1.7
--- src/sys/arch/evbcf/include/cpu.h:1.6 Tue Jan 9 04:08:33 2024
+++ src/sys/arch/evbcf/include/cpu.h Thu Jan 18 14:39:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.6 2024/01/09 04:08:33 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.7 2024/01/18 14:39:06 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -43,7 +43,6 @@
#if defined(_KERNEL_OPT)
#include "opt_lockdebug.h"
-#include "opt_m68k_arch.h"
#endif
/*
Index: src/sys/arch/hp300/conf/files.hp300
diff -u src/sys/arch/hp300/conf/files.hp300:1.96 src/sys/arch/hp300/conf/files.hp300:1.97
--- src/sys/arch/hp300/conf/files.hp300:1.96 Thu Jan 18 03:40:48 2024
+++ src/sys/arch/hp300/conf/files.hp300 Thu Jan 18 14:39:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: files.hp300,v 1.96 2024/01/18 03:40:48 thorpej Exp $
+# $NetBSD: files.hp300,v 1.97 2024/01/18 14:39:06 thorpej Exp $
#
# hp300-specific configuration info
@@ -8,9 +8,9 @@ maxpartitions 8
maxusers 2 8 64
# SPU configuration options.
-defflag opt_spuconf.h HP320: M68020
-defflag opt_spuconf.h HP330: M68020
-defflag opt_spuconf.h HP350: M68020
+defflag opt_spuconf.h HP320: M68020, M68K_MMU_HP
+defflag opt_spuconf.h HP330: M68020, M68K_MMU_68851
+defflag opt_spuconf.h HP350: M68020, M68K_MMU_HP
defflag opt_spuconf.h HP340: M68030
defflag opt_spuconf.h HP345: M68030
Index: src/sys/arch/hp300/include/hp300spu.h
diff -u src/sys/arch/hp300/include/hp300spu.h:1.15 src/sys/arch/hp300/include/hp300spu.h:1.16
--- src/sys/arch/hp300/include/hp300spu.h:1.15 Thu Jan 18 03:40:48 2024
+++ src/sys/arch/hp300/include/hp300spu.h Thu Jan 18 14:39:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: hp300spu.h,v 1.15 2024/01/18 03:40:48 thorpej Exp $ */
+/* $NetBSD: hp300spu.h,v 1.16 2024/01/18 14:39:06 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -90,17 +90,6 @@ extern int mmuid; /* MMU id */
#endif
/*
- * MMU configuration.
- */
-#if defined(HP320) || defined(HP350)
-#define M68K_MMU_HP
-#endif
-
-#if defined(HP330) || defined(M68030) || defined(M68040)
-#define M68K_MMU_MOTOROLA
-#endif
-
-/*
* Cache configuration.
*/
#if defined(M68K_MMU_HP)
Index: src/sys/arch/luna68k/include/cpu.h
diff -u src/sys/arch/luna68k/include/cpu.h:1.40 src/sys/arch/luna68k/include/cpu.h:1.41
--- src/sys/arch/luna68k/include/cpu.h:1.40 Mon Jan 15 02:16:52 2024
+++ src/sys/arch/luna68k/include/cpu.h Thu Jan 18 14:39:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.40 2024/01/15 02:16:52 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.41 2024/01/18 14:39:06 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -51,9 +51,6 @@
#include
#if defined(_KERNEL)
-
-#define M68K_MMU_MOTOROLA
-
/*
* Arguments to hardclock and gatherstats encapsulate the previous
* machine state in an opaque clockframe. On the luna68k, we use
Index: src/sys/arch/m68k/conf/files.m68k
diff -u src/sys/arch/m68k/conf/files.m68k:1.56 src/sys/arch/m68k/conf/files.m68k:1.57
--- src/sys/arch/m68k/conf/files.m68k:1.56 Thu Jan 18 05:42:29 2024
+++ src/sys/arch/m68k/conf/files.m68k Thu Jan 18 14:39:06 2024
@@ -1,14 +1,25 @@
-# $NetBSD: files.m68k,v 1.56 2024/01/18 05:42:29 thorpej Exp $
+# $NetBSD: files.m68k,v 1.57 2024/01/18 14:39:06 thorpej Exp $
#
version 20240118 # mkflagvar
defflag opt_fpsp.h FPSP
+
+defflag opt_m68k_arch.h M68K_MMU_HP
+defflag opt_m68k_arch.h M68K_MMU_SUN
+defflag opt_m68k_arch.h M68K_MMU_SUN2: M68K_MMU_SUN
+defflag opt_m68k_arch.h M68K_MMU_SUN3: M68K_MMU_SUN
+defflag opt_m68k_arch.h M68K_MMU_MOTOROLA
+defflag opt_m68k_arch.h M68K_MMU_68851: M68K_MMU_MOTOROLA
+defflag opt_m68k_arch.h M68K_MMU_68030: M68K_MMU_MOTOROLA
+defflag opt_m68k_arch.h M68K_MMU_68040: M68K_MMU_MOTOROLA
+defflag opt_m68k_arch.h M68K_MMU_68060: M68K_MMU_MOTOROLA
+
defflag opt_m68k_arch.h M68010
defflag opt_m68k_arch.h M68020
-defflag opt_m68k_arch.h M68030
-defflag opt_m68k_arch.h M68040
-defflag opt_m68k_arch.h M680
CVS commit: src/sys/arch
Module Name:src
Committed By: thorpej
Date: Thu Jan 18 14:39:07 UTC 2024
Modified Files:
src/sys/arch/amiga/conf: std.amiga
src/sys/arch/amiga/include: cpu.h
src/sys/arch/atari/include: cpu.h
src/sys/arch/cesfic/include: cpu.h
src/sys/arch/evbcf/include: cpu.h
src/sys/arch/hp300/conf: files.hp300
src/sys/arch/hp300/include: hp300spu.h
src/sys/arch/luna68k/include: cpu.h
src/sys/arch/m68k/conf: files.m68k
src/sys/arch/m68k/include: cpu.h
src/sys/arch/m68k/m68k: pmap_motorola.c
src/sys/arch/mac68k/conf: std.mac68k
src/sys/arch/mac68k/include: cpu.h
src/sys/arch/mvme68k/include: cpu.h
src/sys/arch/news68k/include: cpu.h
src/sys/arch/next68k/include: cpu.h
src/sys/arch/sun2/conf: std.sun2
src/sys/arch/sun3/conf: std.sun3
src/sys/arch/virt68k/include: cpu.h
src/sys/arch/x68k/include: cpu.h
Log Message:
Make the M68K_MMU_* defines real kernel options, available in opt_m68k_arch.h.
For 68030, 68040, and 68060, infer M68K_MMU_MOTOROLA. For 68010 and 68020, it
must be an explicit option (set in std.${MACHINE} or, in the case of hp300,
inferred from the specific model option).
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/amiga/conf/std.amiga
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/amiga/include/cpu.h
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/atari/include/cpu.h
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/cesfic/include/cpu.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbcf/include/cpu.h
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/hp300/conf/files.hp300
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp300/include/hp300spu.h
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/luna68k/include/cpu.h
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/m68k/conf/files.m68k
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/m68k/include/cpu.h
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/m68k/m68k/pmap_motorola.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/mac68k/conf/std.mac68k
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/mac68k/include/cpu.h
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/mvme68k/include/cpu.h
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/news68k/include/cpu.h
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/next68k/include/cpu.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sun2/conf/std.sun2
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sun3/conf/std.sun3
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/virt68k/include/cpu.h
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/x68k/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch/next68k
Module Name:src
Committed By: thorpej
Date: Thu Jan 18 13:46:14 UTC 2024
Modified Files:
src/sys/arch/next68k/conf: files.next68k
src/sys/arch/next68k/include: cpu.h intr.h types.h vectors.h
Log Message:
Switch next68k over to common interrupt dispatch and G/C __HAVE_LEGACY_INTRCNT.
Also included is G/C of the old ssir stuff that's no longer used.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/next68k/conf/files.next68k
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/next68k/include/cpu.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/next68k/include/intr.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/next68k/include/types.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/next68k/include/vectors.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/next68k/conf/files.next68k
diff -u src/sys/arch/next68k/conf/files.next68k:1.44 src/sys/arch/next68k/conf/files.next68k:1.45
--- src/sys/arch/next68k/conf/files.next68k:1.44 Sat Jan 13 21:40:53 2024
+++ src/sys/arch/next68k/conf/files.next68k Thu Jan 18 13:46:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: files.next68k,v 1.44 2024/01/13 21:40:53 thorpej Exp $
+# $NetBSD: files.next68k,v 1.45 2024/01/18 13:46:14 thorpej Exp $
# next68k-specific configuration info
@@ -35,6 +35,8 @@ file arch/next68k/dev/zs_kgdb.c kgdb
file arch/m68k/m68k/cacheops.c
file arch/m68k/m68k/db_memrw.c ddb | kgdb
file arch/m68k/m68k/kgdb_machdep.c kgdb
+file arch/m68k/m68k/m68k_intr.c
+file arch/m68k/m68k/m68k_intr_stubs.s
file arch/m68k/m68k/m68k_trap.c
file arch/m68k/m68k/mmu_subr.s
file arch/m68k/m68k/pmap_motorola.c
@@ -50,7 +52,6 @@ file arch/next68k/next68k/pmap_bootstrap
file arch/next68k/next68k/machdep.c
file arch/next68k/next68k/clock.c
file arch/next68k/next68k/conf.c
-file arch/next68k/next68k/isr.c
file arch/next68k/next68k/autoconf.c
file arch/next68k/next68k/mainbus.c
file arch/next68k/next68k/nextrom.c
Index: src/sys/arch/next68k/include/cpu.h
diff -u src/sys/arch/next68k/include/cpu.h:1.54 src/sys/arch/next68k/include/cpu.h:1.55
--- src/sys/arch/next68k/include/cpu.h:1.54 Sat Jan 13 21:40:54 2024
+++ src/sys/arch/next68k/include/cpu.h Thu Jan 18 13:46:14 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.54 2024/01/13 21:40:54 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.55 2024/01/18 13:46:14 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -65,17 +65,17 @@
/*
* Arguments to hardclock and gatherstats encapsulate the previous
* machine state in an opaque clockframe. On the next68k, we use
- * what the hardware pushes on an interrupt (frame format 0).
+ * what the locore.s glue puts on the stack before calling C-code.
*/
struct clockframe {
- u_short sr; /* sr at time of interrupt */
- u_long pc; /* pc at time of interrupt */
- u_short fmt:4,
- vec:12; /* vector offset (4-word frame) */
+ u_int cf_regs[4]; /* d0,d1,a0,a1 */
+ u_short cf_sr; /* sr at time of interrupt */
+ u_long cf_pc; /* pc at time of interrupt */
+ u_short cf_vo; /* vector offset (4-word frame) */
} __attribute__((packed));
-#define CLKF_USERMODE(framep) (((framep)->sr & PSL_S) == 0)
-#define CLKF_PC(framep) ((framep)->pc)
+#define CLKF_USERMODE(framep) (((framep)->cf_sr & PSL_S) == 0)
+#define CLKF_PC(framep) ((framep)->cf_pc)
/*
* The clock interrupt handler can determine if it's a nested
@@ -83,8 +83,7 @@ struct clockframe {
* (Remember, the clock interrupt handler itself will cause the
* depth counter to be incremented).
*/
-extern volatile unsigned int interrupt_depth;
-#define CLKF_INTR(framep) (interrupt_depth > 1)
+#define CLKF_INTR(framep) (idepth > 1)
/*
* Preempt the current process if in interrupt from user mode,
Index: src/sys/arch/next68k/include/intr.h
diff -u src/sys/arch/next68k/include/intr.h:1.23 src/sys/arch/next68k/include/intr.h:1.24
--- src/sys/arch/next68k/include/intr.h:1.23 Tue Jul 11 11:13:32 2023
+++ src/sys/arch/next68k/include/intr.h Thu Jan 18 13:46:14 2024
@@ -1,10 +1,12 @@
-/* $NetBSD: intr.h,v 1.23 2023/07/11 11:13:32 riastradh Exp $ */
+/* $NetBSD: intr.h,v 1.24 2024/01/18 13:46:14 thorpej Exp $ */
-/*
- * Copyright (C) 1997 Scott Reynolds
- * Copyright (C) 1998 Darrin Jewell
+/*-
+ * Copyright (c) 2024 The NetBSD Foundation, Inc.
* All rights reserved.
*
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -13,93 +15,45 @@
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in the
*documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior
CVS commit: src/sys/arch/next68k
Module Name:src Committed By: thorpej Date: Thu Jan 18 13:46:14 UTC 2024 Modified Files: src/sys/arch/next68k/conf: files.next68k src/sys/arch/next68k/include: cpu.h intr.h types.h vectors.h Log Message: Switch next68k over to common interrupt dispatch and G/C __HAVE_LEGACY_INTRCNT. Also included is G/C of the old ssir stuff that's no longer used. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/next68k/conf/files.next68k cvs rdiff -u -r1.54 -r1.55 src/sys/arch/next68k/include/cpu.h cvs rdiff -u -r1.23 -r1.24 src/sys/arch/next68k/include/intr.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/next68k/include/types.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/next68k/include/vectors.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/virt68k/virt68k
Module Name:src Committed By: isaki Date: Thu Jan 18 12:07:51 UTC 2024 Modified Files: src/sys/arch/virt68k/virt68k: locore.s Log Message: Set TT0 register to recognize the I/O space even on the 68030 case. http://mail-index.netbsd.org/port-m68k/2024/01/17/msg000870.html To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/virt68k/virt68k/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/virt68k/virt68k/locore.s diff -u src/sys/arch/virt68k/virt68k/locore.s:1.13 src/sys/arch/virt68k/virt68k/locore.s:1.14 --- src/sys/arch/virt68k/virt68k/locore.s:1.13 Wed Jan 17 12:33:51 2024 +++ src/sys/arch/virt68k/virt68k/locore.s Thu Jan 18 12:07:51 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.13 2024/01/17 12:33:51 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.14 2024/01/18 12:07:51 isaki Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -199,8 +199,13 @@ Lnot060cache: jmp Lenab1 Lmotommu2: + movl #VIRT68K_TT30_IO,%sp@- | TT0 maps the I/O space + .long 0xf0170800 | pmove %sp@,%tt0 + clrl %sp@ | ensure TT1 is disabled + .long 0xf0170c00 | pmove %sp@,%tt1 + pflusha - movl #MMU51_TCR_BITS,%sp@- | value to load TC with + movl #MMU51_TCR_BITS,%sp@ | value to load TC with pmove %sp@,%tc | load it /*
CVS commit: src/sys/arch/virt68k/virt68k
Module Name:src Committed By: isaki Date: Thu Jan 18 12:07:51 UTC 2024 Modified Files: src/sys/arch/virt68k/virt68k: locore.s Log Message: Set TT0 register to recognize the I/O space even on the 68030 case. http://mail-index.netbsd.org/port-m68k/2024/01/17/msg000870.html To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/virt68k/virt68k/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: macallan Date: Thu Jan 18 10:34:29 UTC 2024 Modified Files: src/sys/arch/hppa/hppa: mainbus.c Log Message: rearrange things so we: - find machine_ledaddr on Cxxx and the like without lcd at mainbus - build without options USELEDS To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hppa/hppa/mainbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/hppa
Module Name:src
Committed By: macallan
Date: Thu Jan 18 10:34:29 UTC 2024
Modified Files:
src/sys/arch/hppa/hppa: mainbus.c
Log Message:
rearrange things so we:
- find machine_ledaddr on Cxxx and the like without lcd at mainbus
- build without options USELEDS
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hppa/hppa/mainbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/hppa/mainbus.c
diff -u src/sys/arch/hppa/hppa/mainbus.c:1.11 src/sys/arch/hppa/hppa/mainbus.c:1.12
--- src/sys/arch/hppa/hppa/mainbus.c:1.11 Tue Oct 11 22:03:37 2022
+++ src/sys/arch/hppa/hppa/mainbus.c Thu Jan 18 10:34:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.11 2022/10/11 22:03:37 andvar Exp $ */
+/* $NetBSD: mainbus.c,v 1.12 2024/01/18 10:34:29 macallan Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,11 +58,12 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11 2022/10/11 22:03:37 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12 2024/01/18 10:34:29 macallan Exp $");
#include "locators.h"
#include "power.h"
#include "lcd.h"
+#include "opt_useleds.h"
#include
#include
@@ -83,9 +84,7 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
#include
#include
-#if NLCD > 0
static struct pdc_chassis_info pdc_chassis_info;
-#endif
#ifdef MBUSDEBUG
@@ -1362,9 +1361,7 @@ mbattach(device_t parent, device_t self,
struct mainbus_softc *sc = device_private(self);
struct confargs nca;
bus_space_handle_t ioh;
-#if NLCD > 0
int err;
-#endif
sc->sc_dv = self;
mb_attached = 1;
@@ -1409,11 +1406,11 @@ mbattach(device_t parent, device_t self,
config_found(self, , mbprint, CFARGS_NONE);
#endif
-#if NLCD > 0
memset(, 0, sizeof(nca));
err = pdcproc_chassis_info(_chassis_info, _pcl);
if (!err) {
if (nca.ca_pcl.enabled) {
+#if NLCD > 0
nca.ca_name = "lcd";
nca.ca_dp.dp_bc[0] = nca.ca_dp.dp_bc[1] = nca.ca_dp.dp_bc[2] =
nca.ca_dp.dp_bc[3] = nca.ca_dp.dp_bc[4] = nca.ca_dp.dp_bc[5] = -1;
@@ -1423,13 +1420,15 @@ mbattach(device_t parent, device_t self,
nca.ca_hpa = nca.ca_pcl.cmd_addr;
config_found(self, , mbprint, CFARGS_NONE);
+#endif
} else if (nca.ca_pcl.model == 2) {
+#ifdef USELEDS
bus_space_map(_bustag, nca.ca_pcl.cmd_addr,
4, 0, (bus_space_handle_t *)_ledaddr);
machine_ledword = 1;
+#endif
}
}
-#endif
hppa_modules_scan();
