diff options
| author |   miod <miod@openbsd.org> | 2008-04-07 22:30:47 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2008-04-07 22:30:47 +0000 |
| commit | 6dbcba307d0b24e38729177e4304632f52c72f3d (patch) | |
| tree | 91fc359626607a8932a49c3432cf5a6834af0945 /sys/arch/sgi | |
| parent | Define the pte cacheability bits from the cpu.h cache coherency constants. (diff) | |
| download | wireguard-openbsd-6dbcba307d0b24e38729177e4304632f52c72f3d.tar.xz wireguard-openbsd-6dbcba307d0b24e38729177e4304632f52c72f3d.zip | |
Use CCA_CACHED as the default CCA for all cached mappings and addresses.
Diffstat (limited to 'sys/arch/sgi')
| -rw-r--r-- | sys/arch/sgi/sgi/bus_dma.c | 8 | ||||
| -rw-r--r-- | sys/arch/sgi/sgi/genassym.cf | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sys/arch/sgi/sgi/bus_dma.c b/sys/arch/sgi/sgi/bus_dma.c index 637a967c097..3094c1038a5 100644 --- a/sys/arch/sgi/sgi/bus_dma.c +++ b/sys/arch/sgi/sgi/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.4 2008/04/07 17:25:20 miod Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.5 2008/04/07 22:30:49 miod Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -492,10 +492,12 @@ _dmamem_map(t, segs, nsegs, size, kvap, flags) if (nsegs == 1) { pa = (*t->_device_to_pa)(segs[0].ds_addr); +#ifndef TGT_COHERENT if (flags & BUS_DMA_COHERENT) - *kvap = (caddr_t)PHYS_TO_XKPHYS(pa, CCA_NC); + *kvap = (caddr_t)PHYS_TO_UNCACHED(pa); else - *kvap = (caddr_t)PHYS_TO_XKPHYS(pa, CCA_NONCOHERENT); +#endif + *kvap = (caddr_t)PHYS_TO_XKPHYS(pa, CCA_CACHED); return (0); } diff --git a/sys/arch/sgi/sgi/genassym.cf b/sys/arch/sgi/sgi/genassym.cf index 9d6968489f0..d4a0404e4c6 100644 --- a/sys/arch/sgi/sgi/genassym.cf +++ b/sys/arch/sgi/sgi/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.11 2007/10/24 20:01:38 miod Exp $ +# $OpenBSD: genassym.cf,v 1.12 2008/04/07 22:30:49 miod Exp $ # # Copyright (c) 1997 Per Fogelstrom / Opsycon AB # @@ -69,5 +69,4 @@ struct pmap member pm_tlbpid export PMAP_SEGTABSIZE -export CCA_NC -export CCA_NONCOHERENT +export CCA_CACHED |