Module Name: src
Committed By: cliff
Date: Mon Nov 9 09:58:46 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: bus_dma.c
Log Message:
- in _bus_dmamem_map() use uncached addressing when caller requests
BUS_DMA_COHERENT, but cpu does not have CPU_MIPS_D_CACHE_COHERENT
To generate a diff of this commit:
cvs rdiff -u -r1.22.16.5 -r1.22.16.6 src/sys/arch/mips/mips/bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/bus_dma.c
diff -u src/sys/arch/mips/mips/bus_dma.c:1.22.16.5 src/sys/arch/mips/mips/bus_dma.c:1.22.16.6
--- src/sys/arch/mips/mips/bus_dma.c:1.22.16.5 Tue Sep 8 08:11:29 2009
+++ src/sys/arch/mips/mips/bus_dma.c Mon Nov 9 09:58:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.22.16.5 2009/09/08 08:11:29 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.22.16.6 2009/11/09 09:58:45 cliff Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.22.16.5 2009/09/08 08:11:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.22.16.6 2009/11/09 09:58:45 cliff Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -660,14 +660,16 @@
*/
if (nsegs == 1) {
#ifdef _LP64
- if (flags & BUS_DMA_COHERENT)
+ if (((mips_cpu_flags & CPU_MIPS_D_CACHE_COHERENT) == 0)
+ && (flags & BUS_DMA_COHERENT))
*kvap = (void *)MIPS_PHYS_TO_XKPHYS_UNCACHED(
segs[0].ds_addr);
else
*kvap = (void *)MIPS_PHYS_TO_XKPHYS_CACHED(
segs[0].ds_addr);
#else
- if (flags & BUS_DMA_COHERENT)
+ if (((mips_cpu_flags & CPU_MIPS_D_CACHE_COHERENT) == 0)
+ && (flags & BUS_DMA_COHERENT))
*kvap = (void *)MIPS_PHYS_TO_KSEG1(segs[0].ds_addr);
else
*kvap = (void *)MIPS_PHYS_TO_KSEG0(segs[0].ds_addr);
