[src/netbsd-1-5]: src/sys/arch/atari/atari Pullup 1.21 - 1.22. Approved by th...

[leo <leo%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d2b5c7ff3dbb
branches:  netbsd-1-5
changeset: 488441:d2b5c7ff3dbb
user:      leo <leo%NetBSD.org@localhost>
date:      Thu Jul 06 11:29:58 2000 +0000

description:
Pullup 1.21 - 1.22. Approved by thorpej.

When mapping non-cacheable memory with bus_space_map, make sure we use the
precise (serialized) way.

diffstat:

 sys/arch/atari/atari/bus.c |  15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r c284e631588c -r d2b5c7ff3dbb sys/arch/atari/atari/bus.c
--- a/sys/arch/atari/atari/bus.c        Thu Jul 06 01:20:13 2000 +0000
+++ b/sys/arch/atari/atari/bus.c        Thu Jul 06 11:29:58 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus.c,v 1.19.4.1 2000/06/30 16:27:19 simonb Exp $      */
+/*     $NetBSD: bus.c,v 1.19.4.2 2000/07/06 11:29:58 leo Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -270,11 +270,22 @@
        *bshp = (caddr_t)(va + (bpa & PGOFSET));
 
        for(; pa < endpa; pa += NBPG, va += NBPG) {
+               u_int   *ptep, npte;
+
                pmap_enter(pmap_kernel(), (vaddr_t)va, pa,
                                VM_PROT_READ|VM_PROT_WRITE, PMAP_WIRED);
+
+               ptep = kvtopte(va);
+               npte = *ptep & ~PG_CMASK;
+
                if (!(flags & BUS_SPACE_MAP_CACHEABLE))
-                       pmap_changebit(pa, PG_CI, TRUE);
+                       npte |= PG_CI;
+               else if (mmutype == MMU_68040)
+                       npte |= PG_CCB;
+
+               *ptep = npte;
        }
+       TBIAS();
        return (0);
 }