Module Name: src
Committed By: jdolecek
Date: Sat Jun 24 00:23:39 UTC 2017
Modified Files:
src/sys/dev/ata [jdolecek-ncq]: TODO.ncq
src/sys/dev/usb [jdolecek-ncq]: umass.c umass_isdata.c umass_isdata.h
Log Message:
add detach code for umass_isdata; compile-tested only
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.24 -r1.1.2.25 src/sys/dev/ata/TODO.ncq
cvs rdiff -u -r1.157 -r1.157.4.1 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.33.4.5 -r1.33.4.6 src/sys/dev/usb/umass_isdata.c
cvs rdiff -u -r1.3 -r1.3.6.1 src/sys/dev/usb/umass_isdata.h
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/TODO.ncq
diff -u src/sys/dev/ata/TODO.ncq:1.1.2.24 src/sys/dev/ata/TODO.ncq:1.1.2.25
--- src/sys/dev/ata/TODO.ncq:1.1.2.24 Sat Jun 24 00:00:10 2017
+++ src/sys/dev/ata/TODO.ncq Sat Jun 24 00:23:39 2017
@@ -7,7 +7,6 @@ fix crashdump for mvsata - request times
siisata - fix all new XXX and unmergable bits
test wd* at umass?, confirm the ata_channel kludge works
-+ add detach code (channel detach, free queue)
test device error handling (currently appears to not work well, at least in NCQ case)
Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.157 src/sys/dev/usb/umass.c:1.157.4.1
--- src/sys/dev/usb/umass.c:1.157 Mon Nov 21 08:27:30 2016
+++ src/sys/dev/usb/umass.c Sat Jun 24 00:23:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.157 2016/11/21 08:27:30 skrll Exp $ */
+/* $NetBSD: umass.c,v 1.157.4.1 2017/06/24 00:23:39 jdolecek Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.157 2016/11/21 08:27:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.157.4.1 2017/06/24 00:23:39 jdolecek Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -819,6 +819,21 @@ umass_detach(device_t self, int flags)
if (scbus != NULL) {
if (scbus->sc_child != NULL)
rv = config_detach(scbus->sc_child, flags);
+
+ switch (sc->sc_cmd) {
+ case UMASS_CPROTO_ISD_ATA:
+#if NWD > 0
+ umass_isdata_detach(sc);
+#else
+ aprint_error_dev(self, "isdata not configured\n");
+#endif
+ break;
+
+ default:
+ /* nothing to do */
+ break;
+ }
+
free(scbus, M_DEVBUF);
sc->bus = NULL;
}
Index: src/sys/dev/usb/umass_isdata.c
diff -u src/sys/dev/usb/umass_isdata.c:1.33.4.5 src/sys/dev/usb/umass_isdata.c:1.33.4.6
--- src/sys/dev/usb/umass_isdata.c:1.33.4.5 Wed Jun 21 19:38:43 2017
+++ src/sys/dev/usb/umass_isdata.c Sat Jun 24 00:23:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_isdata.c,v 1.33.4.5 2017/06/21 19:38:43 jdolecek Exp $ */
+/* $NetBSD: umass_isdata.c,v 1.33.4.6 2017/06/24 00:23:39 jdolecek Exp $ */
/*
* TODO:
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.33.4.5 2017/06/21 19:38:43 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.33.4.6 2017/06/24 00:23:39 jdolecek Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -233,6 +233,16 @@ umass_isdata_attach(struct umass_softc *
return 0;
}
+void
+umass_isdata_detach(struct umass_softc *sc)
+{
+ struct uisdata_softc *scbus = (struct uisdata_softc *)sc->bus;
+
+ ata_queue_free(scbus->sc_channel.ch_queue);
+ scbus->sc_channel.ch_queue = NULL;
+
+ ata_channel_destroy(&scbus->sc_channel);
+}
void
uisdata_bio_cb(struct umass_softc *sc, void *priv, int residue, int status)
Index: src/sys/dev/usb/umass_isdata.h
diff -u src/sys/dev/usb/umass_isdata.h:1.3 src/sys/dev/usb/umass_isdata.h:1.3.6.1
--- src/sys/dev/usb/umass_isdata.h:1.3 Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/umass_isdata.h Sat Jun 24 00:23:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_isdata.h,v 1.3 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: umass_isdata.h,v 1.3.6.1 2017/06/24 00:23:39 jdolecek Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,3 +31,4 @@
*/
int umass_isdata_attach(struct umass_softc *);
+void umass_isdata_detach(struct umass_softc *);
