Module Name: src
Committed By: mlelstv
Date: Tue Mar 19 06:47:12 UTC 2019
Modified Files:
src/sys/dev/ata: wd.c
Log Message:
Move standby on detach after wedges deletion in case wedges trigger
I/O on the parent disk. Add debug messages.
To generate a diff of this commit:
cvs rdiff -u -r1.443 -r1.444 src/sys/dev/ata/wd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.443 src/sys/dev/ata/wd.c:1.444
--- src/sys/dev/ata/wd.c:1.443 Wed Oct 24 19:46:44 2018
+++ src/sys/dev/ata/wd.c Tue Mar 19 06:47:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.443 2018/10/24 19:46:44 jdolecek Exp $ */
+/* $NetBSD: wd.c,v 1.444 2019/03/19 06:47:12 mlelstv 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.443 2018/10/24 19:46:44 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.444 2019/03/19 06:47:12 mlelstv Exp $");
#include "opt_ata.h"
#include "opt_wd.h"
@@ -534,12 +534,12 @@ wddetach(device_t self, int flags)
bufq_free(dksc->sc_bufq);
- if (flags & DETACH_POWEROFF)
- wd_standby(wd, AT_POLL);
-
/* Delete all of our wedges. */
dkwedge_delall(&dksc->sc_dkdev);
+ if (flags & DETACH_POWEROFF)
+ wd_standby(wd, AT_POLL);
+
/* Detach from the disk list. */
disk_detach(&dksc->sc_dkdev);
disk_destroy(&dksc->sc_dkdev);
@@ -1729,6 +1729,7 @@ wd_standby(struct wd_softc *wd, int flag
struct ata_xfer *xfer;
int error;
+ aprint_debug_dev(dksc->sc_dev, "standby immediate\n");
xfer = ata_get_xfer(wd->drvp->chnl_softc, true);
xfer->c_ata_c.r_command = WDCC_STANDBY_IMMED;
@@ -1745,6 +1746,8 @@ wd_standby(struct wd_softc *wd, int flag
if (xfer->c_ata_c.flags & AT_ERROR) {
if (xfer->c_ata_c.r_error == WDCE_ABRT) {
/* command not supported */
+ aprint_debug_dev(dksc->sc_dev,
+ "standby immediate not supported\n");
error = ENODEV;
goto out;
}
