diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-04-26 20:38:38 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-04-26 20:38:38 +0000 |
| commit | 95abc0474d6c420ccdb7bb26f3808d9cf1b20cad (patch) | |
| tree | 3438ca6764f7d392258eb6fbc4c5519fcc6bfbe0 /sys | |
| parent | 4af9dc6ba38fb79fa8373aa57aa58461b14f4152 (diff) | |
In pmap_cache_ctrl(), do not flush cache if the previous mapping was
cache inhibited; from the AV tree.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/m88k/m88k/pmap.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/sys/arch/m88k/m88k/pmap.c b/sys/arch/m88k/m88k/pmap.c index 2c987e1bc3f..99f16d2a14f 100644 --- a/sys/arch/m88k/m88k/pmap.c +++ b/sys/arch/m88k/m88k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.21 2005/12/11 21:45:30 miod Exp $ */ +/* $OpenBSD: pmap.c,v 1.22 2006/04/26 20:38:37 miod Exp $ */ /* * Copyright (c) 2001-2004, Miodrag Vallat * Copyright (c) 1998-2001 Steve Murphree, Jr. @@ -434,7 +434,7 @@ void pmap_cache_ctrl(pmap_t pmap, vaddr_t s, vaddr_t e, u_int mode) { int spl; - pt_entry_t *pte; + pt_entry_t opte, *pte; vaddr_t va; paddr_t pa; boolean_t kflush; @@ -473,20 +473,24 @@ pmap_cache_ctrl(pmap_t pmap, vaddr_t s, vaddr_t e, u_int mode) * the modified bit and/or the reference bit by any other cpu. * XXX */ - *pte = (invalidate_pte(pte) & ~CACHE_MASK) | mode; + opte = invalidate_pte(pte); + *pte = (opte & ~CACHE_MASK) | mode; flush_atc_entry(users, va, kflush); /* - * Data cache should be copied back and invalidated. + * Data cache should be copied back and invalidated if + * the old mapping was cached. */ - pa = ptoa(PG_PFNUM(*pte)); + if ((opte & CACHE_MASK) != CACHE_INH) { + pa = ptoa(PG_PFNUM(opte)); #ifdef MULTIPROCESSOR - for (cpu = 0; cpu < MAX_CPUS; cpu++) - if (m88k_cpus[cpu].ci_alive != 0) + for (cpu = 0; cpu < MAX_CPUS; cpu++) + if (m88k_cpus[cpu].ci_alive != 0) #else - cpu = cpu_number(); + cpu = cpu_number(); #endif - cmmu_flush_cache(cpu, pa, PAGE_SIZE); + cmmu_flush_cache(cpu, pa, PAGE_SIZE); + } } PMAP_UNLOCK(pmap); splx(spl); |