Add locking and make xe(4) MPSAFE:

- Add a mutex to protect the softc and device hardware.
- Use a callout rather than a callout_handle for the media timer.
- Use a dedicated timer for managing the tx watchdog rather than if_timer.
- Fix some resource leaks if xe_attach() fails.
- Shutdown the device before detaching the driver.
- Setup the interrupt handler after ether_ifattach().

Tested by:	Ian FREISLICH  ianf of clue.co.za

1 files changed, 8 insertions, 1 deletions

diff --git a/sys/dev/xe/if_xevar.h b/sys/dev/xe/if_xevar.h
index 0e66102..0981338 100644
--- a/sys/dev/xe/if_xevar.h
+++ b/sys/dev/xe/if_xevar.h
@@ -35,7 +35,9 @@
 struct xe_softc {
   struct ifmedia ifmedia;
   struct ifmib_iso_8802_3 mibdata;
-  struct callout_handle chand;
+  struct callout media_timer;
+  struct callout wdog_timer;
+  struct mtx lock;
   struct ifnet *ifp;
   struct ifmedia *ifm;
   u_char enaddr[6];
@@ -68,6 +70,10 @@ struct xe_softc {
   u_char gone;		/* 1 = Card bailed out */
 };
 
+#define	XE_LOCK(sc)		mtx_lock(&(sc)->lock)
+#define	XE_UNLOCK(sc)		mtx_unlock(&(sc)->lock)
+#define	XE_ASSERT_LOCKED(sc)	mtx_assert(&(sc)->lock, MA_OWNED)
+
 /*
  * For accessing card registers
  */
@@ -88,5 +94,6 @@ struct xe_softc {
 int xe_attach(device_t dev);
 int xe_activate(device_t dev);
 void xe_deactivate(device_t dev);
+void xe_stop(struct xe_softc *scp);
 
 #endif /* DEV_XE_IF_XEVAR_H */