diff -r 90a69593fb9d -r 9343419b9609 sys/dev/cxgbe/iw_cxgbe/cm.c
--- a/sys/dev/cxgbe/iw_cxgbe/cm.c	Fri Feb 17 19:11:35 2017 -0800
+++ b/sys/dev/cxgbe/iw_cxgbe/cm.c	Mon Feb 20 14:55:46 2017 -0800
@@ -118,19 +118,8 @@ static int c4iw_so_upcall(struct socket 
 static void process_socket_event(struct c4iw_ep *ep);
 static void release_ep_resources(struct c4iw_ep *ep);
 
-#define START_EP_TIMER(ep) \
-    do { \
-	    CTR3(KTR_IW_CXGBE, "start_ep_timer (%s:%d) ep %p", \
-		__func__, __LINE__, (ep)); \
-	    start_ep_timer(ep); \
-    } while (0)
-
-#define STOP_EP_TIMER(ep) \
-    ({ \
-	    CTR3(KTR_IW_CXGBE, "stop_ep_timer (%s:%d) ep %p", \
-		__func__, __LINE__, (ep)); \
-	    stop_ep_timer(ep); \
-    })
+#define START_EP_TIMER(ep) start_ep_timer(ep)
+#define STOP_EP_TIMER(ep) stop_ep_timer(ep)
 
 #ifdef KTR
 static char *states[] = {
@@ -257,8 +246,7 @@ process_req(struct work_struct *ctx)
 		TAILQ_REMOVE(&req_list, epc, entry);
 		epc->entry.tqe_prev = NULL;
 		spin_unlock(&req_lock);
-		CTR3(KTR_IW_CXGBE, "%s so :%p, ep:%p", __func__,
-				epc->so, epc);
+		CTR3(KTR_IW_CXGBE, "%s so %p, ep %p", __func__, epc->so, epc);
 		if (epc->so)
 			process_socket_event((struct c4iw_ep *)epc);
 		c4iw_put_ep(epc);
@@ -547,7 +535,6 @@ process_conn_error(struct c4iw_ep *ep)
 
 		case MPA_REP_SENT:
 			ep->com.rpl_err = ECONNRESET;
-			CTR1(KTR_IW_CXGBE, "waking up ep %p", ep);
 			break;
 
 		case MPA_REQ_RCVD:
@@ -878,8 +865,6 @@ process_socket_event(struct c4iw_ep *ep)
 
 	if (state == LISTEN) {
 		/* socket listening events are handled at IWCM */
-		CTR3(KTR_IW_CXGBE, "%s Invalid ep state:%u, ep:%p", __func__,
-			    ep->com.state, ep);
 		BUG();
 		return;
 	}
diff -r 90a69593fb9d -r 9343419b9609 sys/dev/cxgbe/iw_cxgbe/cq.c
--- a/sys/dev/cxgbe/iw_cxgbe/cq.c	Fri Feb 17 19:11:35 2017 -0800
+++ b/sys/dev/cxgbe/iw_cxgbe/cq.c	Mon Feb 20 14:55:46 2017 -0800
@@ -432,6 +432,7 @@ static int poll_cq(struct t4_wq *wq, str
 	if (ret)
 		return ret;
 
+#if 0
 	CTR6(KTR_IW_CXGBE,
 	    "%s CQE OVF %u qpid 0x%0x genbit %u type %u status 0x%0x", __func__,
 	    CQE_OVFBIT(hw_cqe), CQE_QPID(hw_cqe), CQE_GENBIT(hw_cqe),
@@ -440,6 +441,7 @@ static int poll_cq(struct t4_wq *wq, str
 	    "%s opcode 0x%0x len 0x%0x wrid_hi_stag 0x%x wrid_low_msn 0x%x",
 	    __func__, CQE_OPCODE(hw_cqe), CQE_LEN(hw_cqe), CQE_WRID_HI(hw_cqe),
 	    CQE_WRID_LOW(hw_cqe));
+#endif
 
 	/*
 	 * skip cqe's not affiliated with a QP.
@@ -548,13 +550,17 @@ proc_cqe:
 	 */
 	if (SQ_TYPE(hw_cqe)) {
 		wq->sq.cidx = CQE_WRID_SQ_IDX(hw_cqe);
+#if 0
 		CTR2(KTR_IW_CXGBE, "%s completing sq idx %u",
 		     __func__, wq->sq.cidx);
+#endif
 		*cookie = wq->sq.sw_sq[wq->sq.cidx].wr_id;
 		t4_sq_consume(wq);
 	} else {
+#if 0
 		CTR2(KTR_IW_CXGBE, "%s completing rq idx %u",
 		     __func__, wq->rq.cidx);
+#endif
 		*cookie = wq->rq.sw_rq[wq->rq.cidx].wr_id;
 		BUG_ON(t4_rq_empty(wq));
 		t4_rq_consume(wq);
@@ -568,12 +574,16 @@ flush_wq:
 
 skip_cqe:
 	if (SW_CQE(hw_cqe)) {
+#if 0
 		CTR4(KTR_IW_CXGBE, "%s cq %p cqid 0x%x skip sw cqe cidx %u",
 		     __func__, cq, cq->cqid, cq->sw_cidx);
+#endif
 		t4_swcq_consume(cq);
 	} else {
+#if 0
 		CTR4(KTR_IW_CXGBE, "%s cq %p cqid 0x%x skip hw cqe cidx %u",
 		     __func__, cq, cq->cqid, cq->cidx);
+#endif
 		t4_hwcq_consume(cq);
 	}
 	return ret;
@@ -619,12 +629,14 @@ static int c4iw_poll_cq_one(struct c4iw_
 	wc->vendor_err = CQE_STATUS(&cqe);
 	wc->wc_flags = 0;
 
+#if 0
 	CTR5(KTR_IW_CXGBE, "%s qpid 0x%x type %d opcode %d status 0x%x",
 	    __func__, CQE_QPID(&cqe), CQE_TYPE(&cqe), CQE_OPCODE(&cqe),
 	    CQE_STATUS(&cqe));
 	CTR5(KTR_IW_CXGBE, "%s len %u wrid hi 0x%x lo 0x%x cookie 0x%llx",
 	    __func__, CQE_LEN(&cqe), CQE_WRID_HI(&cqe), CQE_WRID_LOW(&cqe),
 	    (unsigned long long)cookie);
+#endif
 
 	if (CQE_TYPE(&cqe) == 0) {
 		if (!CQE_STATUS(&cqe))
@@ -787,8 +799,6 @@ c4iw_create_cq(struct ib_device *ibdev, 
 	struct c4iw_mm_entry *mm, *mm2;
 	int entries = attr->cqe;
 
-	CTR3(KTR_IW_CXGBE, "%s ib_dev %p entries %d", __func__, ibdev, entries);
-
 	rhp = to_c4iw_dev(ibdev);
 
 	chp = kzalloc(sizeof(*chp), GFP_KERNEL);
diff -r 90a69593fb9d -r 9343419b9609 sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
--- a/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h	Fri Feb 17 19:11:35 2017 -0800
+++ b/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h	Mon Feb 20 14:55:46 2017 -0800
@@ -597,15 +597,11 @@ enum c4iw_mmid_state {
 #define MPA_V2_IRD_ORD_MASK             0x3FFF
 
 #define c4iw_put_ep(ep) { \
-	CTR4(KTR_IW_CXGBE, "put_ep (%s:%u) ep %p, refcnt %d", \
-	     __func__, __LINE__, ep, atomic_read(&(ep)->kref.refcount)); \
 	WARN_ON(atomic_read(&(ep)->kref.refcount) < 1); \
         kref_put(&((ep)->kref), _c4iw_free_ep); \
 }
 
 #define c4iw_get_ep(ep) { \
-	CTR4(KTR_IW_CXGBE, "get_ep (%s:%u) ep %p, refcnt %d", \
-	      __func__, __LINE__, ep, atomic_read(&(ep)->kref.refcount)); \
         kref_get(&((ep)->kref));  \
 }
 
diff -r 90a69593fb9d -r 9343419b9609 sys/dev/cxgbe/iw_cxgbe/mem.c
--- a/sys/dev/cxgbe/iw_cxgbe/mem.c	Fri Feb 17 19:11:35 2017 -0800
+++ b/sys/dev/cxgbe/iw_cxgbe/mem.c	Mon Feb 20 14:55:46 2017 -0800
@@ -588,7 +588,7 @@ struct ib_mr *c4iw_reg_user_mr(struct ib
 	struct c4iw_pd *php;
 	struct c4iw_mr *mhp;
 
-	CTR2(KTR_IW_CXGBE, "%s ib_pd %p", __func__, pd);
+	CTR2(KTR_IW_CXGBE, "%s: ib_pd %p", __func__, pd);
 
 	if (length == ~0ULL)
 		return ERR_PTR(-EINVAL);
@@ -616,7 +616,7 @@ struct ib_mr *c4iw_reg_user_mr(struct ib
 	}
 
 	shift = ffs(mhp->umem->page_size) - 1;
-	
+
 	n = mhp->umem->nmap;
 	err = alloc_pbl(mhp, n);
 	if (err)
diff -r 90a69593fb9d -r 9343419b9609 sys/dev/cxgbe/iw_cxgbe/provider.c
--- a/sys/dev/cxgbe/iw_cxgbe/provider.c	Fri Feb 17 19:11:35 2017 -0800
+++ b/sys/dev/cxgbe/iw_cxgbe/provider.c	Mon Feb 20 14:55:46 2017 -0800
@@ -105,8 +105,9 @@ static struct ib_ucontext *c4iw_alloc_uc
 	struct c4iw_ucontext *context;
 	struct c4iw_dev *rhp = to_c4iw_dev(ibdev);
 
-	CTR2(KTR_IW_CXGBE, "%s ibdev %p", __func__, ibdev);
 	context = kzalloc(sizeof(*context), GFP_KERNEL);
+	CTR4(KTR_IW_CXGBE, "%s: ibdev %p, udata %p, ucontext %p", __func__,
+	    ibdev, udata, context);
 	if (!context)
 		return ERR_PTR(-ENOMEM);
 	c4iw_init_dev_ucontext(&rhp->rdev, &context->uctx);
@@ -240,8 +241,6 @@ c4iw_allocate_pd(struct ib_device *ibdev
 	u32 pdid;
 	struct c4iw_dev *rhp;
 
-	CTR4(KTR_IW_CXGBE, "%s: ibdev %p, context %p, data %p", __func__, ibdev,
-	    context, udata);
 	rhp = (struct c4iw_dev *) ibdev;
 	pdid =  c4iw_get_resource(&rhp->rdev.resource.pdid_table);
 	if (!pdid)
@@ -266,7 +265,7 @@ c4iw_allocate_pd(struct ib_device *ibdev
 	mutex_unlock(&rhp->rdev.stats.lock);
 
 	CTR6(KTR_IW_CXGBE,
-	    "%s: ibdev %p, context %p, data %p, pddid 0x%x, pd %p", __func__,
+	    "%s: ibdev %p, ucontext %p, udata %p, pdid 0x%x, pd %p", __func__,
 	    ibdev, context, udata, pdid, php);
 	return (&php->ibpd);
 }
@@ -275,8 +274,8 @@ static int
 c4iw_query_pkey(struct ib_device *ibdev, u8 port, u16 index, u16 *pkey)
 {
 
-	CTR5(KTR_IW_CXGBE, "%s ibdev %p, port %d, index %d, pkey %p", __func__,
-	    ibdev, port, index, pkey);
+	CTR5(KTR_IW_CXGBE, "%s: ibdev %p, port %d, index %d, pkey %p", __func__,
+	    ibdev, port - 1, index, pkey);
 
 	*pkey = 0;
 	return (0);
@@ -289,8 +288,8 @@ c4iw_query_gid(struct ib_device *ibdev, 
 	struct port_info *pi;
 	struct adapter *sc;
 
-	CTR5(KTR_IW_CXGBE, "%s ibdev %p, port %d, index %d, gid %p", __func__,
-	    ibdev, port, index, gid);
+	CTR5(KTR_IW_CXGBE, "%s: ibdev %p, port %d, index %d, gid %p", __func__,
+	    ibdev, port - 1, index, gid);
 
 	memset(&gid->raw[0], 0, sizeof(gid->raw));
 	dev = to_c4iw_dev(ibdev);
@@ -308,7 +307,7 @@ c4iw_query_device(struct ib_device *ibde
 	struct c4iw_dev *dev = to_c4iw_dev(ibdev);
 	struct adapter *sc = dev->rdev.adap;
 
-	CTR3(KTR_IW_CXGBE, "%s ibdev %p, props %p", __func__, ibdev, props);
+	CTR3(KTR_IW_CXGBE, "%s: ibdev %p, props %p", __func__, ibdev, props);
 
 	memset(props, 0, sizeof *props);
 	memcpy(&props->sys_image_guid, sc->port[0]->vi[0].hw_addr,
@@ -347,8 +346,8 @@ c4iw_query_port(struct ib_device *ibdev,
 	struct port_info *pi;
 	struct ifnet *ifp;
 
-	CTR4(KTR_IW_CXGBE, "%s ibdev %p, port %d, props %p", __func__, ibdev,
-	    port, props);
+	CTR4(KTR_IW_CXGBE, "%s: ibdev %p, port %d, props %p", __func__, ibdev,
+	    port - 1, props);
 
 	dev = to_c4iw_dev(ibdev);
 	sc = dev->rdev.adap;
@@ -396,7 +395,7 @@ c4iw_register_device(struct c4iw_dev *de
 	struct iw_cm_verbs *iwcm;
 	int ret;
 
-	CTR3(KTR_IW_CXGBE, "%s c4iw_dev %p, adapter %p", __func__, dev, sc);
+	CTR3(KTR_IW_CXGBE, "%s: sc %p, c4iw_dev %p", __func__, sc, dev);
 	BUG_ON(!sc->port[0]);
 	strlcpy(ibdev->name, device_get_nameunit(sc->dev), sizeof(ibdev->name));
 	memset(&ibdev->node_guid, 0, sizeof(ibdev->node_guid));
@@ -495,8 +494,7 @@ void
 c4iw_unregister_device(struct c4iw_dev *dev)
 {
 
-	CTR3(KTR_IW_CXGBE, "%s c4iw_dev %p, adapter %p", __func__, dev,
-	    dev->rdev.adap);
+	CTR2(KTR_IW_CXGBE, "%s: c4iw_dev %p", __func__, dev);
 	ib_unregister_device(&dev->ibdev);
 	kfree(dev->ibdev.iwcm);
 	return;
diff -r 90a69593fb9d -r 9343419b9609 sys/dev/cxgbe/iw_cxgbe/qp.c
--- a/sys/dev/cxgbe/iw_cxgbe/qp.c	Fri Feb 17 19:11:35 2017 -0800
+++ b/sys/dev/cxgbe/iw_cxgbe/qp.c	Mon Feb 20 14:55:46 2017 -0800
@@ -678,10 +678,12 @@ int c4iw_post_send(struct ib_qp *ibqp, s
 
 		init_wr_hdr(wqe, qhp->wq.sq.pidx, fw_opcode, fw_flags, len16);
 
+#if 0
 		CTR5(KTR_IW_CXGBE,
 		    "%s cookie 0x%llx pidx 0x%x opcode 0x%x read_len %u",
 		    __func__, (unsigned long long)wr->wr_id, qhp->wq.sq.pidx,
 		    swsqe->opcode, swsqe->read_len);
+#endif
 		wr = wr->next;
 		num_wrs--;
 		t4_sq_produce(&qhp->wq, len16);
diff -r 90a69593fb9d -r 9343419b9609 sys/dev/cxgbe/iw_cxgbe/resource.c
--- a/sys/dev/cxgbe/iw_cxgbe/resource.c	Fri Feb 17 19:11:35 2017 -0800
+++ b/sys/dev/cxgbe/iw_cxgbe/resource.c	Mon Feb 20 14:55:46 2017 -0800
@@ -148,7 +148,6 @@ u32 c4iw_get_cqid(struct c4iw_rdev *rdev
 	}
 out:
 	mutex_unlock(&uctx->lock);
-	CTR2(KTR_IW_CXGBE, "%s: qid 0x%x", __func__, qid);
 	mutex_lock(&rdev->stats.lock);
 	if (rdev->stats.qid.cur > rdev->stats.qid.max)
 		rdev->stats.qid.max = rdev->stats.qid.cur;