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

Correct the usage of the 4th arg to mainbus_bs_map. It's a flags arg, so 

test for the CACHEABLE bit, rather than assuming a non-zero means cacheable
This commit is contained in:
chris 2004-01-01 18:07:27 +00:00
parent 7ef29ca465
commit 8261a721cc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arch/arm/mainbus/mainbus_io.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus_io.c,v 1.14 2003/12/06 22:05:33 bjh21 Exp $ */ /* $NetBSD: mainbus_io.c,v 1.15 2004/01/01 18:07:27 chris Exp $ */
/* /*
* Copyright (c) 1997 Mark Brinicombe. * Copyright (c) 1997 Mark Brinicombe.
@ -37,7 +37,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mainbus_io.c,v 1.14 2003/12/06 22:05:33 bjh21 Exp $"); __KERNEL_RCSID(0, "$NetBSD: mainbus_io.c,v 1.15 2004/01/01 18:07:27 chris Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -134,11 +134,11 @@ struct bus_space mainbus_bs_tag = {
/* bus space functions */ /* bus space functions */
int int
mainbus_bs_map(t, bpa, size, cacheable, bshp) mainbus_bs_map(t, bpa, size, flags, bshp)
void *t; void *t;
bus_addr_t bpa; bus_addr_t bpa;
bus_size_t size; bus_size_t size;
int cacheable; int flags;
bus_space_handle_t *bshp; bus_space_handle_t *bshp;
{ {
u_long startpa, endpa, pa; u_long startpa, endpa, pa;
@ -164,8 +164,8 @@ mainbus_bs_map(t, bpa, size, cacheable, bshp)
for(pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) { for(pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE); pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE);
pte = vtopte(va); if ((flags & BUS_SPACE_MAP_CACHEABLE) == 0) {
if (cacheable == 0) { pte = vtopte(va);
*pte &= ~L2_S_CACHE_MASK; *pte &= ~L2_S_CACHE_MASK;
PTE_SYNC(pte); PTE_SYNC(pte);
} }