summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornp <np@FreeBSD.org>2015-02-08 08:42:45 +0000
committernp <np@FreeBSD.org>2015-02-08 08:42:45 +0000
commitdda106938efea6a3db8840c20030a2c295dd6aed (patch)
treec59464c1d5346667c35f065b8b95374447df57ee
parent58755fa7f1672559d10d21c7f93092a17ac0b165 (diff)
downloadFreeBSD-src-dda106938efea6a3db8840c20030a2c295dd6aed.zip
FreeBSD-src-dda106938efea6a3db8840c20030a2c295dd6aed.tar.gz
cxgbe(4): a change to the synchronization rules within the the driver.
This is purely cosmetic because the new rules are already followed. MFC after: 1 week
-rw-r--r--sys/dev/cxgbe/adapter.h1
-rw-r--r--sys/dev/cxgbe/t4_main.c6
2 files changed, 6 insertions, 1 deletions
diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h
index 62ff9af..3e65d91 100644
--- a/sys/dev/cxgbe/adapter.h
+++ b/sys/dev/cxgbe/adapter.h
@@ -812,7 +812,6 @@ struct adapter {
#define ADAPTER_LOCK_ASSERT_OWNED(sc) mtx_assert(&(sc)->sc_lock, MA_OWNED)
#define ADAPTER_LOCK_ASSERT_NOTOWNED(sc) mtx_assert(&(sc)->sc_lock, MA_NOTOWNED)
-/* XXX: not bulletproof, but much better than nothing */
#define ASSERT_SYNCHRONIZED_OP(sc) \
KASSERT(IS_BUSY(sc) && \
(mtx_owned(&(sc)->sc_lock) || sc->last_op_thr == curthread), \
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index e2f3c59..4f91721 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -3139,6 +3139,9 @@ mcfail:
return (rc);
}
+/*
+ * {begin|end}_synchronized_op must be called from the same thread.
+ */
int
begin_synchronized_op(struct adapter *sc, struct port_info *pi, int flags,
char *wmesg)
@@ -3194,6 +3197,9 @@ done:
return (rc);
}
+/*
+ * {begin|end}_synchronized_op must be called from the same thread.
+ */
void
end_synchronized_op(struct adapter *sc, int flags)
{
OpenPOWER on IntegriCloud