Module Name: src
Committed By: snj
Date: Tue Jul 5 19:09:17 UTC 2016
Modified Files:
src/sys/dev/ata [netbsd-7]: wd.c
src/sys/kern [netbsd-7]: subr_autoconf.c
src/sys/sys [netbsd-7]: device.h
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1186):
sys/dev/ata/wd.c: revision 1.421
sys/kern/subr_autoconf.c: revision 1.242 via patch
sys/sys/device.h: revision 1.149
Add a new config_detach() flag, DETACH_POWEROFF, which is set when
detaching devices at shutdown time with RB_POWERDOWN.
When detaching wd(4), put the drive in standby before detach
for DETACH_POWEROFF.
Fix PR kern/51252
To generate a diff of this commit:
cvs rdiff -u -r1.412.2.1 -r1.412.2.2 src/sys/dev/ata/wd.c
cvs rdiff -u -r1.231.2.2 -r1.231.2.3 src/sys/kern/subr_autoconf.c
cvs rdiff -u -r1.144.4.1 -r1.144.4.2 src/sys/sys/device.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/wd.c
diff -u src/sys/dev/ata/wd.c:1.412.2.1 src/sys/dev/ata/wd.c:1.412.2.2
--- src/sys/dev/ata/wd.c:1.412.2.1 Tue Nov 11 10:36:41 2014
+++ src/sys/dev/ata/wd.c Tue Jul 5 19:09:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.412.2.1 2014/11/11 10:36:41 martin Exp $ */
+/* $NetBSD: wd.c,v 1.412.2.2 2016/07/05 19:09:17 snj 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.412.2.1 2014/11/11 10:36:41 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.412.2.2 2016/07/05 19:09:17 snj Exp $");
#include "opt_ata.h"
@@ -464,6 +464,8 @@ wddetach(device_t self, int flags)
bufq_free(sc->sc_q);
sc->atabus->ata_killpending(sc->drvp);
+ if (flags & DETACH_POWEROFF)
+ wd_standby(sc, AT_POLL);
splx(s);
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.231.2.2 src/sys/kern/subr_autoconf.c:1.231.2.3
--- src/sys/kern/subr_autoconf.c:1.231.2.2 Mon Nov 16 14:40:41 2015
+++ src/sys/kern/subr_autoconf.c Tue Jul 5 19:09:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.231.2.2 2015/11/16 14:40:41 msaitoh Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.231.2.3 2016/07/05 19:09:17 snj Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.231.2.2 2015/11/16 14:40:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.231.2.3 2016/07/05 19:09:17 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1864,14 +1864,20 @@ config_detach_all(int how)
static struct shutdown_state s;
device_t curdev;
bool progress = false;
+ int flags;
if ((how & RB_NOSYNC) != 0)
return false;
+ if ((how & RB_POWERDOWN) == RB_POWERDOWN)
+ flags = DETACH_SHUTDOWN | DETACH_POWEROFF;
+ else
+ flags = DETACH_SHUTDOWN;
+
for (curdev = shutdown_first(&s); curdev != NULL;
curdev = shutdown_next(&s)) {
aprint_debug(" detaching %s, ", device_xname(curdev));
- if (config_detach(curdev, DETACH_SHUTDOWN) == 0) {
+ if (config_detach(curdev, flags) == 0) {
progress = true;
aprint_debug("success.");
} else
Index: src/sys/sys/device.h
diff -u src/sys/sys/device.h:1.144.4.1 src/sys/sys/device.h:1.144.4.2
--- src/sys/sys/device.h:1.144.4.1 Mon Mar 9 08:56:02 2015
+++ src/sys/sys/device.h Tue Jul 5 19:09:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.144.4.1 2015/03/09 08:56:02 snj Exp $ */
+/* $NetBSD: device.h,v 1.144.4.2 2016/07/05 19:09:17 snj Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -347,6 +347,7 @@ struct cfattach __CONCAT(name,_ca) = {
#define DETACH_FORCE 0x01 /* force detachment; hardware gone */
#define DETACH_QUIET 0x02 /* don't print a notice */
#define DETACH_SHUTDOWN 0x04 /* detach because of system shutdown */
+#define DETACH_POWEROFF 0x08 /* going to power off; power down devices */
struct cfdriver {
LIST_ENTRY(cfdriver) cd_list; /* link on allcfdrivers */
