[src/trunk]: src/sys/arch/arm/broadcom When halting a channel, abort the curr...

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

details:   https://anonhg.NetBSD.org/src/rev/2fd105d1493c
branches:  trunk
changeset: 339655:2fd105d1493c
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Aug 02 16:46:12 2015 +0000

description:
When halting a channel, abort the current DMA CB and reset the channel
before stopping DMA.

diffstat:

 sys/arch/arm/broadcom/bcm2835_dmac.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r a824f211fa9a -r 2fd105d1493c sys/arch/arm/broadcom/bcm2835_dmac.c
--- a/sys/arch/arm/broadcom/bcm2835_dmac.c      Sun Aug 02 12:19:12 2015 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_dmac.c      Sun Aug 02 16:46:12 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_dmac.c,v 1.11 2015/07/29 14:22:49 skrll Exp $ */
+/* $NetBSD: bcm2835_dmac.c,v 1.12 2015/08/02 16:46:12 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_dmac.c,v 1.11 2015/07/29 14:22:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_dmac.c,v 1.12 2015/08/02 16:46:12 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -275,6 +275,9 @@
 void
 bcm_dmac_halt(struct bcm_dmac_channel *ch)
 {
+       struct bcm_dmac_softc *sc = ch->ch_sc;
+
+       DMAC_WRITE(sc, DMAC_CS(ch->ch_index), DMAC_CS_RESET|DMAC_CS_ABORT);
        bcm_dmac_set_conblk_addr(ch, 0);
 }