Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do cached memory access to L1 tables, making sure to write-back the 

cache after any L1 table modifications.
This commit is contained in:
thorpej 2002-08-21 18:34:31 +00:00
parent 9e8e6611e8
commit 5fddbbe3d5
10 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/acorn32/acorn32/rpc_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rpc_machdep.c,v 1.38 2002/07/31 00:20:51 thorpej Exp $ */
/* $NetBSD: rpc_machdep.c,v 1.39 2002/08/21 18:34:31 thorpej Exp $ */
/*
* Copyright (c) 2000-2001 Reinoud Zandijk.
@ -55,7 +55,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.38 2002/07/31 00:20:51 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.39 2002/08/21 18:34:31 thorpej Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@ -746,7 +746,7 @@ initarm(void *cookie)
UPAGES * NBPG, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
pmap_map_chunk(l1pagetable, kernel_l1pt.pv_va, kernel_l1pt.pv_pa,
L1_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE);
L1_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
/* Map the page table that maps the kernel pages */
pmap_map_entry(l1pagetable, kernel_ptpt.pv_va, kernel_ptpt.pv_pa,

28
sys/arch/arm/arm32/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.109 2002/08/13 03:36:30 thorpej Exp $ */
/* $NetBSD: pmap.c,v 1.110 2002/08/21 18:34:31 thorpej Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@ -143,7 +143,7 @@
#include <machine/param.h>
#include <arm/arm32/katelib.h>
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.109 2002/08/13 03:36:30 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.110 2002/08/21 18:34:31 thorpej Exp $");
#ifdef PMAP_DEBUG
#define PDEBUG(_lev_,_stat_) \
if (pmap_debug_level >= (_lev_)) \
@ -902,6 +902,7 @@ pmap_map_in_l1(struct pmap *pmap, vaddr_t va, paddr_t l2pa, boolean_t selfref)
pmap->pm_pdir[ptva + 1] = L1_C_PROTO | (l2pa + 0x400);
pmap->pm_pdir[ptva + 2] = L1_C_PROTO | (l2pa + 0x800);
pmap->pm_pdir[ptva + 3] = L1_C_PROTO | (l2pa + 0xc00);
cpu_dcache_wb_range((vaddr_t) &pmap->pm_pdir[ptva + 0], 16);
/* Map the page table into the page table area. */
if (selfref)
@ -923,6 +924,7 @@ pmap_unmap_in_l1(struct pmap *pmap, vaddr_t va)
pmap->pm_pdir[ptva + 1] = 0;
pmap->pm_pdir[ptva + 2] = 0;
pmap->pm_pdir[ptva + 3] = 0;
cpu_dcache_wb_range((vaddr_t) &pmap->pm_pdir[ptva + 0], 16);
/* Unmap the page table from the page table area. */
*((pt_entry_t *)(pmap->pm_vptpt + ptva)) = 0;
@ -1175,7 +1177,6 @@ pmap_alloc_l1pt(void)
struct l1pt *pt;
int error;
struct vm_page *m;
pt_entry_t *pte;
/* Allocate virtual address space for the L1 page table */
va = uvm_km_valloc(kernel_map, L1_TABLE_SIZE);
@ -1213,17 +1214,7 @@ pmap_alloc_l1pt(void)
while (m && va < (pt->pt_va + L1_TABLE_SIZE)) {
pa = VM_PAGE_TO_PHYS(m);
pte = vtopte(va);
/*
* Assert that the PTE is invalid. If it's invalid,
* then we are guaranteed that there won't be an entry
* for this VA in the TLB.
*/
KDASSERT(pmap_pte_v(pte) == 0);
*pte = L2_S_PROTO | VM_PAGE_TO_PHYS(m) |
L2_S_PROT(PTE_KERNEL, VM_PROT_READ|VM_PROT_WRITE);
pmap_kenter_pa(va, pa, VM_PROT_READ|VM_PROT_WRITE);
va += NBPG;
m = m->pageq.tqe_next;
@ -1364,8 +1355,11 @@ pmap_allocpagedir(struct pmap *pmap)
pmap->pm_pdir = (pd_entry_t *)pt->pt_va;
/* Clean the L1 if it is dirty */
if (!(pt->pt_flags & PTFLAG_CLEAN))
if (!(pt->pt_flags & PTFLAG_CLEAN)) {
bzero((void *)pmap->pm_pdir, (L1_TABLE_SIZE - KERNEL_PD_SIZE));
cpu_dcache_wb_range((vaddr_t) pmap->pm_pdir,
(L1_TABLE_SIZE - KERNEL_PD_SIZE));
}
/* Allocate a page table to map all the page tables for this pmap */
if ((error = pmap_alloc_ptpt(pmap)) != 0) {
@ -1380,12 +1374,14 @@ pmap_allocpagedir(struct pmap *pmap)
bcopy((char *)pmap_kernel()->pm_pdir + (L1_TABLE_SIZE - KERNEL_PD_SIZE),
(char *)pmap->pm_pdir + (L1_TABLE_SIZE - KERNEL_PD_SIZE),
KERNEL_PD_SIZE);
cpu_dcache_wb_range((vaddr_t)pmap->pm_pdir +
(L1_TABLE_SIZE - KERNEL_PD_SIZE), KERNEL_PD_SIZE);
/* Wire in this page table */
pmap_map_in_l1(pmap, PTE_BASE, pmap->pm_pptpt, TRUE);
pt->pt_flags &= ~PTFLAG_CLEAN; /* L1 is dirty now */
/*
* Map the kernel page tables into the new PT map.
*/

4
sys/arch/cats/cats/cats_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cats_machdep.c,v 1.32 2002/07/31 17:34:25 thorpej Exp $ */
/* $NetBSD: cats_machdep.c,v 1.33 2002/08/21 18:34:31 thorpej Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@ -616,7 +616,7 @@ initarm(bootargs)
UPAGES * NBPG, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
pmap_map_chunk(l1pagetable, kernel_l1pt.pv_va, kernel_l1pt.pv_pa,
L1_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE);
L1_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
/* Map the page table that maps the kernel pages */
pmap_map_entry(l1pagetable, kernel_ptpt.pv_va, kernel_ptpt.pv_pa,

4
sys/arch/evbarm/integrator/integrator_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: integrator_machdep.c,v 1.25 2002/07/31 00:20:53 thorpej Exp $ */
/* $NetBSD: integrator_machdep.c,v 1.26 2002/08/21 18:34:32 thorpej Exp $ */
/*
* Copyright (c) 2001,2002 ARM Ltd
@ -645,7 +645,7 @@ initarm(void *arg)
UPAGES * NBPG, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
pmap_map_chunk(l1pagetable, kernel_l1pt.pv_va, kernel_l1pt.pv_pa,
L1_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE);
L1_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
/* Map the page table that maps the kernel pages */
pmap_map_entry(l1pagetable, kernel_ptpt.pv_va, kernel_ptpt.pv_pa,

4
sys/arch/evbarm/iq80310/iq80310_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iq80310_machdep.c,v 1.42 2002/07/31 00:20:53 thorpej Exp $ */
/* $NetBSD: iq80310_machdep.c,v 1.43 2002/08/21 18:34:32 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@ -601,7 +601,7 @@ initarm(void *arg)
UPAGES * NBPG, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
pmap_map_chunk(l1pagetable, kernel_l1pt.pv_va, kernel_l1pt.pv_pa,
L1_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE);
L1_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
/* Map the Mini-Data cache clean area. */
xscale_setup_minidata(l1pagetable, minidataclean.pv_va,

4
sys/arch/evbarm/iq80321/iq80321_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iq80321_machdep.c,v 1.9 2002/08/17 19:19:57 briggs Exp $ */
/* $NetBSD: iq80321_machdep.c,v 1.10 2002/08/21 18:34:32 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@ -600,7 +600,7 @@ initarm(void *arg)
UPAGES * NBPG, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
pmap_map_chunk(l1pagetable, kernel_l1pt.pv_va, kernel_l1pt.pv_pa,
L1_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE);
L1_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
/* Map the Mini-Data cache clean area. */
xscale_setup_minidata(l1pagetable, minidataclean.pv_va,

4
sys/arch/evbarm/ixm1200/ixm1200_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ixm1200_machdep.c,v 1.4 2002/07/31 00:20:53 thorpej Exp $ */
/* $NetBSD: ixm1200_machdep.c,v 1.5 2002/08/21 18:34:33 thorpej Exp $ */
#undef DEBUG_BEFOREMMU
/*
* Copyright (c) 2002
@ -573,7 +573,7 @@ initarm(void *arg)
UPAGES * NBPG, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
pmap_map_chunk(l1pagetable, kernel_l1pt.pv_va, kernel_l1pt.pv_pa,
L1_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE);
L1_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
/* Map the page table that maps the kernel pages */
pmap_map_entry(l1pagetable, kernel_ptpt.pv_va, kernel_ptpt.pv_pa,

4
sys/arch/hpcarm/hpcarm/hpc_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpc_machdep.c,v 1.51 2002/07/31 00:20:54 thorpej Exp $ */
/* $NetBSD: hpc_machdep.c,v 1.52 2002/08/21 18:34:33 thorpej Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -571,7 +571,7 @@ initarm(argc, argv, bi)
UPAGES * NBPG, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
pmap_map_chunk(l1pagetable, kernel_l1pt.pv_va, kernel_l1pt.pv_pa,
L1_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE);
L1_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
/* Map the page table that maps the kernel pages */
pmap_map_entry(l1pagetable, kernel_ptpt.pv_va, kernel_ptpt.pv_pa,

4
sys/arch/netwinder/netwinder/netwinder_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: netwinder_machdep.c,v 1.34 2002/07/31 17:34:26 thorpej Exp $ */
/* $NetBSD: netwinder_machdep.c,v 1.35 2002/08/21 18:34:33 thorpej Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@ -603,7 +603,7 @@ initarm(void)
UPAGES * NBPG, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
pmap_map_chunk(l1pagetable, kernel_l1pt.pv_va, kernel_l1pt.pv_pa,
L1_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE);
L1_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
/* Map the page table that maps the kernel pages */
pmap_map_entry(l1pagetable, kernel_ptpt.pv_va, kernel_ptpt.pv_pa,

4
sys/arch/shark/ofw/ofw.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ofw.c,v 1.17 2002/07/31 17:34:27 thorpej Exp $ */
/* $NetBSD: ofw.c,v 1.18 2002/08/21 18:34:33 thorpej Exp $ */
/*
* Copyright 1997
@ -1451,7 +1451,7 @@ ofw_construct_proc0_addrspace(proc0_ttbbase, proc0_ptpt)
pmap_map_entry(L1pagetable,
proc0_pagedir.pv_va + NBPG * i,
proc0_pagedir.pv_pa + NBPG * i,
VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE);
VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
/*
* Construct the proc0 L2 pagetables that map page tables.