Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7b37ee0 authored by Joe Perches's avatar Joe Perches Committed by Doug Ledford
Browse files

cxgb3: Convert PDBG to pr_debug 



Using the normal mechanism, not an indirected one, is clearer.

Miscellanea:

o Coalesce formats
o Realign arguments

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 46b2d4e8

drivers/infiniband/hw/cxgb3/cxio_dbg.c

+19 −16
Original line number Diff line number Diff line
@@ -51,17 +51,18 @@ void cxio_dump_tpt(struct cxio_rdev *rdev, u32 stag) 
	m->mem_id = MEM_PMRX;

	m->addr = (stag>>8) * 32 + rdev->rnic_info.tpt_base;

	m->len = size;

	PDBG("%s TPT addr 0x%x len %d\n", __func__, m->addr, m->len);

	pr_debug("%s TPT addr 0x%x len %d\n", __func__, m->addr, m->len);

	rc = rdev->t3cdev_p->ctl(rdev->t3cdev_p, RDMA_GET_MEM, m);

	if (rc) {

		PDBG("%s toectl returned error %d\n", __func__, rc);

		pr_debug("%s toectl returned error %d\n", __func__, rc);

		kfree(m);

		return;

	}



	data = (u64 *)m->buf;

	while (size > 0) {

		PDBG("TPT %08x: %016llx\n", m->addr, (unsigned long long) *data);

		pr_debug("TPT %08x: %016llx\n",

			 m->addr, (unsigned long long)*data);

		size -= 8;

		data++;

		m->addr += 8;
@@ -87,18 +88,19 @@ void cxio_dump_pbl(struct cxio_rdev *rdev, u32 pbl_addr, uint len, u8 shift) 
	m->mem_id = MEM_PMRX;

	m->addr = pbl_addr;

	m->len = size;

	PDBG("%s PBL addr 0x%x len %d depth %d\n",

	pr_debug("%s PBL addr 0x%x len %d depth %d\n",

		 __func__, m->addr, m->len, npages);

	rc = rdev->t3cdev_p->ctl(rdev->t3cdev_p, RDMA_GET_MEM, m);

	if (rc) {

		PDBG("%s toectl returned error %d\n", __func__, rc);

		pr_debug("%s toectl returned error %d\n", __func__, rc);

		kfree(m);

		return;

	}



	data = (u64 *)m->buf;

	while (size > 0) {

		PDBG("PBL %08x: %016llx\n", m->addr, (unsigned long long) *data);

		pr_debug("PBL %08x: %016llx\n",

			 m->addr, (unsigned long long)*data);

		size -= 8;

		data++;

		m->addr += 8;
@@ -114,8 +116,8 @@ void cxio_dump_wqe(union t3_wr *wqe) 
	if (size == 0)

		size = 8;

	while (size > 0) {

		PDBG("WQE %p: %016llx\n", data,

		     (unsigned long long) be64_to_cpu(*data));

		pr_debug("WQE %p: %016llx\n",

			 data, (unsigned long long)be64_to_cpu(*data));

		size--;

		data++;

	}
@@ -127,8 +129,8 @@ void cxio_dump_wce(struct t3_cqe *wce) 
	int size = sizeof(*wce);



	while (size > 0) {

		PDBG("WCE %p: %016llx\n", data,

		     (unsigned long long) be64_to_cpu(*data));

		pr_debug("WCE %p: %016llx\n",

			 data, (unsigned long long)be64_to_cpu(*data));

		size -= 8;

		data++;

	}
@@ -148,17 +150,18 @@ void cxio_dump_rqt(struct cxio_rdev *rdev, u32 hwtid, int nents) 
	m->mem_id = MEM_PMRX;

	m->addr = ((hwtid)<<10) + rdev->rnic_info.rqt_base;

	m->len = size;

	PDBG("%s RQT addr 0x%x len %d\n", __func__, m->addr, m->len);

	pr_debug("%s RQT addr 0x%x len %d\n", __func__, m->addr, m->len);

	rc = rdev->t3cdev_p->ctl(rdev->t3cdev_p, RDMA_GET_MEM, m);

	if (rc) {

		PDBG("%s toectl returned error %d\n", __func__, rc);

		pr_debug("%s toectl returned error %d\n", __func__, rc);

		kfree(m);

		return;

	}



	data = (u64 *)m->buf;

	while (size > 0) {

		PDBG("RQT %08x: %016llx\n", m->addr, (unsigned long long) *data);

		pr_debug("RQT %08x: %016llx\n",

			 m->addr, (unsigned long long)*data);

		size -= 8;

		data++;

		m->addr += 8;
@@ -180,10 +183,10 @@ void cxio_dump_tcb(struct cxio_rdev *rdev, u32 hwtid) 
	m->mem_id = MEM_CM;

	m->addr = hwtid * size;

	m->len = size;

	PDBG("%s TCB %d len %d\n", __func__, m->addr, m->len);

	pr_debug("%s TCB %d len %d\n", __func__, m->addr, m->len);

	rc = rdev->t3cdev_p->ctl(rdev->t3cdev_p, RDMA_GET_MEM, m);

	if (rc) {

		PDBG("%s toectl returned error %d\n", __func__, rc);

		pr_debug("%s toectl returned error %d\n", __func__, rc);

		kfree(m);

		return;

	}

drivers/infiniband/hw/cxgb3/cxio_hal.c

+85 −89
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static int cxio_hal_clear_qp_ctx(struct cxio_rdev *rdev_p, u32 qpid) 
	struct t3_modify_qp_wr *wqe;

	struct sk_buff *skb = alloc_skb(sizeof(*wqe), GFP_KERNEL);

	if (!skb) {

		PDBG("%s alloc_skb failed\n", __func__);

		pr_debug("%s alloc_skb failed\n", __func__);

		return -ENOMEM;

	}

	wqe = (struct t3_modify_qp_wr *) skb_put(skb, sizeof(*wqe));
@@ -229,7 +229,7 @@ static u32 get_qpid(struct cxio_rdev *rdev_p, struct cxio_ucontext *uctx) 
	}

out:

	mutex_unlock(&uctx->lock);

	PDBG("%s qpid 0x%x\n", __func__, qpid);

	pr_debug("%s qpid 0x%x\n", __func__, qpid);

	return qpid;

}
@@ -241,7 +241,7 @@ static void put_qpid(struct cxio_rdev *rdev_p, u32 qpid, 
	entry = kmalloc(sizeof *entry, GFP_KERNEL);

	if (!entry)

		return;

	PDBG("%s qpid 0x%x\n", __func__, qpid);

	pr_debug("%s qpid 0x%x\n", __func__, qpid);

	entry->qpid = qpid;

	mutex_lock(&uctx->lock);

	list_add_tail(&entry->entry, &uctx->qpids);
@@ -305,8 +305,8 @@ int cxio_create_qp(struct cxio_rdev *rdev_p, u32 kernel_domain, 
		wq->udb = (u64)rdev_p->rnic_info.udbell_physbase +

					(wq->qpid << rdev_p->qpshift);

	wq->rdev = rdev_p;

	PDBG("%s qpid 0x%x doorbell 0x%p udb 0x%llx\n", __func__,

	     wq->qpid, wq->doorbell, (unsigned long long) wq->udb);

	pr_debug("%s qpid 0x%x doorbell 0x%p udb 0x%llx\n",

		 __func__, wq->qpid, wq->doorbell, (unsigned long long)wq->udb);

	return 0;

err4:

	kfree(wq->sq);
@@ -350,7 +350,7 @@ static void insert_recv_cqe(struct t3_wq *wq, struct t3_cq *cq) 
{

	struct t3_cqe cqe;



	PDBG("%s wq %p cq %p sw_rptr 0x%x sw_wptr 0x%x\n", __func__,

	pr_debug("%s wq %p cq %p sw_rptr 0x%x sw_wptr 0x%x\n", __func__,

		 wq, cq, cq->sw_rptr, cq->sw_wptr);

	memset(&cqe, 0, sizeof(cqe));

	cqe.header = cpu_to_be32(V_CQE_STATUS(TPT_ERR_SWFLUSH) |
@@ -369,10 +369,10 @@ int cxio_flush_rq(struct t3_wq *wq, struct t3_cq *cq, int count) 
	u32 ptr;

	int flushed = 0;



	PDBG("%s wq %p cq %p\n", __func__, wq, cq);

	pr_debug("%s wq %p cq %p\n", __func__, wq, cq);



	/* flush RQ */

	PDBG("%s rq_rptr %u rq_wptr %u skip count %u\n", __func__,

	pr_debug("%s rq_rptr %u rq_wptr %u skip count %u\n", __func__,

		 wq->rq_rptr, wq->rq_wptr, count);

	ptr = wq->rq_rptr + count;

	while (ptr++ != wq->rq_wptr) {
@@ -387,7 +387,7 @@ static void insert_sq_cqe(struct t3_wq *wq, struct t3_cq *cq, 
{

	struct t3_cqe cqe;



	PDBG("%s wq %p cq %p sw_rptr 0x%x sw_wptr 0x%x\n", __func__,

	pr_debug("%s wq %p cq %p sw_rptr 0x%x sw_wptr 0x%x\n", __func__,

		 wq, cq, cq->sw_rptr, cq->sw_wptr);

	memset(&cqe, 0, sizeof(cqe));

	cqe.header = cpu_to_be32(V_CQE_STATUS(TPT_ERR_SWFLUSH) |
@@ -428,10 +428,10 @@ void cxio_flush_hw_cq(struct t3_cq *cq) 
{

	struct t3_cqe *cqe, *swcqe;



	PDBG("%s cq %p cqid 0x%x\n", __func__, cq, cq->cqid);

	pr_debug("%s cq %p cqid 0x%x\n", __func__, cq, cq->cqid);

	cqe = cxio_next_hw_cqe(cq);

	while (cqe) {

		PDBG("%s flushing hwcq rptr 0x%x to swcq wptr 0x%x\n",

		pr_debug("%s flushing hwcq rptr 0x%x to swcq wptr 0x%x\n",

			 __func__, cq->rptr, cq->sw_wptr);

		swcqe = cq->sw_queue + Q_PTR2IDX(cq->sw_wptr, cq->size_log2);

		*swcqe = *cqe;
@@ -475,7 +475,7 @@ void cxio_count_scqes(struct t3_cq *cq, struct t3_wq *wq, int *count) 
			(*count)++;

		ptr++;

	}

	PDBG("%s cq %p count %d\n", __func__, cq, *count);

	pr_debug("%s cq %p count %d\n", __func__, cq, *count);

}



void cxio_count_rcqes(struct t3_cq *cq, struct t3_wq *wq, int *count)
@@ -484,7 +484,7 @@ void cxio_count_rcqes(struct t3_cq *cq, struct t3_wq *wq, int *count) 
	u32 ptr;



	*count = 0;

	PDBG("%s count zero %d\n", __func__, *count);

	pr_debug("%s count zero %d\n", __func__, *count);

	ptr = cq->sw_rptr;

	while (!Q_EMPTY(ptr, cq->sw_wptr)) {

		cqe = cq->sw_queue + (Q_PTR2IDX(ptr, cq->size_log2));
@@ -493,7 +493,7 @@ void cxio_count_rcqes(struct t3_cq *cq, struct t3_wq *wq, int *count) 
			(*count)++;

		ptr++;

	}

	PDBG("%s cq %p count %d\n", __func__, cq, *count);

	pr_debug("%s cq %p count %d\n", __func__, cq, *count);

}



static int cxio_hal_init_ctrl_cq(struct cxio_rdev *rdev_p)
@@ -520,12 +520,12 @@ static int cxio_hal_init_ctrl_qp(struct cxio_rdev *rdev_p) 


	skb = alloc_skb(sizeof(*wqe), GFP_KERNEL);

	if (!skb) {

		PDBG("%s alloc_skb failed\n", __func__);

		pr_debug("%s alloc_skb failed\n", __func__);

		return -ENOMEM;

	}

	err = cxio_hal_init_ctrl_cq(rdev_p);

	if (err) {

		PDBG("%s err %d initializing ctrl_cq\n", __func__, err);

		pr_debug("%s err %d initializing ctrl_cq\n", __func__, err);

		goto err;

	}

	rdev_p->ctrl_qp.workq = dma_alloc_coherent(
@@ -535,7 +535,7 @@ static int cxio_hal_init_ctrl_qp(struct cxio_rdev *rdev_p) 
					&(rdev_p->ctrl_qp.dma_addr),

					GFP_KERNEL);

	if (!rdev_p->ctrl_qp.workq) {

		PDBG("%s dma_alloc_coherent failed\n", __func__);

		pr_debug("%s dma_alloc_coherent failed\n", __func__);

		err = -ENOMEM;

		goto err;

	}
@@ -570,7 +570,7 @@ static int cxio_hal_init_ctrl_qp(struct cxio_rdev *rdev_p) 
	wqe->sge_cmd = cpu_to_be64(sge_cmd);

	wqe->ctx1 = cpu_to_be64(ctx1);

	wqe->ctx0 = cpu_to_be64(ctx0);

	PDBG("CtrlQP dma_addr 0x%llx workq %p size %d\n",

	pr_debug("CtrlQP dma_addr 0x%llx workq %p size %d\n",

		 (unsigned long long)rdev_p->ctrl_qp.dma_addr,

		 rdev_p->ctrl_qp.workq, 1 << T3_CTRL_QP_SIZE_LOG2);

	skb->priority = CPL_PRIORITY_CONTROL;
@@ -604,26 +604,26 @@ static int cxio_hal_ctrl_qp_write_mem(struct cxio_rdev *rdev_p, u32 addr, 
	u64 utx_cmd;

	addr &= 0x7FFFFFF;

	nr_wqe = len % 96 ? len / 96 + 1 : len / 96;	/* 96B max per WQE */

	PDBG("%s wptr 0x%x rptr 0x%x len %d, nr_wqe %d data %p addr 0x%0x\n",

	pr_debug("%s wptr 0x%x rptr 0x%x len %d, nr_wqe %d data %p addr 0x%0x\n",

		 __func__, rdev_p->ctrl_qp.wptr, rdev_p->ctrl_qp.rptr, len,

		 nr_wqe, data, addr);

	utx_len = 3;		/* in 32B unit */

	for (i = 0; i < nr_wqe; i++) {

		if (Q_FULL(rdev_p->ctrl_qp.rptr, rdev_p->ctrl_qp.wptr,

		           T3_CTRL_QP_SIZE_LOG2)) {

			PDBG("%s ctrl_qp full wtpr 0x%0x rptr 0x%0x, "

			     "wait for more space i %d\n", __func__,

			pr_debug("%s ctrl_qp full wtpr 0x%0x rptr 0x%0x, wait for more space i %d\n",

				 __func__,

				 rdev_p->ctrl_qp.wptr, rdev_p->ctrl_qp.rptr, i);

			if (wait_event_interruptible(rdev_p->ctrl_qp.waitq,

					     !Q_FULL(rdev_p->ctrl_qp.rptr,

						     rdev_p->ctrl_qp.wptr,

						     T3_CTRL_QP_SIZE_LOG2))) {

				PDBG("%s ctrl_qp workq interrupted\n",

				pr_debug("%s ctrl_qp workq interrupted\n",

					 __func__);

				return -ERESTARTSYS;

			}

			PDBG("%s ctrl_qp wakeup, continue posting work request "

			     "i %d\n", __func__, i);

			pr_debug("%s ctrl_qp wakeup, continue posting work request i %d\n",

				 __func__, i);

		}

		wqe = (__be64 *)(rdev_p->ctrl_qp.workq + (rdev_p->ctrl_qp.wptr %

						(1 << T3_CTRL_QP_SIZE_LOG2)));
@@ -644,7 +644,7 @@ static int cxio_hal_ctrl_qp_write_mem(struct cxio_rdev *rdev_p, u32 addr, 
		if ((i != 0) &&

		    (i % (((1 << T3_CTRL_QP_SIZE_LOG2)) >> 1) == 0)) {

			flag = T3_COMPLETION_FLAG;

			PDBG("%s force completion at i %d\n", __func__, i);

			pr_debug("%s force completion at i %d\n", __func__, i);

		}



		/* build the utx mem command */
@@ -716,7 +716,7 @@ static int __cxio_tpt_op(struct cxio_rdev *rdev_p, u32 reset_tpt_entry, 
			return -ENOMEM;

		*stag = (stag_idx << 8) | ((*stag) & 0xFF);

	}

	PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",

	pr_debug("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",

		 __func__, stag_state, type, pdid, stag_idx);



	mutex_lock(&rdev_p->ctrl_qp.lock);
@@ -766,7 +766,7 @@ int cxio_write_pbl(struct cxio_rdev *rdev_p, __be64 *pbl, 
	u32 wptr;

	int err;



	PDBG("%s *pdb_addr 0x%x, pbl_base 0x%x, pbl_size %d\n",

	pr_debug("%s *pdb_addr 0x%x, pbl_base 0x%x, pbl_size %d\n",

		 __func__, pbl_addr, rdev_p->rnic_info.pbl_base,

		 pbl_size);
@@ -836,7 +836,7 @@ int cxio_rdma_init(struct cxio_rdev *rdev_p, struct t3_rdma_init_attr *attr) 
	struct sk_buff *skb = alloc_skb(sizeof(*wqe), GFP_ATOMIC);

	if (!skb)

		return -ENOMEM;

	PDBG("%s rdev_p %p\n", __func__, rdev_p);

	pr_debug("%s rdev_p %p\n", __func__, rdev_p);

	wqe = (struct t3_rdma_init_wr *) __skb_put(skb, sizeof(*wqe));

	wqe->wrh.op_seop_flags = cpu_to_be32(V_FW_RIWR_OP(T3_WR_INIT));

	wqe->wrh.gen_tid_len = cpu_to_be32(V_FW_RIWR_TID(attr->tid) |
@@ -879,21 +879,19 @@ static int cxio_hal_ev_handler(struct t3cdev *t3cdev_p, struct sk_buff *skb) 
	static int cnt;

	struct cxio_rdev *rdev_p = NULL;

	struct respQ_msg_t *rsp_msg = (struct respQ_msg_t *) skb->data;

	PDBG("%d: %s cq_id 0x%x cq_ptr 0x%x genbit %0x overflow %0x an %0x"

	     " se %0x notify %0x cqbranch %0x creditth %0x\n",

	pr_debug("%d: %s cq_id 0x%x cq_ptr 0x%x genbit %0x overflow %0x an %0x se %0x notify %0x cqbranch %0x creditth %0x\n",

		 cnt, __func__, RSPQ_CQID(rsp_msg), RSPQ_CQPTR(rsp_msg),

		 RSPQ_GENBIT(rsp_msg), RSPQ_OVERFLOW(rsp_msg), RSPQ_AN(rsp_msg),

		 RSPQ_SE(rsp_msg), RSPQ_NOTIFY(rsp_msg), RSPQ_CQBRANCH(rsp_msg),

		 RSPQ_CREDIT_THRESH(rsp_msg));

	PDBG("CQE: QPID 0x%0x genbit %0x type 0x%0x status 0x%0x opcode %d "

	     "len 0x%0x wrid_hi_stag 0x%x wrid_low_msn 0x%x\n",

	pr_debug("CQE: QPID 0x%0x genbit %0x type 0x%0x status 0x%0x opcode %d len 0x%0x wrid_hi_stag 0x%x wrid_low_msn 0x%x\n",

		 CQE_QPID(rsp_msg->cqe), CQE_GENBIT(rsp_msg->cqe),

		 CQE_TYPE(rsp_msg->cqe), CQE_STATUS(rsp_msg->cqe),

		 CQE_OPCODE(rsp_msg->cqe), CQE_LEN(rsp_msg->cqe),

		 CQE_WRID_HI(rsp_msg->cqe), CQE_WRID_LOW(rsp_msg->cqe));

	rdev_p = (struct cxio_rdev *)t3cdev_p->ulp;

	if (!rdev_p) {

		PDBG("%s called by t3cdev %p with null ulp\n", __func__,

		pr_debug("%s called by t3cdev %p with null ulp\n", __func__,

			 t3cdev_p);

		return 0;

	}
@@ -933,13 +931,13 @@ int cxio_rdev_open(struct cxio_rdev *rdev_p) 
		strncpy(rdev_p->dev_name, rdev_p->t3cdev_p->name,

			T3_MAX_DEV_NAME_LEN);

	} else {

		PDBG("%s t3cdev_p or dev_name must be set\n", __func__);

		pr_debug("%s t3cdev_p or dev_name must be set\n", __func__);

		return -EINVAL;

	}



	list_add_tail(&rdev_p->entry, &rdev_list);



	PDBG("%s opening rnic dev %s\n", __func__, rdev_p->dev_name);

	pr_debug("%s opening rnic dev %s\n", __func__, rdev_p->dev_name);

	memset(&rdev_p->ctrl_qp, 0, sizeof(rdev_p->ctrl_qp));

	if (!rdev_p->t3cdev_p)

		rdev_p->t3cdev_p = dev2t3cdev(netdev_p);
@@ -986,15 +984,13 @@ int cxio_rdev_open(struct cxio_rdev *rdev_p) 
					      PAGE_SHIFT));

	rdev_p->qpnr = rdev_p->rnic_info.udbell_len >> PAGE_SHIFT;

	rdev_p->qpmask = (65536 >> ilog2(rdev_p->qpnr)) - 1;

	PDBG("%s rnic %s info: tpt_base 0x%0x tpt_top 0x%0x num stags %d "

	     "pbl_base 0x%0x pbl_top 0x%0x rqt_base 0x%0x, rqt_top 0x%0x\n",

	pr_debug("%s rnic %s info: tpt_base 0x%0x tpt_top 0x%0x num stags %d pbl_base 0x%0x pbl_top 0x%0x rqt_base 0x%0x, rqt_top 0x%0x\n",

		 __func__, rdev_p->dev_name, rdev_p->rnic_info.tpt_base,

		 rdev_p->rnic_info.tpt_top, cxio_num_stags(rdev_p),

		 rdev_p->rnic_info.pbl_base,

		 rdev_p->rnic_info.pbl_top, rdev_p->rnic_info.rqt_base,

		 rdev_p->rnic_info.rqt_top);

	PDBG("udbell_len 0x%0x udbell_physbase 0x%lx kdb_addr %p qpshift %lu "

	     "qpnr %d qpmask 0x%x\n",

	pr_debug("udbell_len 0x%0x udbell_physbase 0x%lx kdb_addr %p qpshift %lu qpnr %d qpmask 0x%x\n",

		 rdev_p->rnic_info.udbell_len,

		 rdev_p->rnic_info.udbell_physbase, rdev_p->rnic_info.kdb_addr,

		 rdev_p->qpshift, rdev_p->qpnr, rdev_p->qpmask);
@@ -1083,7 +1079,7 @@ static void flush_completed_wrs(struct t3_wq *wq, struct t3_cq *cq) 
			/*

			 * Insert this completed cqe into the swcq.

			 */

			PDBG("%s moving cqe into swcq sq idx %ld cq idx %ld\n",

			pr_debug("%s moving cqe into swcq sq idx %ld cq idx %ld\n",

				 __func__, Q_PTR2IDX(ptr,  wq->sq_size_log2),

				 Q_PTR2IDX(cq->sw_wptr, cq->size_log2));

			sqp->cqe.header |= htonl(V_CQE_SWCQE(1));
@@ -1151,8 +1147,7 @@ int cxio_poll_cq(struct t3_wq *wq, struct t3_cq *cq, struct t3_cqe *cqe, 
	*credit = 0;

	hw_cqe = cxio_next_cqe(cq);



	PDBG("%s CQE OOO %d qpid 0x%0x genbit %d type %d status 0x%0x"

	     " opcode 0x%0x len 0x%0x wrid_hi_stag 0x%x wrid_low_msn 0x%x\n",

	pr_debug("%s CQE OOO %d qpid 0x%0x genbit %d type %d status 0x%0x opcode 0x%0x len 0x%0x wrid_hi_stag 0x%x wrid_low_msn 0x%x\n",

		 __func__, CQE_OOO(*hw_cqe), CQE_QPID(*hw_cqe),

		 CQE_GENBIT(*hw_cqe), CQE_TYPE(*hw_cqe), CQE_STATUS(*hw_cqe),

		 CQE_OPCODE(*hw_cqe), CQE_LEN(*hw_cqe), CQE_WRID_HI(*hw_cqe),
@@ -1275,9 +1270,10 @@ int cxio_poll_cq(struct t3_wq *wq, struct t3_cq *cq, struct t3_cqe *cqe, 
	if (!SW_CQE(*hw_cqe) && (CQE_WRID_SQ_WPTR(*hw_cqe) != wq->sq_rptr)) {

		struct t3_swsq *sqp;



		PDBG("%s out of order completion going in swsq at idx %ld\n",

		pr_debug("%s out of order completion going in swsq at idx %ld\n",

			 __func__,

		     Q_PTR2IDX(CQE_WRID_SQ_WPTR(*hw_cqe), wq->sq_size_log2));

			 Q_PTR2IDX(CQE_WRID_SQ_WPTR(*hw_cqe),

				   wq->sq_size_log2));

		sqp = wq->sq +

		      Q_PTR2IDX(CQE_WRID_SQ_WPTR(*hw_cqe), wq->sq_size_log2);

		sqp->cqe = *hw_cqe;
@@ -1295,12 +1291,12 @@ int cxio_poll_cq(struct t3_wq *wq, struct t3_cq *cq, struct t3_cqe *cqe, 
	 */

	if (SQ_TYPE(*hw_cqe)) {

		wq->sq_rptr = CQE_WRID_SQ_WPTR(*hw_cqe);

		PDBG("%s completing sq idx %ld\n", __func__,

		pr_debug("%s completing sq idx %ld\n", __func__,

			 Q_PTR2IDX(wq->sq_rptr, wq->sq_size_log2));

		*cookie = wq->sq[Q_PTR2IDX(wq->sq_rptr, wq->sq_size_log2)].wr_id;

		wq->sq_rptr++;

	} else {

		PDBG("%s completing rq idx %ld\n", __func__,

		pr_debug("%s completing rq idx %ld\n", __func__,

			 Q_PTR2IDX(wq->rq_rptr, wq->rq_size_log2));

		*cookie = wq->rq[Q_PTR2IDX(wq->rq_rptr, wq->rq_size_log2)].wr_id;

		if (wq->rq[Q_PTR2IDX(wq->rq_rptr, wq->rq_size_log2)].pbl_addr)
@@ -1319,11 +1315,11 @@ int cxio_poll_cq(struct t3_wq *wq, struct t3_cq *cq, struct t3_cqe *cqe, 


skip_cqe:

	if (SW_CQE(*hw_cqe)) {

		PDBG("%s cq %p cqid 0x%x skip sw cqe sw_rptr 0x%x\n",

		pr_debug("%s cq %p cqid 0x%x skip sw cqe sw_rptr 0x%x\n",

			 __func__, cq, cq->cqid, cq->sw_rptr);

		++cq->sw_rptr;

	} else {

		PDBG("%s cq %p cqid 0x%x skip hw cqe rptr 0x%x\n",

		pr_debug("%s cq %p cqid 0x%x skip hw cqe rptr 0x%x\n",

			 __func__, cq, cq->cqid, cq->rptr);

		++cq->rptr;

drivers/infiniband/hw/cxgb3/cxio_hal.h

+0 −2
Original line number Diff line number Diff line
@@ -202,8 +202,6 @@ int iwch_cxgb3_ofld_send(struct t3cdev *tdev, struct sk_buff *skb); 


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#define PDBG(fmt, args...) pr_debug(fmt, ## args)



#ifdef DEBUG

void cxio_dump_tpt(struct cxio_rdev *rev, u32 stag);

void cxio_dump_pbl(struct cxio_rdev *rev, u32 pbl_addr, uint len, u8 shift);

drivers/infiniband/hw/cxgb3/cxio_resource.c

+10 −10
Original line number Diff line number Diff line
@@ -209,13 +209,13 @@ u32 cxio_hal_get_qpid(struct cxio_hal_resource *rscp) 
{

	u32 qpid = cxio_hal_get_resource(&rscp->qpid_fifo,

			&rscp->qpid_fifo_lock);

	PDBG("%s qpid 0x%x\n", __func__, qpid);

	pr_debug("%s qpid 0x%x\n", __func__, qpid);

	return qpid;

}



void cxio_hal_put_qpid(struct cxio_hal_resource *rscp, u32 qpid)

{

	PDBG("%s qpid 0x%x\n", __func__, qpid);

	pr_debug("%s qpid 0x%x\n", __func__, qpid);

	cxio_hal_put_resource(&rscp->qpid_fifo, &rscp->qpid_fifo_lock, qpid);

}
@@ -257,13 +257,13 @@ void cxio_hal_destroy_resource(struct cxio_hal_resource *rscp) 
u32 cxio_hal_pblpool_alloc(struct cxio_rdev *rdev_p, int size)

{

	unsigned long addr = gen_pool_alloc(rdev_p->pbl_pool, size);

	PDBG("%s addr 0x%x size %d\n", __func__, (u32)addr, size);

	pr_debug("%s addr 0x%x size %d\n", __func__, (u32)addr, size);

	return (u32)addr;

}



void cxio_hal_pblpool_free(struct cxio_rdev *rdev_p, u32 addr, int size)

{

	PDBG("%s addr 0x%x size %d\n", __func__, addr, size);

	pr_debug("%s addr 0x%x size %d\n", __func__, addr, size);

	gen_pool_free(rdev_p->pbl_pool, (unsigned long)addr, size);

}
@@ -282,7 +282,7 @@ int cxio_hal_pblpool_create(struct cxio_rdev *rdev_p) 
		pbl_chunk = min(rdev_p->rnic_info.pbl_top - pbl_start + 1,

				pbl_chunk);

		if (gen_pool_add(rdev_p->pbl_pool, pbl_start, pbl_chunk, -1)) {

			PDBG("%s failed to add PBL chunk (%x/%x)\n",

			pr_debug("%s failed to add PBL chunk (%x/%x)\n",

				 __func__, pbl_start, pbl_chunk);

			if (pbl_chunk <= 1024 << MIN_PBL_SHIFT) {

				pr_warn("%s: Failed to add all PBL chunks (%x/%x)\n",
@@ -292,7 +292,7 @@ int cxio_hal_pblpool_create(struct cxio_rdev *rdev_p) 
			}

			pbl_chunk >>= 1;

		} else {

			PDBG("%s added PBL chunk (%x/%x)\n",

			pr_debug("%s added PBL chunk (%x/%x)\n",

				 __func__, pbl_start, pbl_chunk);

			pbl_start += pbl_chunk;

		}
@@ -316,13 +316,13 @@ void cxio_hal_pblpool_destroy(struct cxio_rdev *rdev_p) 
u32 cxio_hal_rqtpool_alloc(struct cxio_rdev *rdev_p, int size)

{

	unsigned long addr = gen_pool_alloc(rdev_p->rqt_pool, size << 6);

	PDBG("%s addr 0x%x size %d\n", __func__, (u32)addr, size << 6);

	pr_debug("%s addr 0x%x size %d\n", __func__, (u32)addr, size << 6);

	return (u32)addr;

}



void cxio_hal_rqtpool_free(struct cxio_rdev *rdev_p, u32 addr, int size)

{

	PDBG("%s addr 0x%x size %d\n", __func__, addr, size << 6);

	pr_debug("%s addr 0x%x size %d\n", __func__, addr, size << 6);

	gen_pool_free(rdev_p->rqt_pool, (unsigned long)addr, size << 6);

}

drivers/infiniband/hw/cxgb3/iwch.c

+3 −3
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static void iwch_db_drop_task(struct work_struct *work) 


static void rnic_init(struct iwch_dev *rnicp)

{

	PDBG("%s iwch_dev %p\n", __func__,  rnicp);

	pr_debug("%s iwch_dev %p\n", __func__,  rnicp);

	idr_init(&rnicp->cqidr);

	idr_init(&rnicp->qpidr);

	idr_init(&rnicp->mmidr);
@@ -145,7 +145,7 @@ static void open_rnic_dev(struct t3cdev *tdev) 
{

	struct iwch_dev *rnicp;



	PDBG("%s t3cdev %p\n", __func__,  tdev);

	pr_debug("%s t3cdev %p\n", __func__,  tdev);

	pr_info_once("Chelsio T3 RDMA Driver - version %s\n", DRV_VERSION);

	rnicp = (struct iwch_dev *)ib_alloc_device(sizeof(*rnicp));

	if (!rnicp) {
@@ -181,7 +181,7 @@ static void open_rnic_dev(struct t3cdev *tdev) 
static void close_rnic_dev(struct t3cdev *tdev)

{

	struct iwch_dev *dev, *tmp;

	PDBG("%s t3cdev %p\n", __func__,  tdev);

	pr_debug("%s t3cdev %p\n", __func__,  tdev);

	mutex_lock(&dev_mutex);

	list_for_each_entry_safe(dev, tmp, &dev_list, entry) {

		if (dev->rdev.t3cdev_p == tdev) {