 @@ -1,14 +1,14 @@
-/* $NetBSD: auspi.c,v 1.3 2007/02/28 04:21:53 thorpej Exp $ */
+/* $NetBSD: auspi.c,v 1.4 2011/06/08 23:05:48 rmind Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * Portions of this code were written by Garrett D'Amore for the
  * Champaign-Urbana Community Wireless Network Project.
+ *
  * 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
 @@ -32,27 +32,27 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE URBANA-CHAMPAIGN INDEPENDENT
  * MEDIA CENTER OR GARRETT D'AMORE 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: auspi.c,v 1.3 2007/02/28 04:21:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auspi.c,v 1.4 2011/06/08 23:05:48 rmind Exp $");
 #include "locators.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/proc.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 @@ -148,27 +148,27 @@ auspi_attach(struct device *parent, stru
 	sba.sba_controller = &sc->sc_spi;
 	/* enable SPI mode */
 	sc->sc_psc.psc_enable(sc, AUPSC_SEL_SPI);
 	/* initialize the queue */
 	SIMPLEQ_INIT(&sc->sc_q);
 	/* make sure interrupts disabled at the SPI */
 	PUTREG(sc, AUPSC_SPIMSK, SPIMSK_ALL);
 	/* enable device interrupts */
-	sc->sc_ih = au_intr_establish(aa->aupsc_irq, 0, IPL_SERIAL, IST_LEVEL,
+	sc->sc_ih = au_intr_establish(aa->aupsc_irq, 0, IPL_BIO, IST_LEVEL,
 	    auspi_intr, sc);
 	(void) config_found_ia(&sc->sc_dev, "spibus", &sba, spibus_print);
+}
 int
 auspi_configure(void *arg, int slave, int mode, int speed)
+{
 	struct auspi_softc *sc = arg;
 	int		brg, i;
 	uint32_t	reg;
 	/* setup interrupt registers */
 @@ -418,22 +418,22 @@ auspi_intr(void *arg)
 		    ev & (SPIMSK_TR | SPIMSK_RR | SPIMSK_MD));
+	}
 	return 1;
+}
 int
 auspi_transfer(void *arg, struct spi_transfer *st)
+{
 	struct auspi_softc	*sc = arg;
 	int			s;
 	/* make sure we select the right chip */
-	s = splserial();
+	s = splbio();
 	spi_transq_enqueue(&sc->sc_q, st);
 	if (sc->sc_running == 0) {
 		auspi_sched(sc);
+	}
 	splx(s);
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: arspi.c,v 1.5 2007/02/28 04:21:53 thorpej Exp $ */
+/* $NetBSD: arspi.c,v 1.6 2011/06/08 23:05:48 rmind Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * Portions of this code were written by Garrett D'Amore for the
  * Champaign-Urbana Community Wireless Network Project.
+ *
  * 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
 @@ -32,27 +32,27 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE URBANA-CHAMPAIGN INDEPENDENT
  * MEDIA CENTER OR GARRETT D'AMORE 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: arspi.c,v 1.5 2007/02/28 04:21:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arspi.c,v 1.6 2011/06/08 23:05:48 rmind Exp $");
 #include "locators.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <machine/bus.h>
 @@ -201,27 +201,27 @@ arspi_attach(struct device *parent, stru
 void
 arspi_interrupts(struct device *self)
+{
 	/*
 	 * we never leave polling mode, because, apparently, we
 	 * are missing some data about how to drive the SPI in interrupt
 	 * mode.
 	 */
 #if 0
 	struct arspi_softc *sc = device_private(self);
 	int	s;
-	s = splserial();
+	s = splbio();
 	sc->sc_interrupts = true;
 	splx(s);
 #endif
+}
 int
 arspi_intr(void *arg)
