- pull in without INVARIANTS code, from erikarn#35

Author: AdSchellevis

otus/freebsd/src/sys/dev/athp/if_athp_mac.c

@@ -8954,7 +8954,9 @@ athp_vif_update_txpower(struct ieee80211vap *vap)
 int
 athp_vif_update_ap_ssid(struct ieee80211vap *vap, struct ieee80211_node *ni)
 {
+#ifdef INVARIANTS
 	struct ath10k *ar = vap->iv_ic->ic_softc;
+#endif
 	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vap);
 
 	ATHP_CONF_LOCK_ASSERT(ar);
@@ -9128,7 +9130,9 @@ athp_vif_ap_setup(struct ieee80211vap *vap, struct ieee80211_node *ni)
 int
 athp_vif_ap_stop(struct ieee80211vap *vap, struct ieee80211_node *ni)
 {
+#ifdef INVARIANTS
 	struct ath10k *ar = vap->iv_ic->ic_softc;
+#endif
 	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vap);
 
 	ATHP_CONF_LOCK_ASSERT(ar);

otus/freebsd/src/sys/dev/athp/if_athp_pci_ce.c

@@ -425,7 +425,9 @@ ath10k_ce_send_nolock(struct ath10k_ce_pipe *ce_state,
 void __ath10k_ce_send_revert(struct ath10k_ce_pipe *pipe)
 {
 	struct ath10k *ar = pipe->ar;
+#ifdef INVARIANTS
 	struct ath10k_pci *ar_pci = pipe->psc;
+#endif
 	struct ath10k_ce_ring *src_ring = pipe->src_ring;
 	uint32_t ctrl_addr = pipe->ctrl_addr;
 
@@ -486,7 +488,9 @@ int ath10k_ce_num_free_src_entries(struct ath10k_ce_pipe *pipe)
 int __ath10k_ce_rx_num_free_bufs(struct ath10k_ce_pipe *pipe)
 {
 //	struct ath10k *ar = pipe->ar;
+#ifdef INVARIANTS
 	struct ath10k_pci *ar_pci = pipe->psc;
+#endif
 	struct ath10k_ce_ring *dest_ring = pipe->dest_ring;
 	unsigned int nentries_mask = dest_ring->nentries_mask;
 	unsigned int write_index = dest_ring->write_index;
@@ -500,7 +504,9 @@ int __ath10k_ce_rx_num_free_bufs(struct ath10k_ce_pipe *pipe)
 int __ath10k_ce_rx_post_buf(struct ath10k_ce_pipe *pipe, void *ctx, uint32_t paddr)
 {
 	struct ath10k *ar = pipe->ar;
+#ifdef INVARIANTS
 	struct ath10k_pci *ar_pci = pipe->psc;
+#endif
 	struct ath10k_ce_ring *dest_ring = pipe->dest_ring;
 	unsigned int nentries_mask = dest_ring->nentries_mask;
 	unsigned int write_index = dest_ring->write_index;

otus/freebsd/src/sys/dev/athp/if_athp_pci_pipe.c

@@ -123,7 +123,9 @@ static int
 __ath10k_pci_rx_post_buf(struct ath10k_pci_pipe *pipe)
 {
 	struct ath10k *ar = pipe->ar;
+#ifdef INVARIANTS
 	struct ath10k_pci *ar_pci = pipe->psc;
+#endif
 	struct ath10k_ce_pipe *ce_pipe = pipe->ce_hdl;
 	struct athp_buf *pbuf;
 	int ret;
@@ -173,7 +175,9 @@ static void
 __ath10k_pci_rx_post_pipe(struct ath10k_pci_pipe *pipe)
 {
 	struct ath10k *ar = pipe->ar;
+#ifdef INVARIANTS
 	struct ath10k_pci *ar_pci = pipe->psc;
+#endif
 	struct ath10k_ce_pipe *ce_pipe = pipe->ce_hdl;
 	int ret, num;
 

otus/freebsd/src/sys/dev/athp/if_athp_var.h

@@ -67,6 +67,7 @@ struct athp_keyidx_update {
 static inline void
 athp_mtx_assert(struct mtx *mtx, int op)
 {
+#ifdef	INVARIANTS
 	int ret;
 
 	ret = mtx_owned(mtx);
@@ -78,36 +79,65 @@ athp_mtx_assert(struct mtx *mtx, int op)
 	printf("%s: failed assertion check (%s)", __func__,
 	    op == MA_OWNED ? "owned" : "not-owned");
 	kdb_backtrace();
+#else
+	(void) mtx;
+	(void) op;
+#endif	/* INVARIANTS */
 }
 
 #define	ATHP_NODE(ni)		((struct ath10k_sta *)(ni))
 
 #define	ATHP_LOCK(sc)		mtx_lock(&(sc)->sc_mtx)
 #define	ATHP_UNLOCK(sc)		mtx_unlock(&(sc)->sc_mtx)
+#ifdef INVARIANTS
 #define	ATHP_LOCK_ASSERT(sc)	athp_mtx_assert(&(sc)->sc_mtx, MA_OWNED)
 #define	ATHP_UNLOCK_ASSERT(sc)	athp_mtx_assert(&(sc)->sc_mtx, MA_NOTOWNED)
-
+#else
+#define	ATHP_LOCK_ASSERT(sc)		(void)0
+#define	ATHP_UNLOCK_ASSERT(sc)		(void)0
+#endif
 #define	ATHP_FW_VER_STR		128
 
 #define	ATHP_CONF_LOCK(sc)		mtx_lock(&(sc)->sc_conf_mtx)
 #define	ATHP_CONF_UNLOCK(sc)		mtx_unlock(&(sc)->sc_conf_mtx)
+#ifdef INVARIANTS
 #define	ATHP_CONF_LOCK_ASSERT(sc)	athp_mtx_assert(&(sc)->sc_conf_mtx, MA_OWNED)
 #define	ATHP_CONF_UNLOCK_ASSERT(sc)	athp_mtx_assert(&(sc)->sc_conf_mtx, MA_NOTOWNED)
+#else
+#define	ATHP_CONF_LOCK_ASSERT(sc)	(void)0
+#define	ATHP_CONF_UNLOCK_ASSERT(sc)	(void)0
+#endif
 
 #define	ATHP_DATA_LOCK(sc)		mtx_lock(&(sc)->sc_data_mtx)
 #define	ATHP_DATA_UNLOCK(sc)		mtx_unlock(&(sc)->sc_data_mtx)
+#ifdef INVARIANTS
 #define	ATHP_DATA_LOCK_ASSERT(sc)	athp_mtx_assert(&(sc)->sc_data_mtx, MA_OWNED)
 #define	ATHP_DATA_UNLOCK_ASSERT(sc)	athp_mtx_assert(&(sc)->sc_data_mtx, MA_NOTOWNED)
+#else
+#define	ATHP_DATA_LOCK_ASSERT(sc)	(void)0
+#define	ATHP_DATA_UNLOCK_ASSERT(sc)	(void)0
+#endif
 
 #define	ATHP_BUF_LOCK(sc)		mtx_lock(&(sc)->sc_buf_mtx)
 #define	ATHP_BUF_UNLOCK(sc)		mtx_unlock(&(sc)->sc_buf_mtx)
+#ifdef INVARIANTS
 #define	ATHP_BUF_LOCK_ASSERT(sc)	athp_mtx_assert(&(sc)->sc_buf_mtx, MA_OWNED)
 #define	ATHP_BUF_UNLOCK_ASSERT(sc)	athp_mtx_assert(&(sc)->sc_buf_mtx, MA_NOTOWNED)
+#else
+#define	ATHP_BUF_LOCK_ASSERT(sc)	(void)0
+#define	ATHP_BUF_UNLOCK_ASSERT(sc)	(void)0
+#endif
+
 
 #define	ATHP_DMA_LOCK(sc)		mtx_lock(&(sc)->sc_dma_mtx)
 #define	ATHP_DMA_UNLOCK(sc)		mtx_unlock(&(sc)->sc_dma_mtx)
+#ifdef INVARIANTS
 #define	ATHP_DMA_LOCK_ASSERT(sc)	athp_mtx_assert(&(sc)->sc_dma_mtx, MA_OWNED)
 #define	ATHP_DMA_UNLOCK_ASSERT(sc)	athp_mtx_assert(&(sc)->sc_dma_mtx, MA_NOTOWNED)
+#else
+#define	ATHP_DMA_LOCK_ASSERT(sc)	(void)0
+#define	ATHP_DMA_UNLOCK_ASSERT(sc)	(void)0
+#endif
 
 /*
  * For now, we don't allocate hardware pairwise keys as hardware