[src/jdolecek-ncq]: src/sys/dev/ic Use ata_kill_active() in siisata_reset_cha...

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

details:   https://anonhg.NetBSD.org/src/rev/b4f23cc38ab5
branches:  jdolecek-ncq
changeset: 352648:b4f23cc38ab5
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sun Apr 23 14:25:02 2017 +0000

description:
Use ata_kill_active() in siisata_reset_channel() so as to ensure all
in-flight xfers are taken care of.

diffstat:

 sys/dev/ic/siisata.c |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r a9f8ec6066a9 -r b4f23cc38ab5 sys/dev/ic/siisata.c
--- a/sys/dev/ic/siisata.c      Sun Apr 23 09:16:35 2017 +0000
+++ b/sys/dev/ic/siisata.c      Sun Apr 23 14:25:02 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata.c,v 1.30.4.9 2017/04/23 01:26:50 jakllsch Exp $ */
+/* $NetBSD: siisata.c,v 1.30.4.10 2017/04/23 14:25:02 jakllsch Exp $ */
 
 /* from ahcisata_core.c */
 
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.30.4.9 2017/04/23 01:26:50 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.30.4.10 2017/04/23 14:25:02 jakllsch Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -624,7 +624,6 @@
 {
        struct siisata_softc *sc = (struct siisata_softc *)chp->ch_atac;
        struct siisata_channel *schp = (struct siisata_channel *)chp;
-       struct ata_xfer *xfer;
 
        SIISATA_DEBUG_PRINT(("%s: %s\n", SIISATANAME(sc), __func__),
            DEBUG_FUNCS);
@@ -640,9 +639,7 @@
                DELAY(10);
        PRWRITE(sc, PRX(chp->ch_channel, PRO_SERROR),
            PRREAD(sc, PRX(chp->ch_channel, PRO_SERROR)));
-       if ((xfer = ata_queue_hwslot_to_xfer(chp->ch_queue, 0)) != NULL) { /* XXX slot */
-               (*xfer->c_kill_xfer)(chp, xfer, KILL_RESET);
-       }
+       ata_kill_active(chp, KILL_RESET);
 
        return;
 }