Sat Dec 24 06:04:50 2016 UTC ()

avoid accessing condition variables which belong to a scsibus before actually
attaching the scsibus
now my SS20 boots again


(macallan)

diff -r1.145 -r1.146 src/sys/dev/ic/ncr53c9x.c

--- src/sys/dev/ic/ncr53c9x.c 2012/06/18 21:23:56	1.145
+++ src/sys/dev/ic/ncr53c9x.c 2016/12/24 06:04:50	1.146

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ncr53c9x.c,v 1.145 2012/06/18 21:23:56 martin Exp $	*/
+/*	$NetBSD: ncr53c9x.c,v 1.146 2016/12/24 06:04:50 macallan Exp $	*/
 /*-
  * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * 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.
 @@ -60,27 +60,27 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Based on aic6360 by Jarle Greipsland
+ *
  * Acknowledgements: Many of the algorithms used in this driver are
  * inspired by the work of Julian Elischer (julian@tfs.com) and
  * Charles Hannum (mycroft@duality.gnu.ai.mit.edu).  Thanks a million!
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.145 2012/06/18 21:23:56 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.146 2016/12/24 06:04:50 macallan Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/pool.h>
 @@ -286,27 +286,27 @@ ncr53c9x_attach(struct ncr53c9x_softc *s
 	/*
 	 * Add reference to adapter so that we drop the reference after
 	 * config_found() to make sure the adatper is disabled.
 	 */
 	if (scsipi_adapter_addref(adapt) != 0) {
 		aprint_error_dev(sc->sc_dev, "unable to enable controller\n");
 		return;
+	}
 	/* Reset state & bus */
 	sc->sc_cfflags = device_cfdata(sc->sc_dev)->cf_flags;
 	sc->sc_state = 0;
-	ncr53c9x_init(sc, 1);
+	ncr53c9x_init(sc, 0);	/* no bus reset yet, leave that to scsibus* */
 	/*
 	 * Now try to attach all the sub-devices
 	 */
 	sc->sc_child = config_found(sc->sc_dev, &sc->sc_channel, scsiprint);
 	scsipi_adapter_delref(adapt);
 	callout_reset(&sc->sc_watchdog, 60 * hz, ncr53c9x_watch, sc);
+}
 int
 ncr53c9x_detach(struct ncr53c9x_softc *sc, int flags)
+{
 @@ -545,34 +545,34 @@ ncr53c9x_init(struct ncr53c9x_softc *sc,
 		if (ncr53c9x_notag)
 			ti->flags &= ~T_TAG;
 #endif
 		ti->period = sc->sc_minsync;
 		ti->offset = 0;
 		ti->cfg3   = 0;
 		ncr53c9x_update_xfer_mode(sc, r);
+	}
 	if (doreset) {
 		sc->sc_state = NCR_SBR;
 		NCRCMD(sc, NCRCMD_RSTSCSI);
 		/* Notify upper layer */
 		scsipi_async_event(&sc->sc_channel, ASYNC_EVENT_RESET, NULL);
 	} else {
 		sc->sc_state = NCR_IDLE;
 		ncr53c9x_sched(sc);
+	}
 	/* Notify upper layer */
 	scsipi_async_event(&sc->sc_channel, ASYNC_EVENT_RESET, NULL);
 	/* XXXSMP scsipi */
 	KERNEL_UNLOCK_ONE(curlwp);
+}
 /*
  * Read the NCR registers, and save their contents for later use.
  * NCR_STAT, NCR_STEP & NCR_INTR are mostly zeroed out when reading
  * NCR_INTR - so make sure it is the last read.
+ *
  * I think that (from reading the docs) most bits in these registers
  * only make sense when he DMA CSR has an interrupt showing. Call only
  * if an interrupt is pending.
  */