Re: kern/51252: SATA disk not powered off before shutdown

[Manuel Bouyer <bouyer%antioche.eu.org@localhost>]

On Sat, Jun 18, 2016 at 12:50:54PM +0200, Manuel Bouyer wrote:
> On Fri, Jun 17, 2016 at 09:25:00PM +0000, anindya49%hotmail.com@localhost wrote:
> > 
> > Ideally I'd like the disk to spin down during poweroff (-p) and halt (-h), perhaps settable using a sysctl, but not during a reboot (-r).
> 
> The disk should definitively be turned off on poweroff, but not for
> a halt without poweroff IMHO

The attached patch should do this. It's against netbsd-7 but should apply
to HEAD too. It seems to DTRT for me.
Can you try it ?

-- 
Manuel Bouyer <bouyer%antioche.eu.org@localhost>
     NetBSD: 26 ans d'experience feront toujours la difference
--

Index: sys/device.h
===================================================================
RCS file: /cvsroot/src/sys/sys/device.h,v
retrieving revision 1.144.4.1
diff -u -p -u -r1.144.4.1 device.h
--- sys/device.h	9 Mar 2015 08:56:02 -0000	1.144.4.1
+++ sys/device.h	18 Jun 2016 17:19:09 -0000
@@ -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 */
Index: kern/subr_autoconf.c
===================================================================
RCS file: /cvsroot/src/sys/kern/subr_autoconf.c,v
retrieving revision 1.231.2.2
diff -u -p -u -r1.231.2.2 subr_autoconf.c
--- kern/subr_autoconf.c	16 Nov 2015 14:40:41 -0000	1.231.2.2
+++ kern/subr_autoconf.c	18 Jun 2016 17:19:09 -0000
@@ -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: dev/ata/wd.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ata/wd.c,v
retrieving revision 1.412.2.1
diff -u -p -u -r1.412.2.1 wd.c
--- dev/ata/wd.c	11 Nov 2014 10:36:41 -0000	1.412.2.1
+++ dev/ata/wd.c	18 Jun 2016 17:19:09 -0000
@@ -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);