[src/jdolecek-ncq]: src/sys/dev/ic put the non-NCQ KASSERT() before edma disa...

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

details:   https://anonhg.NetBSD.org/src/rev/5c33e6941b55
branches:  jdolecek-ncq
changeset: 823005:5c33e6941b55
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sun Aug 13 11:48:53 2017 +0000

description:
put the non-NCQ KASSERT() before edma disable for bio PIO, we are not supposed
to get there with NCQ command even on retries any more

diffstat:

 sys/dev/ic/mvsata.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 5fde5da7b631 -r 5c33e6941b55 sys/dev/ic/mvsata.c
--- a/sys/dev/ic/mvsata.c       Sun Aug 13 11:46:32 2017 +0000
+++ b/sys/dev/ic/mvsata.c       Sun Aug 13 11:48:53 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mvsata.c,v 1.35.6.22 2017/08/12 22:43:22 jdolecek Exp $        */
+/*     $NetBSD: mvsata.c,v 1.35.6.23 2017/08/13 11:48:53 jdolecek Exp $        */
 /*
  * Copyright (c) 2008 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.35.6.22 2017/08/12 22:43:22 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.35.6.23 2017/08/13 11:48:53 jdolecek Exp $");
 
 #include "opt_mvsata.h"
 
@@ -1339,6 +1339,7 @@
                            WDCC_READ : WDCC_WRITE;
 
                /* EDMA disable, if enabled this channel. */
+               KASSERT((chp->ch_flags & ATACH_NCQ) == 0);
                if (mvport->port_edmamode_curr != nodma)
                        mvsata_edma_disable(mvport, 10 /* ms */, wait_flags);