[src/jdolecek-ncq]: src/sys/dev/ata for wd, only call disk_busy() on the firs...

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

details:   https://anonhg.NetBSD.org/src/rev/09a00cdd5a03
branches:  jdolecek-ncq
changeset: 822970:09a00cdd5a03
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sun Jul 23 13:50:43 2017 +0000

description:
for wd, only call disk_busy() on the first try, do not call it on retries,
as unbusy is called just once when the xfer is finished

also noticed in PR kern/43169 by Matthias Pfaller, but contrary to suggested
fix done in way to keep the disk marked busy during the timeouts, as I think
it's more correct

diffstat:

 sys/dev/ata/wd.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r f9cd144622f5 -r 09a00cdd5a03 sys/dev/ata/wd.c
--- a/sys/dev/ata/wd.c  Sat Jul 22 22:02:21 2017 +0000
+++ b/sys/dev/ata/wd.c  Sun Jul 23 13:50:43 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wd.c,v 1.428.2.28 2017/07/21 17:32:27 jdolecek Exp $ */
+/*     $NetBSD: wd.c,v 1.428.2.29 2017/07/23 13:50:43 jdolecek Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.428.2.28 2017/07/21 17:32:27 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.428.2.29 2017/07/23 13:50:43 jdolecek Exp $");
 
 #include "opt_ata.h"
 #include "opt_wd.h"
@@ -766,7 +766,8 @@
        }
 
        /* Instrumentation. */
-       disk_busy(&wd->sc_dk);
+       if (xfer->c_retries == 0)
+               disk_busy(&wd->sc_dk);
        switch (wd->atabus->ata_bio(wd->drvp, xfer)) {
        case ATACMD_TRY_AGAIN:
                panic("wdstart1: try again");