Mega busdma API commit.

Add two new arguments to bus_dma_tag_create(): lockfunc and lockfuncarg.
Lockfunc allows a driver to provide a function for managing its locking
semantics while using busdma.  At the moment, this is used for the
asynchronous busdma_swi and callback mechanism.  Two lockfunc implementations
are provided: busdma_lock_mutex() performs standard mutex operations on the
mutex that is specified from lockfuncarg.  dftl_lock() is a panic
implementation and is defaulted to when NULL, NULL are passed to
bus_dma_tag_create().  The only time that NULL, NULL should ever be used is
when the driver ensures that bus_dmamap_load() will not be deferred.
Drivers that do not provide their own locking can pass
busdma_lock_mutex,&Giant args in order to preserve the former behaviour.

sparc64 and powerpc do not provide real busdma_swi functions, so this is
largely a noop on those platforms.  The busdma_swi on is64 is not properly
locked yet, so warnings will be emitted on this platform when busdma
callback deferrals happen.

If anyone gets panics or warnings from dflt_lock() being called, please
let me know right away.

Reviewed by:	tmm, gibbs

1 files changed, 10 insertions, 0 deletions

diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index f9f0b8f..bed991a 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -765,6 +765,14 @@ wi_stop(struct ifnet *ifp, int disable)
 
 	ieee80211_new_state(ifp, IEEE80211_S_INIT, -1);
 	if (sc->sc_enabled && !sc->wi_gone) {
+		int i;
+		/* wait for the busy bit to clear */
+		for (i = 50; i > 0; i--) {	/* 5s */
+			if (!(CSR_READ_2(sc, WI_COMMAND) & WI_CMD_BUSY))
+				break;
+			printf("Sleeping for 10ms in wi_stop\n");
+			DELAY(10*10000);	/* 10 m sec */
+		}
 		CSR_WRITE_2(sc, WI_INT_EN, 0);
 		wi_cmd(sc, WI_CMD_DISABLE | sc->sc_portnum, 0, 0, 0);
 		if (disable) {
@@ -1440,7 +1448,9 @@ wi_rx_intr(struct wi_softc *sc)
 	if (ic->ic_opmode == IEEE80211_M_IBSS && dir == IEEE80211_FC1_DIR_NODS)
 		wi_sync_bssid(sc, wh->i_addr3);
 
+	WI_UNLOCK(sc);
 	ieee80211_input(ifp, m, rssi, rstamp, 0);
+	WI_LOCK(sc);
 }
 
 static void