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 <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/systm.h>
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/systm.h>
@@ -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 <m68k/cacheops.h>
-
-/*
- * 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
-
