[src/trunk]: src/sys/arch/arm/arm32 fix writebuf draining fix.

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4002c3dcfd7f
branches:  trunk
changeset: 784915:4002c3dcfd7f
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Feb 14 01:12:39 2013 +0000

description:
fix writebuf draining fix.

diffstat:

 sys/arch/arm/arm32/bus_dma.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (32 lines):

diff -r a7845abcdd8a -r 4002c3dcfd7f sys/arch/arm/arm32/bus_dma.c
--- a/sys/arch/arm/arm32/bus_dma.c      Thu Feb 14 01:06:04 2013 +0000
+++ b/sys/arch/arm/arm32/bus_dma.c      Thu Feb 14 01:12:39 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.74 2013/02/13 23:08:45 matt Exp $        */
+/*     $NetBSD: bus_dma.c,v 1.75 2013/02/14 01:12:39 matt Exp $        */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #define _ARM32_BUS_DMA_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.74 2013/02/13 23:08:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.75 2013/02/14 01:12:39 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1016,10 +1016,10 @@
 #endif /* _ARM32_NEED_BUS_DMA_BOUNCE */
 
        /* Skip cache frobbing if mapping was COHERENT. */
-       if (!bouncing && pre_ops == 0
-           && (map->_dm_flags & _BUS_DMAMAP_COHERENT)) {
+       if (!bouncing && (map->_dm_flags & _BUS_DMAMAP_COHERENT)) {
                /* Drain the write buffer. */
-               cpu_drain_writebuf();
+               if (pre_ops & BUS_DMASYNC_PREWRITE)
+                       cpu_drain_writebuf();
                return;
        }