Mon Jul 2 21:11:50 2012 UTC ()

Pull up revision 1.86 (requested by riastradh in ticket #373).

Take the kernel lock in atapibusdetach just like atapibuschilddet.

Fixes kassert in scsipi_lookup_periph when I press the power button
on one of my laptops (and maybe another one) to power it off.

ok mrg


(jdc)

diff -r1.83.14.2 -r1.83.14.3 src/sys/dev/scsipi/atapiconf.c

--- src/sys/dev/scsipi/atapiconf.c 2012/04/23 16:28:30	1.83.14.2
+++ src/sys/dev/scsipi/atapiconf.c 2012/07/02 21:11:50	1.83.14.3

 @@ -1,41 +1,41 @@
-/*	$NetBSD: atapiconf.c,v 1.83.14.2 2012/04/23 16:28:30 riz Exp $	*/
+/*	$NetBSD: atapiconf.c,v 1.83.14.3 2012/07/02 21:11:50 jdc Exp $	*/
 /*
  * Copyright (c) 1996, 2001 Manuel Bouyer.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.83.14.2 2012/04/23 16:28:30 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.83.14.3 2012/07/02 21:11:50 jdc Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/kthread.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsipiconf.h>
 #include <dev/scsipi/atapiconf.h>
 @@ -184,46 +184,53 @@ atapibuschilddet(device_t self, device_t
 		break;
+	}
 	/* XXXSMP scsipi */
 	KERNEL_UNLOCK_ONE(curlwp);
+}
 static int
 atapibusdetach(device_t self, int flags)
+{
 	struct atapibus_softc *sc = device_private(self);
 	struct scsipi_channel *chan = sc->sc_channel;
 	struct scsipi_periph *periph;
-	int target, error;
+	int target, error = 0;
 	/*
 	 * Shut down the channel.
 	 */
 	scsipi_channel_shutdown(chan);
 	/* XXXSMP scsipi */
 	KERNEL_LOCK(1, curlwp);
 	/*
 	 * Now detach all of the periphs.
 	 */
 	for (target = 0; target < chan->chan_ntargets; target++) {
 		periph = scsipi_lookup_periph(chan, target, 0);
 		if (periph == NULL)
 			continue;
 		error = config_detach(periph->periph_dev, flags);
 		if (error)
-			return (error);
+			goto out;
 		KASSERT(scsipi_lookup_periph(chan, target, 0) == NULL);
+	}
 	return (0);
 out:
 	/* XXXSMP scsipi */
 	KERNEL_UNLOCK_ONE(curlwp);
 	return error;
+}
 static int
 atapi_probe_bus(struct atapibus_softc *sc, int target)
+{
 	struct scsipi_channel *chan = sc->sc_channel;
 	int maxtarget, mintarget;
 	int error;
 	struct atapi_adapter *atapi_adapter;
 	if (target == -1) {
 		maxtarget = 1;
 		mintarget = 0;