[src/trunk]: src/sys/arch/x68k/dev To abort DMA in dmac_abort_xfer(), set DMA...

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

details:   https://anonhg.NetBSD.org/src/rev/1d83f3fad2e6
branches:  trunk
changeset: 782075:1d83f3fad2e6
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Oct 14 16:36:31 2012 +0000

description:
To abort DMA in dmac_abort_xfer(), set DMAC_CCR_SAB (software abort)
rather than DMAC_CCR_HLT (halt operation).

DMAC_CCR_HLT doesn't abort DMA xfers but only suspends DMA ops
(i.e. clearing HLT bit will resume DMA xfers), so previously
DMAC error always occurs on the next DMA xfer ops after
dmac_abort_xfer() is called.

Also suppress DMAC error messages in dmac_error() if it's caused
by software abort command because it can happen during normal
audio play/record DMA ops in vs(4) driver.

diffstat:

 sys/arch/x68k/dev/intio_dmac.c |  20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diffs (49 lines):

diff -r 7c2cc957da93 -r 1d83f3fad2e6 sys/arch/x68k/dev/intio_dmac.c
--- a/sys/arch/x68k/dev/intio_dmac.c    Sun Oct 14 16:20:04 2012 +0000
+++ b/sys/arch/x68k/dev/intio_dmac.c    Sun Oct 14 16:36:31 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intio_dmac.c,v 1.33 2010/06/06 04:50:08 mrg Exp $      */
+/*     $NetBSD: intio_dmac.c,v 1.34 2012/10/14 16:36:31 tsutsui Exp $  */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 #include "opt_m68k_arch.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intio_dmac.c,v 1.33 2010/06/06 04:50:08 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intio_dmac.c,v 1.34 2012/10/14 16:36:31 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -530,10 +530,18 @@
 {
        struct dmac_channel_stat *chan = arg;
        struct dmac_softc *sc = chan->ch_softc;
+       uint8_t csr, cer;
 
-       printf("DMAC transfer error CSR=%02x, CER=%02x\n",
-               bus_space_read_1(sc->sc_bst, chan->ch_bht, DMAC_REG_CSR),
-               bus_space_read_1(sc->sc_bst, chan->ch_bht, DMAC_REG_CER));
+       csr = bus_space_read_1(sc->sc_bst, chan->ch_bht, DMAC_REG_CSR);
+       cer = bus_space_read_1(sc->sc_bst, chan->ch_bht, DMAC_REG_CER);
+
+#ifndef DMAC_DEBUG
+       /* Software abort (CER=0x11) could happen on normal xfer termination */
+       if (cer != 0x11)
+#endif
+       {
+               printf("DMAC transfer error CSR=%02x, CER=%02x\n", csr, cer);
+       }
        DDUMPREGS(3, ("registers were:\n"));
 
        /* Clear the status bits */
@@ -552,7 +560,7 @@
        struct dmac_channel_stat *chan = xf->dx_channel;
 
        bus_space_write_1(dmac->sc_bst, chan->ch_bht, DMAC_REG_CCR,
-                         DMAC_CCR_INT | DMAC_CCR_HLT);
+                         DMAC_CCR_INT | DMAC_CCR_SAB);
        bus_space_write_1(dmac->sc_bst, chan->ch_bht, DMAC_REG_CSR, 0xff);
        xf->dx_nextoff = xf->dx_nextsize = -1;