+{
 	struct arspi_softc *sc = arg;
 	while (GETREG(sc, ARSPI_REG_CTL) & ARSPI_CTL_BUSY);
 	arspi_done(sc, 0);
 @@ -260,27 +260,27 @@ arspi_transfer(void *cookie, struct spi_
 	int rv;
 	int s;
 	st->st_busprivate = NULL;
 	if ((rv = arspi_make_job(st)) != 0) {
 		if (st->st_busprivate) {
 			free(st->st_busprivate, M_DEVBUF);
 			st->st_busprivate = NULL;
+		}
 		spi_done(st, rv);
 		return rv;
+	}
-	s = splserial();
+	s = splbio();
 	spi_transq_enqueue(&sc->sc_transq, st);
 	if (sc->sc_transfer == NULL) {
 		arspi_sched(sc);
 		if (!sc->sc_interrupts)
 			arspi_poll(sc);
+	}
 	splx(s);
 	return 0;
+}
 void
 arspi_sched(struct arspi_softc *sc)
+{

 @@ -1,14 +1,14 @@
-/* $NetBSD: spi.c,v 1.4 2010/08/14 20:49:21 jym Exp $ */
+/* $NetBSD: spi.c,v 1.5 2011/06/08 23:05:48 rmind Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * Portions of this code were written by Garrett D'Amore for the
  * Champaign-Urbana Community Wireless Network Project.
+ *
  * 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
 @@ -32,35 +32,36 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE URBANA-CHAMPAIGN INDEPENDENT
  * MEDIA CENTER OR GARRETT D'AMORE 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: spi.c,v 1.4 2010/08/14 20:49:21 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spi.c,v 1.5 2011/06/08 23:05:48 rmind Exp $");
 #include "locators.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <sys/proc.h>
+#include <sys/mutex.h>
 #include <sys/condvar.h>
 #include <sys/errno.h>
 #include <dev/spi/spivar.h>
 struct spi_softc {
 	struct spi_controller	sc_controller;
 	int			sc_mode;
 	int			sc_speed;
 	int			sc_nslaves;
 	struct spi_handle	*sc_slaves;
 };
 /*
 @@ -80,27 +81,27 @@ int
 spibus_print(void *aux, const char *pnp)
+{
 	if (pnp != NULL)
 		aprint_normal("spi at %s", pnp);
 	return (UNCONF);
+}
 static int
 spi_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return 1;
+}
 static int
 spi_print(void *aux, const char *pnp)
+{
 	struct spi_attach_args *sa = aux;
 	if (sa->sa_handle->sh_slave != -1)
 		aprint_normal(" slave %d", sa->sa_handle->sh_slave);
 	return (UNCONF);
+}
 @@ -178,49 +179,51 @@ CFATTACH_DECL_NEW(spi, sizeof(struct spi
  * returned.
  */
 int
 spi_configure(struct spi_handle *sh, int mode, int speed)
+{
 	int			s, rv;
 	struct spi_softc	*sc = sh->sh_sc;
 	struct spi_controller	*tag = sh->sh_controller;
 	/* ensure that request is compatible with other devices on the bus */
 	if ((sc->sc_mode >= 0) && (sc->sc_mode != mode))
 		return EINVAL;
-	s = splserial();
+	s = splbio();
 	/* pick lowest configured speed */
 	if (speed == 0)
 		speed = sc->sc_speed;
 	if (sc->sc_speed)
 		speed = min(sc->sc_speed, speed);
 	rv = (*tag->sct_configure)(tag->sct_cookie, sh->sh_slave,
 	    mode, speed);
 	if (rv == 0) {
 		sc->sc_mode = mode;
 		sc->sc_speed = speed;
+	}
 	splx(s);
 	return rv;
+}
 void
 spi_transfer_init(struct spi_transfer *st)
+{
-	simple_lock_init(&st->st_lock);
+	mutex_init(&st->st_lock, MUTEX_DEFAULT, IPL_BIO);
 	cv_init(&st->st_cv, "spicv");
 	st->st_flags = 0;
 	st->st_errno = 0;
 	st->st_done = NULL;
 	st->st_chunks = NULL;
 	st->st_private = NULL;
 	st->st_slave = -1;
+}
 void
 spi_chunk_init(struct spi_chunk *chunk, int cnt, const uint8_t *wptr,
     uint8_t *rptr)
+{
 @@ -257,57 +260,49 @@ spi_transfer(struct spi_handle *sh, stru
+	}
 	/*
 	 * Match slave to handle's slave.
 	 */
 	st->st_slave = sh->sh_slave;
 	return (*tag->sct_transfer)(tag->sct_cookie, st);
+}
 void
 spi_wait(struct spi_transfer *st)
+{
 	int	s;
-	s = splserial();
+	mutex_enter(&st->st_lock);
 	simple_lock(&st->st_lock);
 	while (!(st->st_flags & SPI_F_DONE)) {
-		ltsleep(st, PWAIT, "spi_wait", 0, &st->st_lock);
+		cv_wait(&st->st_cv, &st->st_lock);
+	}
-	simple_unlock(&st->st_lock);
+	mutex_exit(&st->st_lock);
 	splx(s);
+}
 void
 spi_done(struct spi_transfer *st, int err)
+{
 	int	s;
-	s = splserial();
+	mutex_enter(&st->st_lock);
 	if ((st->st_errno = err) != 0) {
 		st->st_flags |= SPI_F_ERROR;
+	}
 	st->st_flags |= SPI_F_DONE;
 	if (st->st_done != NULL) {
 		(*st->st_done)(st);
 	} else {
 		cv_broadcast(&st->st_cv);
 		simple_lock(&st->st_lock);
 		wakeup(st);
 		simple_unlock(&st->st_lock);
+	}
-	splx(s);
+	mutex_exit(&st->st_lock);
+}
 /*
  * Some convenience routines.  These routines block until the work
  * is done.
+ *
  * spi_recv - receives data from the bus
+ *
  * spi_send - sends data to the bus
+ *
  * spi_send_recv - sends data to the bus, and then receives.  Note that this is
  * done synchronously, i.e. send a command and get the response.  This is
  * not full duplex.  If you wnat full duplex, you can't use these convenience

 @@ -1,14 +1,14 @@
-/* $NetBSD: spivar.h,v 1.3 2008/01/08 13:28:22 dogcow Exp $ */
+/* $NetBSD: spivar.h,v 1.4 2011/06/08 23:05:48 rmind Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * Portions of this code were written by Garrett D'Amore for the
  * Champaign-Urbana Community Wireless Network Project.
+ *
  * 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
 @@ -99,27 +99,28 @@ struct spi_chunk {
 	const uint8_t	*chunk_wptr;
 	int		chunk_rresid;
 	int		chunk_wresid;
 };
 struct spi_transfer {
 	struct spi_chunk *st_chunks;		/* chained bufs */
 	SIMPLEQ_ENTRY(spi_transfer) st_chain;	/* chain of submitted jobs */
 	int		st_flags;
 	int		st_errno;
 	int		st_slave;
 	void		*st_private;
 	void		(*st_done)(struct spi_transfer *);
-	struct simplelock	st_lock;
+	kmutex_t	st_lock;
 	kcondvar_t	st_cv;
 	void		*st_busprivate;
 };
 /* declare a list of transfers */
 SIMPLEQ_HEAD(spi_transq, spi_transfer);
 #define	spi_transq_init(q)	\
 	SIMPLEQ_INIT(q)
 #define	spi_transq_enqueue(q, trans)	\
 	SIMPLEQ_INSERT_TAIL(q, trans, st_chain)
 #define	spi_transq_dequeue(q)		\