[src/netbsd-1-4]: src/sys/arch/alpha/common Pull up revision 1.36 (requested ...

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

details:   https://anonhg.NetBSD.org/src/rev/2172b73c4f5d
branches:  netbsd-1-4
changeset: 470288:2172b73c4f5d
user:      he <he%NetBSD.org@localhost>
date:      Sun Feb 06 17:26:59 2000 +0000

description:
Pull up revision 1.36 (requested by thorpej):
  Fix host->device DMA data corruption problem on DEC Miata
  workstations.

diffstat:

 sys/arch/alpha/common/bus_dma.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 8279182abb2a -r 2172b73c4f5d sys/arch/alpha/common/bus_dma.c
--- a/sys/arch/alpha/common/bus_dma.c   Sun Feb 06 17:23:12 2000 +0000
+++ b/sys/arch/alpha/common/bus_dma.c   Sun Feb 06 17:26:59 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.29 1999/03/26 23:41:27 mycroft Exp $ */
+/* $NetBSD: bus_dma.c,v 1.29.2.1 2000/02/06 17:26:59 he Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.29 1999/03/26 23:41:27 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.29.2.1 2000/02/06 17:26:59 he Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -201,7 +201,8 @@
                        map->dm_segs[seg].ds_len = sgsize;
                        first = 0;
                } else {
-                       if (curaddr == lastaddr &&
+                       if ((map->_dm_flags & DMAMAP_NO_COALESCE) == 0 &&
+                           curaddr == lastaddr &&
                            (map->dm_segs[seg].ds_len + sgsize) <=
                             map->_dm_maxsegsz &&
                            (map->_dm_boundary == 0 ||