assert that no locks are held when calling swfw_sync

Author: Matthew Macy

sys/dev/e1000/e1000_80003es2lan.c

@@ -408,7 +408,7 @@ static s32 e1000_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask)
 	s32 timeout = 50;
 
 	DEBUGFUNC("e1000_acquire_swfw_sync_80003es2lan");
-
+	ASSERT_NO_LOCKS();
 	while (i < timeout) {
 		if (e1000_get_hw_semaphore_generic(hw))
 			return -E1000_ERR_SWFW_SYNC;

sys/dev/e1000/e1000_82575.c

@@ -1058,7 +1058,7 @@ static s32 e1000_acquire_swfw_sync_82575(struct e1000_hw *hw, u16 mask)
 	s32 i = 0, timeout = 200;
 
 	DEBUGFUNC("e1000_acquire_swfw_sync_82575");
-
+	ASSERT_NO_LOCKS();
 	while (i < timeout) {
 		if (e1000_get_hw_semaphore_generic(hw)) {
 			ret_val = -E1000_ERR_SWFW_SYNC;

sys/dev/e1000/e1000_i210.c

@@ -91,9 +91,11 @@ s32 e1000_acquire_swfw_sync_i210(struct e1000_hw *hw, u16 mask)
 	u32 swmask = mask;
 	u32 fwmask = mask << 16;
 	s32 ret_val = E1000_SUCCESS;
+	/* Uhh the following line should read 'FIXME: this is a blazing tire fire' */
 	s32 i = 0, timeout = 200; /* FIXME: find real value to use here */
 
 	DEBUGFUNC("e1000_acquire_swfw_sync_i210");
+	ASSERT_NO_LOCKS();
 
 	while (i < timeout) {
 		if (e1000_get_hw_semaphore_i210(hw)) {

sys/dev/e1000/e1000_osdep.h

@@ -216,5 +216,13 @@ struct e1000_osdep
     bus_space_write_2(((struct e1000_osdep *)(hw)->back)->flash_bus_space_tag, \
         ((struct e1000_osdep *)(hw)->back)->flash_bus_space_handle, reg, value)
 
+#include <sys/proc.h>
+#define ASSERT_NO_LOCKS()				\
+	do {						\
+		MPASS(curthread->td_locks == 0);	\
+		MPASS(curthread->td_rw_rlocks == 0);	\
+		MPASS(curthread->td_lk_slocks == 0);	\
+	} while (0)
+
 #endif  /* _FREEBSD_OS_H_ */