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

Commit 548ddb19 authored by Bharat Potnuri's avatar Bharat Potnuri Committed by Doug Ledford
Browse files

iw_cxgb4: Remove __func__ parameter from pr_debug() 



pr_debug() can be enabled to print function names, So removing the
unwanted __func__ parameters from debug logs.
Realign function parameters.

Signed-off-by: default avatarPotnuri Bharat Teja <bharat@chelsio.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 44596ebf

drivers/infiniband/hw/cxgb4/cm.c

+96 −102
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static void ref_qp(struct c4iw_ep *ep) 


static void start_ep_timer(struct c4iw_ep *ep)

{

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

	pr_debug("ep %p\n", ep);

	if (timer_pending(&ep->timer)) {

		pr_err("%s timer already started! ep %p\n",

		       __func__, ep);
@@ -196,7 +196,7 @@ static void start_ep_timer(struct c4iw_ep *ep) 


static int stop_ep_timer(struct c4iw_ep *ep)

{

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

	pr_debug("ep %p stopping\n", ep);

	del_timer_sync(&ep->timer);

	if (!test_and_set_bit(TIMEOUT, &ep->com.flags)) {

		c4iw_put_ep(&ep->com);
@@ -265,8 +265,8 @@ static void set_emss(struct c4iw_ep *ep, u16 opt) 
	if (ep->emss & 7)

		pr_debug("Warning: misaligned mtu idx %u mss %u emss=%u\n",

			 TCPOPT_MSS_G(opt), ep->mss, ep->emss);

	pr_debug("%s mss_idx %u mss %u emss=%u\n", __func__, TCPOPT_MSS_G(opt),

		 ep->mss, ep->emss);

	pr_debug("mss_idx %u mss %u emss=%u\n", TCPOPT_MSS_G(opt), ep->mss,

		 ep->emss);

}



static enum c4iw_ep_state state_read(struct c4iw_ep_common *epc)
@@ -287,7 +287,7 @@ static void __state_set(struct c4iw_ep_common *epc, enum c4iw_ep_state new) 
static void state_set(struct c4iw_ep_common *epc, enum c4iw_ep_state new)

{

	mutex_lock(&epc->mutex);

	pr_debug("%s - %s -> %s\n", __func__, states[epc->state], states[new]);

	pr_debug("%s -> %s\n", states[epc->state], states[new]);

	__state_set(epc, new);

	mutex_unlock(&epc->mutex);

	return;
@@ -322,7 +322,7 @@ static void *alloc_ep(int size, gfp_t gfp) 
		mutex_init(&epc->mutex);

		c4iw_init_wr_wait(&epc->wr_wait);

	}

	pr_debug("%s alloc ep %p\n", __func__, epc);

	pr_debug("alloc ep %p\n", epc);

	return epc;

}
@@ -384,7 +384,7 @@ void _c4iw_free_ep(struct kref *kref) 
	struct c4iw_ep *ep;



	ep = container_of(kref, struct c4iw_ep, com.kref);

	pr_debug("%s ep %p state %s\n", __func__, ep, states[ep->com.state]);

	pr_debug("ep %p state %s\n", ep, states[ep->com.state]);

	if (test_bit(QP_REFERENCED, &ep->com.flags))

		deref_qp(ep);

	if (test_bit(RELEASE_RESOURCES, &ep->com.flags)) {
@@ -570,7 +570,7 @@ static void abort_arp_failure(void *handle, struct sk_buff *skb) 
	struct c4iw_rdev *rdev = &ep->com.dev->rdev;

	struct cpl_abort_req *req = cplhdr(skb);



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

	pr_debug("rdev %p\n", rdev);

	req->cmd = CPL_ABORT_NO_RST;

	skb_get(skb);

	ret = c4iw_ofld_send(rdev, skb);
@@ -647,7 +647,7 @@ static int send_halfclose(struct c4iw_ep *ep) 
	struct sk_buff *skb = skb_dequeue(&ep->com.ep_skb_list);

	u32 wrlen = roundup(sizeof(struct cpl_close_con_req), 16);



	pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	pr_debug("ep %p tid %u\n", ep, ep->hwtid);

	if (WARN_ON(!skb))

		return -ENOMEM;
@@ -662,7 +662,7 @@ static int send_abort(struct c4iw_ep *ep) 
	u32 wrlen = roundup(sizeof(struct cpl_abort_req), 16);

	struct sk_buff *req_skb = skb_dequeue(&ep->com.ep_skb_list);



	pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	pr_debug("ep %p tid %u\n", ep, ep->hwtid);

	if (WARN_ON(!req_skb))

		return -ENOMEM;
@@ -725,7 +725,7 @@ static int send_connect(struct c4iw_ep *ep) 
			roundup(sizev4, 16) :

			roundup(sizev6, 16);



	pr_debug("%s ep %p atid %u\n", __func__, ep, ep->atid);

	pr_debug("ep %p atid %u\n", ep, ep->atid);



	skb = get_skb(NULL, wrlen, GFP_KERNEL);

	if (!skb) {
@@ -824,13 +824,13 @@ static int send_connect(struct c4iw_ep *ep) 
				t5req->params =

					  cpu_to_be64(FILTER_TUPLE_V(params));

				t5req->rsvd = cpu_to_be32(isn);

			pr_debug("%s snd_isn %u\n", __func__, t5req->rsvd);

			pr_debug("snd_isn %u\n", t5req->rsvd);

				t5req->opt2 = cpu_to_be32(opt2);

			} else {

				t6req->params =

					  cpu_to_be64(FILTER_TUPLE_V(params));

				t6req->rsvd = cpu_to_be32(isn);

			pr_debug("%s snd_isn %u\n", __func__, t6req->rsvd);

			pr_debug("snd_isn %u\n", t6req->rsvd);

				t6req->opt2 = cpu_to_be32(opt2);

			}

		}
@@ -877,13 +877,13 @@ static int send_connect(struct c4iw_ep *ep) 
				t5req6->params =

					    cpu_to_be64(FILTER_TUPLE_V(params));

				t5req6->rsvd = cpu_to_be32(isn);

			pr_debug("%s snd_isn %u\n", __func__, t5req6->rsvd);

			pr_debug("snd_isn %u\n", t5req6->rsvd);

				t5req6->opt2 = cpu_to_be32(opt2);

			} else {

				t6req6->params =

					    cpu_to_be64(FILTER_TUPLE_V(params));

				t6req6->rsvd = cpu_to_be32(isn);

			pr_debug("%s snd_isn %u\n", __func__, t6req6->rsvd);

			pr_debug("snd_isn %u\n", t6req6->rsvd);

				t6req6->opt2 = cpu_to_be32(opt2);

			}
@@ -907,8 +907,8 @@ static int send_mpa_req(struct c4iw_ep *ep, struct sk_buff *skb, 
	struct mpa_message *mpa;

	struct mpa_v2_conn_params mpa_v2_params;



	pr_debug("%s ep %p tid %u pd_len %d\n",

		 __func__, ep, ep->hwtid, ep->plen);

	pr_debug("ep %p tid %u pd_len %d\n",

		 ep, ep->hwtid, ep->plen);



	BUG_ON(skb_cloned(skb));
@@ -961,7 +961,7 @@ static int send_mpa_req(struct c4iw_ep *ep, struct sk_buff *skb, 
	if (mpa_rev_to_use == 2) {

		mpa->private_data_size = htons(ntohs(mpa->private_data_size) +

					       sizeof (struct mpa_v2_conn_params));

		pr_debug("%s initiator ird %u ord %u\n", __func__, ep->ird,

		pr_debug("initiator ird %u ord %u\n", ep->ird,

			 ep->ord);

		mpa_v2_params.ird = htons((u16)ep->ird);

		mpa_v2_params.ord = htons((u16)ep->ord);
@@ -1014,8 +1014,8 @@ static int send_mpa_reject(struct c4iw_ep *ep, const void *pdata, u8 plen) 
	struct sk_buff *skb;

	struct mpa_v2_conn_params mpa_v2_params;



	pr_debug("%s ep %p tid %u pd_len %d\n",

		 __func__, ep, ep->hwtid, ep->plen);

	pr_debug("ep %p tid %u pd_len %d\n",

		 ep, ep->hwtid, ep->plen);



	mpalen = sizeof(*mpa) + plen;

	if (ep->mpa_attr.version == 2 && ep->mpa_attr.enhanced_rdma_conn)
@@ -1094,8 +1094,8 @@ static int send_mpa_reply(struct c4iw_ep *ep, const void *pdata, u8 plen) 
	struct sk_buff *skb;

	struct mpa_v2_conn_params mpa_v2_params;



	pr_debug("%s ep %p tid %u pd_len %d\n",

		 __func__, ep, ep->hwtid, ep->plen);

	pr_debug("ep %p tid %u pd_len %d\n",

		 ep, ep->hwtid, ep->plen);



	mpalen = sizeof(*mpa) + plen;

	if (ep->mpa_attr.version == 2 && ep->mpa_attr.enhanced_rdma_conn)
@@ -1185,7 +1185,7 @@ static int act_establish(struct c4iw_dev *dev, struct sk_buff *skb) 


	ep = lookup_atid(t, atid);



	pr_debug("%s ep %p tid %u snd_isn %u rcv_isn %u\n", __func__, ep, tid,

	pr_debug("ep %p tid %u snd_isn %u rcv_isn %u\n", ep, tid,

		 be32_to_cpu(req->snd_isn), be32_to_cpu(req->rcv_isn));



	mutex_lock(&ep->com.mutex);
@@ -1229,7 +1229,7 @@ static void close_complete_upcall(struct c4iw_ep *ep, int status) 
{

	struct iw_cm_event event;



	pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	pr_debug("ep %p tid %u\n", ep, ep->hwtid);

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

	event.event = IW_CM_EVENT_CLOSE;

	event.status = status;
@@ -1246,7 +1246,7 @@ static void peer_close_upcall(struct c4iw_ep *ep) 
{

	struct iw_cm_event event;



	pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	pr_debug("ep %p tid %u\n", ep, ep->hwtid);

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

	event.event = IW_CM_EVENT_DISCONNECT;

	if (ep->com.cm_id) {
@@ -1261,7 +1261,7 @@ static void peer_abort_upcall(struct c4iw_ep *ep) 
{

	struct iw_cm_event event;



	pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	pr_debug("ep %p tid %u\n", ep, ep->hwtid);

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

	event.event = IW_CM_EVENT_CLOSE;

	event.status = -ECONNRESET;
@@ -1278,8 +1278,8 @@ static void connect_reply_upcall(struct c4iw_ep *ep, int status) 
{

	struct iw_cm_event event;



	pr_debug("%s ep %p tid %u status %d\n",

		 __func__, ep, ep->hwtid, status);

	pr_debug("ep %p tid %u status %d\n",

		 ep, ep->hwtid, status);

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

	event.event = IW_CM_EVENT_CONNECT_REPLY;

	event.status = status;
@@ -1308,7 +1308,7 @@ static void connect_reply_upcall(struct c4iw_ep *ep, int status) 
		}

	}



	pr_debug("%s ep %p tid %u status %d\n", __func__, ep,

	pr_debug("ep %p tid %u status %d\n", ep,

		 ep->hwtid, status);

	set_bit(CONN_RPL_UPCALL, &ep->com.history);

	ep->com.cm_id->event_handler(ep->com.cm_id, &event);
@@ -1322,7 +1322,7 @@ static int connect_request_upcall(struct c4iw_ep *ep) 
	struct iw_cm_event event;

	int ret;



	pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	pr_debug("ep %p tid %u\n", ep, ep->hwtid);

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

	event.event = IW_CM_EVENT_CONNECT_REQUEST;

	memcpy(&event.local_addr, &ep->com.local_addr,
@@ -1359,13 +1359,13 @@ static void established_upcall(struct c4iw_ep *ep) 
{

	struct iw_cm_event event;



	pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	pr_debug("ep %p tid %u\n", ep, ep->hwtid);

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

	event.event = IW_CM_EVENT_ESTABLISHED;

	event.ird = ep->ord;

	event.ord = ep->ird;

	if (ep->com.cm_id) {

		pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

		pr_debug("ep %p tid %u\n", ep, ep->hwtid);

		ep->com.cm_id->event_handler(ep->com.cm_id, &event);

		set_bit(ESTAB_UPCALL, &ep->com.history);

	}
@@ -1377,8 +1377,8 @@ static int update_rx_credits(struct c4iw_ep *ep, u32 credits) 
	u32 wrlen = roundup(sizeof(struct cpl_rx_data_ack), 16);

	u32 credit_dack;



	pr_debug("%s ep %p tid %u credits %u\n",

		 __func__, ep, ep->hwtid, credits);

	pr_debug("ep %p tid %u credits %u\n",

		 ep, ep->hwtid, credits);

	skb = get_skb(NULL, wrlen, GFP_KERNEL);

	if (!skb) {

		pr_err("update_rx_credits - cannot alloc skb!\n");
@@ -1429,7 +1429,7 @@ static int process_mpa_reply(struct c4iw_ep *ep, struct sk_buff *skb) 
	int err;

	int disconnect = 0;



	pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	pr_debug("ep %p tid %u\n", ep, ep->hwtid);



	/*

	 * If we get more than the supported amount of private data
@@ -1527,8 +1527,7 @@ static int process_mpa_reply(struct c4iw_ep *ep, struct sk_buff *skb) 
				MPA_V2_IRD_ORD_MASK;

			resp_ord = ntohs(mpa_v2_params->ord) &

				MPA_V2_IRD_ORD_MASK;

			pr_debug("%s responder ird %u ord %u ep ird %u ord %u\n",

				 __func__,

			pr_debug("responder ird %u ord %u ep ird %u ord %u\n",

				 resp_ird, resp_ord, ep->ird, ep->ord);



			/*
@@ -1573,8 +1572,8 @@ static int process_mpa_reply(struct c4iw_ep *ep, struct sk_buff *skb) 
		if (peer2peer)

			ep->mpa_attr.p2p_type = p2p_type;



	pr_debug("%s - crc_enabled=%d, recv_marker_enabled=%d, xmit_marker_enabled=%d, version=%d p2p_type=%d local-p2p_type = %d\n",

		 __func__, ep->mpa_attr.crc_enabled,

	pr_debug("crc_enabled=%d, recv_marker_enabled=%d, xmit_marker_enabled=%d, version=%d p2p_type=%d local-p2p_type = %d\n",

		 ep->mpa_attr.crc_enabled,

		 ep->mpa_attr.recv_marker_enabled,

		 ep->mpa_attr.xmit_marker_enabled, ep->mpa_attr.version,

		 ep->mpa_attr.p2p_type, p2p_type);
@@ -1670,7 +1669,7 @@ static int process_mpa_request(struct c4iw_ep *ep, struct sk_buff *skb) 
	struct mpa_v2_conn_params *mpa_v2_params;

	u16 plen;



	pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	pr_debug("ep %p tid %u\n", ep, ep->hwtid);



	/*

	 * If we get more than the supported amount of private data
@@ -1679,7 +1678,7 @@ static int process_mpa_request(struct c4iw_ep *ep, struct sk_buff *skb) 
	if (ep->mpa_pkt_len + skb->len > sizeof(ep->mpa_pkt))

		goto err_stop_timer;



	pr_debug("%s enter (%s line %u)\n", __func__, __FILE__, __LINE__);

	pr_debug("enter (%s line %u)\n", __FILE__, __LINE__);



	/*

	 * Copy the new data into our accumulation buffer.
@@ -1695,7 +1694,7 @@ static int process_mpa_request(struct c4iw_ep *ep, struct sk_buff *skb) 
	if (ep->mpa_pkt_len < sizeof(*mpa))

		return 0;



	pr_debug("%s enter (%s line %u)\n", __func__, __FILE__, __LINE__);

	pr_debug("enter (%s line %u)\n", __FILE__, __LINE__);

	mpa = (struct mpa_message *) ep->mpa_pkt;



	/*
@@ -1758,8 +1757,8 @@ static int process_mpa_request(struct c4iw_ep *ep, struct sk_buff *skb) 
				MPA_V2_IRD_ORD_MASK;

			ep->ord = min_t(u32, ep->ord,

					cur_max_read_depth(ep->com.dev));

			pr_debug("%s initiator ird %u ord %u\n",

				 __func__, ep->ird, ep->ord);

			pr_debug("initiator ird %u ord %u\n",

				 ep->ird, ep->ord);

			if (ntohs(mpa_v2_params->ird) & MPA_V2_PEER2PEER_MODEL)

				if (peer2peer) {

					if (ntohs(mpa_v2_params->ord) &
@@ -1776,8 +1775,7 @@ static int process_mpa_request(struct c4iw_ep *ep, struct sk_buff *skb) 
		if (peer2peer)

			ep->mpa_attr.p2p_type = p2p_type;



	pr_debug("%s - crc_enabled=%d, recv_marker_enabled=%d, xmit_marker_enabled=%d, version=%d p2p_type=%d\n",

		 __func__,

	pr_debug("crc_enabled=%d, recv_marker_enabled=%d, xmit_marker_enabled=%d, version=%d p2p_type=%d\n",

		 ep->mpa_attr.crc_enabled, ep->mpa_attr.recv_marker_enabled,

		 ep->mpa_attr.xmit_marker_enabled, ep->mpa_attr.version,

		 ep->mpa_attr.p2p_type);
@@ -1816,7 +1814,7 @@ static int rx_data(struct c4iw_dev *dev, struct sk_buff *skb) 
	ep = get_ep_from_tid(dev, tid);

	if (!ep)

		return 0;

	pr_debug("%s ep %p tid %u dlen %u\n", __func__, ep, ep->hwtid, dlen);

	pr_debug("ep %p tid %u dlen %u\n", ep, ep->hwtid, dlen);

	skb_pull(skb, sizeof(*hdr));

	skb_trim(skb, dlen);

	mutex_lock(&ep->com.mutex);
@@ -1870,7 +1868,7 @@ static int abort_rpl(struct c4iw_dev *dev, struct sk_buff *skb) 
		pr_warn("Abort rpl to freed endpoint\n");

		return 0;

	}

	pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	pr_debug("ep %p tid %u\n", ep, ep->hwtid);

	mutex_lock(&ep->com.mutex);

	switch (ep->com.state) {

	case ABORTING:
@@ -1994,8 +1992,8 @@ static void set_tcp_window(struct c4iw_ep *ep, struct port_info *pi) 
{

	ep->snd_win = snd_win;

	ep->rcv_win = rcv_win;

	pr_debug("%s snd_win %d rcv_win %d\n",

		 __func__, ep->snd_win, ep->rcv_win);

	pr_debug("snd_win %d rcv_win %d\n",

		 ep->snd_win, ep->rcv_win);

}



#define ACT_OPEN_RETRY_COUNT 2
@@ -2100,7 +2098,7 @@ static int c4iw_reconnect(struct c4iw_ep *ep) 
	int iptype;

	__u8 *ra;



	pr_debug("%s qp %p cm_id %p\n", __func__, ep->com.qp, ep->com.cm_id);

	pr_debug("qp %p cm_id %p\n", ep->com.qp, ep->com.cm_id);

	init_timer(&ep->timer);

	c4iw_init_wr_wait(&ep->com.wr_wait);
@@ -2163,8 +2161,8 @@ static int c4iw_reconnect(struct c4iw_ep *ep) 
		goto fail4;

	}



	pr_debug("%s txq_idx %u tx_chan %u smac_idx %u rss_qid %u l2t_idx %u\n",

		 __func__, ep->txq_idx, ep->tx_chan, ep->smac_idx, ep->rss_qid,

	pr_debug("txq_idx %u tx_chan %u smac_idx %u rss_qid %u l2t_idx %u\n",

		 ep->txq_idx, ep->tx_chan, ep->smac_idx, ep->rss_qid,

		 ep->l2t->idx);



	state_set(&ep->com, CONNECTING);
@@ -2215,12 +2213,12 @@ static int act_open_rpl(struct c4iw_dev *dev, struct sk_buff *skb) 
	la6 = (struct sockaddr_in6 *)&ep->com.local_addr;

	ra6 = (struct sockaddr_in6 *)&ep->com.remote_addr;



	pr_debug("%s ep %p atid %u status %u errno %d\n", __func__, ep, atid,

	pr_debug("ep %p atid %u status %u errno %d\n", ep, atid,

		 status, status2errno(status));



	if (cxgb_is_neg_adv(status)) {

		pr_debug("%s Connection problems for atid %u status %u (%s)\n",

			 __func__, atid, status, neg_adv_str(status));

		pr_debug("Connection problems for atid %u status %u (%s)\n",

			 atid, status, neg_adv_str(status));

		ep->stats.connect_neg_adv++;

		mutex_lock(&dev->rdev.stats.lock);

		dev->rdev.stats.neg_adv++;
@@ -2319,7 +2317,7 @@ static int pass_open_rpl(struct c4iw_dev *dev, struct sk_buff *skb) 
		pr_debug("%s stid %d lookup failure!\n", __func__, stid);

		goto out;

	}

	pr_debug("%s ep %p status %d error %d\n", __func__, ep,

	pr_debug("ep %p status %d error %d\n", ep,

		 rpl->status, status2errno(rpl->status));

	c4iw_wake_up(&ep->com.wr_wait, status2errno(rpl->status));

	c4iw_put_ep(&ep->com);
@@ -2337,7 +2335,7 @@ static int close_listsrv_rpl(struct c4iw_dev *dev, struct sk_buff *skb) 
		pr_debug("%s stid %d lookup failure!\n", __func__, stid);

		goto out;

	}

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

	pr_debug("ep %p\n", ep);

	c4iw_wake_up(&ep->com.wr_wait, status2errno(rpl->status));

	c4iw_put_ep(&ep->com);

out:
@@ -2356,7 +2354,7 @@ static int accept_cr(struct c4iw_ep *ep, struct sk_buff *skb, 
	int win;

	enum chip_type adapter_type = ep->com.dev->rdev.lldi.adapter_type;



	pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	pr_debug("ep %p tid %u\n", ep, ep->hwtid);

	BUG_ON(skb_cloned(skb));



	skb_get(skb);
@@ -2427,7 +2425,7 @@ static int accept_cr(struct c4iw_ep *ep, struct sk_buff *skb, 
		if (peer2peer)

			isn += 4;

		rpl5->iss = cpu_to_be32(isn);

		pr_debug("%s iss %u\n", __func__, be32_to_cpu(rpl5->iss));

		pr_debug("iss %u\n", be32_to_cpu(rpl5->iss));

	}



	rpl->opt0 = cpu_to_be64(opt0);
@@ -2440,7 +2438,7 @@ static int accept_cr(struct c4iw_ep *ep, struct sk_buff *skb, 


static void reject_cr(struct c4iw_dev *dev, u32 hwtid, struct sk_buff *skb)

{

	pr_debug("%s c4iw_dev %p tid %u\n", __func__, dev, hwtid);

	pr_debug("c4iw_dev %p tid %u\n", dev, hwtid);

	BUG_ON(skb_cloned(skb));

	skb_trim(skb, sizeof(struct cpl_tid_release));

	release_tid(&dev->rdev, hwtid, skb);
@@ -2481,16 +2479,16 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb) 


	/* Find output route */

	if (iptype == 4)  {

		pr_debug("%s parent ep %p hwtid %u laddr %pI4 raddr %pI4 lport %d rport %d peer_mss %d\n"

			 , __func__, parent_ep, hwtid,

		pr_debug("parent ep %p hwtid %u laddr %pI4 raddr %pI4 lport %d rport %d peer_mss %d\n"

			 , parent_ep, hwtid,

			 local_ip, peer_ip, ntohs(local_port),

			 ntohs(peer_port), peer_mss);

		dst = cxgb_find_route(&dev->rdev.lldi, get_real_dev,

				      *(__be32 *)local_ip, *(__be32 *)peer_ip,

				      local_port, peer_port, tos);

	} else {

		pr_debug("%s parent ep %p hwtid %u laddr %pI6 raddr %pI6 lport %d rport %d peer_mss %d\n"

			 , __func__, parent_ep, hwtid,

		pr_debug("parent ep %p hwtid %u laddr %pI6 raddr %pI6 lport %d rport %d peer_mss %d\n"

			 , parent_ep, hwtid,

			 local_ip, peer_ip, ntohs(local_port),

			 ntohs(peer_port), peer_mss);

		dst = cxgb_find_route6(&dev->rdev.lldi, get_real_dev,
@@ -2576,7 +2574,7 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb) 
	child_ep->dst = dst;

	child_ep->hwtid = hwtid;



	pr_debug("%s tx_chan %u smac_idx %u rss_qid %u\n", __func__,

	pr_debug("tx_chan %u smac_idx %u rss_qid %u\n",

		 child_ep->tx_chan, child_ep->smac_idx, child_ep->rss_qid);



	init_timer(&child_ep->timer);
@@ -2613,11 +2611,11 @@ static int pass_establish(struct c4iw_dev *dev, struct sk_buff *skb) 
	int ret;



	ep = get_ep_from_tid(dev, tid);

	pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	pr_debug("ep %p tid %u\n", ep, ep->hwtid);

	ep->snd_seq = be32_to_cpu(req->snd_isn);

	ep->rcv_seq = be32_to_cpu(req->rcv_isn);



	pr_debug("%s ep %p hwtid %u tcp_opt 0x%02x\n", __func__, ep, tid,

	pr_debug("ep %p hwtid %u tcp_opt 0x%02x\n", ep, tid,

		 ntohs(req->tcp_opt));



	set_emss(ep, ntohs(req->tcp_opt));
@@ -2650,7 +2648,7 @@ static int peer_close(struct c4iw_dev *dev, struct sk_buff *skb) 
	if (!ep)

		return 0;



	pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	pr_debug("ep %p tid %u\n", ep, ep->hwtid);

	dst_confirm(ep->dst);



	set_bit(PEER_CLOSE, &ep->com.history);
@@ -2750,7 +2748,7 @@ static int peer_abort(struct c4iw_dev *dev, struct sk_buff *skb) 
		mutex_unlock(&dev->rdev.stats.lock);

		goto deref_ep;

	}

	pr_debug("%s ep %p tid %u state %u\n", __func__, ep, ep->hwtid,

	pr_debug("ep %p tid %u state %u\n", ep, ep->hwtid,

		 ep->com.state);

	set_bit(PEER_ABORT, &ep->com.history);
@@ -2875,7 +2873,7 @@ static int close_con_rpl(struct c4iw_dev *dev, struct sk_buff *skb) 
	if (!ep)

		return 0;



	pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	pr_debug("ep %p tid %u\n", ep, ep->hwtid);



	/* The cm_id may be null if we failed to connect */

	mutex_lock(&ep->com.mutex);
@@ -2950,19 +2948,19 @@ static int fw4_ack(struct c4iw_dev *dev, struct sk_buff *skb) 
	ep = get_ep_from_tid(dev, tid);

	if (!ep)

		return 0;

	pr_debug("%s ep %p tid %u credits %u\n",

		 __func__, ep, ep->hwtid, credits);

	pr_debug("ep %p tid %u credits %u\n",

		 ep, ep->hwtid, credits);

	if (credits == 0) {

		pr_debug("%s 0 credit ack ep %p tid %u state %u\n",

			 __func__, ep, ep->hwtid, state_read(&ep->com));

		pr_debug("0 credit ack ep %p tid %u state %u\n",

			 ep, ep->hwtid, state_read(&ep->com));

		goto out;

	}



	dst_confirm(ep->dst);

	if (ep->mpa_skb) {

		pr_debug("%s last streaming msg ack ep %p tid %u state %u initiator %u freeing skb\n",

			 __func__, ep, ep->hwtid,

			 state_read(&ep->com), ep->mpa_attr.initiator ? 1 : 0);

		pr_debug("last streaming msg ack ep %p tid %u state %u initiator %u freeing skb\n",

			 ep, ep->hwtid, state_read(&ep->com),

			 ep->mpa_attr.initiator ? 1 : 0);

		mutex_lock(&ep->com.mutex);

		kfree_skb(ep->mpa_skb);

		ep->mpa_skb = NULL;
@@ -2980,7 +2978,7 @@ int c4iw_reject_cr(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len) 
	int abort;

	struct c4iw_ep *ep = to_ep(cm_id);



	pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	pr_debug("ep %p tid %u\n", ep, ep->hwtid);



	mutex_lock(&ep->com.mutex);

	if (ep->com.state != MPA_REQ_RCVD) {
@@ -3011,7 +3009,7 @@ int c4iw_accept_cr(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
	struct c4iw_qp *qp = get_qhp(h, conn_param->qpn);

	int abort = 0;



	pr_debug("%s ep %p tid %u\n", __func__, ep, ep->hwtid);

	pr_debug("ep %p tid %u\n", ep, ep->hwtid);



	mutex_lock(&ep->com.mutex);

	if (ep->com.state != MPA_REQ_RCVD) {
@@ -3064,7 +3062,7 @@ int c4iw_accept_cr(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
			ep->ird = 1;

	}



	pr_debug("%s %d ird %d ord %d\n", __func__, __LINE__, ep->ird, ep->ord);

	pr_debug("ird %d ord %d\n", ep->ird, ep->ord);



	ep->com.cm_id = cm_id;

	ref_cm_id(&ep->com);
@@ -3225,7 +3223,7 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
		goto fail2;

	}

	ref_qp(ep);

	pr_debug("%s qpn 0x%x qp %p cm_id %p\n", __func__, conn_param->qpn,

	pr_debug("qpn 0x%x qp %p cm_id %p\n", conn_param->qpn,

		 ep->com.qp, cm_id);



	/*
@@ -3263,8 +3261,8 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
		}



		/* find a route */

		pr_debug("%s saddr %pI4 sport 0x%x raddr %pI4 rport 0x%x\n",

			 __func__, &laddr->sin_addr, ntohs(laddr->sin_port),

		pr_debug("saddr %pI4 sport 0x%x raddr %pI4 rport 0x%x\n",

			 &laddr->sin_addr, ntohs(laddr->sin_port),

			 ra, ntohs(raddr->sin_port));

		ep->dst = cxgb_find_route(&dev->rdev.lldi, get_real_dev,

					  laddr->sin_addr.s_addr,
@@ -3285,8 +3283,8 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
		}



		/* find a route */

		pr_debug("%s saddr %pI6 sport 0x%x raddr %pI6 rport 0x%x\n",

			 __func__, laddr6->sin6_addr.s6_addr,

		pr_debug("saddr %pI6 sport 0x%x raddr %pI6 rport 0x%x\n",

			 laddr6->sin6_addr.s6_addr,

			 ntohs(laddr6->sin6_port),

			 raddr6->sin6_addr.s6_addr, ntohs(raddr6->sin6_port));

		ep->dst = cxgb_find_route6(&dev->rdev.lldi, get_real_dev,
@@ -3309,8 +3307,8 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
		goto fail4;

	}



	pr_debug("%s txq_idx %u tx_chan %u smac_idx %u rss_qid %u l2t_idx %u\n",

		 __func__, ep->txq_idx, ep->tx_chan, ep->smac_idx, ep->rss_qid,

	pr_debug("txq_idx %u tx_chan %u smac_idx %u rss_qid %u l2t_idx %u\n",

		 ep->txq_idx, ep->tx_chan, ep->smac_idx, ep->rss_qid,

		 ep->l2t->idx);



	state_set(&ep->com, CONNECTING);
@@ -3424,7 +3422,7 @@ int c4iw_create_listen(struct iw_cm_id *cm_id, int backlog) 
		goto fail1;

	}

	skb_queue_head_init(&ep->com.ep_skb_list);

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

	pr_debug("ep %p\n", ep);

	ep->com.cm_id = cm_id;

	ref_cm_id(&ep->com);

	ep->com.dev = dev;
@@ -3478,7 +3476,7 @@ int c4iw_destroy_listen(struct iw_cm_id *cm_id) 
	int err;

	struct c4iw_listen_ep *ep = to_listen_ep(cm_id);



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

	pr_debug("ep %p\n", ep);



	might_sleep();

	state_set(&ep->com, DEAD);
@@ -3519,7 +3517,7 @@ int c4iw_ep_disconnect(struct c4iw_ep *ep, int abrupt, gfp_t gfp) 


	mutex_lock(&ep->com.mutex);



	pr_debug("%s ep %p state %s, abrupt %d\n", __func__, ep,

	pr_debug("ep %p state %s, abrupt %d\n", ep,

		 states[ep->com.state], abrupt);



	/*
@@ -3933,7 +3931,7 @@ static int rx_pkt(struct c4iw_dev *dev, struct sk_buff *skb) 
	skb_set_transport_header(skb, (void *)tcph - (void *)rss);

	skb_get(skb);



	pr_debug("%s lip 0x%x lport %u pip 0x%x pport %u tos %d\n", __func__,

	pr_debug("lip 0x%x lport %u pip 0x%x pport %u tos %d\n",

		 ntohl(iph->daddr), ntohs(tcph->dest), ntohl(iph->saddr),

		 ntohs(tcph->source), iph->tos);
@@ -3941,15 +3939,13 @@ static int rx_pkt(struct c4iw_dev *dev, struct sk_buff *skb) 
			      iph->daddr, iph->saddr, tcph->dest,

			      tcph->source, iph->tos);

	if (!dst) {

		pr_err("%s - failed to find dst entry!\n",

		       __func__);

		pr_err("%s - failed to find dst entry!\n", __func__);

		goto reject;

	}

	neigh = dst_neigh_lookup_skb(dst, skb);



	if (!neigh) {

		pr_err("%s - failed to allocate neigh!\n",

		       __func__);

		pr_err("%s - failed to allocate neigh!\n", __func__);

		goto free_dst;

	}
@@ -4032,8 +4028,7 @@ static void process_timeout(struct c4iw_ep *ep) 
	int abort = 1;



	mutex_lock(&ep->com.mutex);

	pr_debug("%s ep %p tid %u state %d\n", __func__, ep, ep->hwtid,

		 ep->com.state);

	pr_debug("ep %p tid %u state %d\n", ep, ep->hwtid, ep->com.state);

	set_bit(TIMEDOUT, &ep->com.history);

	switch (ep->com.state) {

	case MPA_REQ_SENT:
@@ -4176,13 +4171,13 @@ static int fw6_msg(struct c4iw_dev *dev, struct sk_buff *skb) 
	struct c4iw_wr_wait *wr_waitp;

	int ret;



	pr_debug("%s type %u\n", __func__, rpl->type);

	pr_debug("type %u\n", rpl->type);



	switch (rpl->type) {

	case FW6_TYPE_WR_RPL:

		ret = (int)((be64_to_cpu(rpl->data[0]) >> 8) & 0xff);

		wr_waitp = (struct c4iw_wr_wait *)(__force unsigned long) rpl->data[1];

		pr_debug("%s wr_waitp %p ret %u\n", __func__, wr_waitp, ret);

		pr_debug("wr_waitp %p ret %u\n", wr_waitp, ret);

		if (wr_waitp)

			c4iw_wake_up(wr_waitp, ret ? -ret : 0);

		kfree_skb(skb);
@@ -4219,8 +4214,7 @@ static int peer_abort_intr(struct c4iw_dev *dev, struct sk_buff *skb) 
			 neg_adv_str(req->status));

		goto out;

	}

	pr_debug("%s ep %p tid %u state %u\n", __func__, ep, ep->hwtid,

		 ep->com.state);

	pr_debug("ep %p tid %u state %u\n", ep, ep->hwtid, ep->com.state);



	c4iw_wake_up(&ep->com.wr_wait, -ECONNRESET);

out:

drivers/infiniband/hw/cxgb4/cq.c

+25 −25

File changed.

Preview size limit exceeded, changes collapsed.

drivers/infiniband/hw/cxgb4/device.c

+8 −8
Original line number Diff line number Diff line
@@ -811,8 +811,8 @@ static int c4iw_rdev_open(struct c4iw_rdev *rdev) 


	rdev->qpmask = rdev->lldi.udb_density - 1;

	rdev->cqmask = rdev->lldi.ucq_density - 1;

	pr_debug("%s dev %s stag start 0x%0x size 0x%0x num stags %d pbl start 0x%0x size 0x%0x rq start 0x%0x size 0x%0x qp qid start %u size %u cq qid start %u size %u\n",

		 __func__, pci_name(rdev->lldi.pdev), rdev->lldi.vr->stag.start,

	pr_debug("dev %s stag start 0x%0x size 0x%0x num stags %d pbl start 0x%0x size 0x%0x rq start 0x%0x size 0x%0x qp qid start %u size %u cq qid start %u size %u\n",

		 pci_name(rdev->lldi.pdev), rdev->lldi.vr->stag.start,

		 rdev->lldi.vr->stag.size, c4iw_num_stags(rdev),

		 rdev->lldi.vr->pbl.start,

		 rdev->lldi.vr->pbl.size, rdev->lldi.vr->rq.start,
@@ -935,7 +935,7 @@ static void c4iw_dealloc(struct uld_ctx *ctx) 


static void c4iw_remove(struct uld_ctx *ctx)

{

	pr_debug("%s c4iw_dev %p\n", __func__,  ctx->dev);

	pr_debug("c4iw_dev %p\n", ctx->dev);

	c4iw_unregister_device(ctx->dev);

	c4iw_dealloc(ctx);

}
@@ -969,8 +969,8 @@ static struct c4iw_dev *c4iw_alloc(const struct cxgb4_lld_info *infop) 
	devp->rdev.lldi = *infop;



	/* init various hw-queue params based on lld info */

	pr_debug("%s: Ing. padding boundary is %d, egrsstatuspagesize = %d\n",

		 __func__, devp->rdev.lldi.sge_ingpadboundary,

	pr_debug("Ing. padding boundary is %d, egrsstatuspagesize = %d\n",

		 devp->rdev.lldi.sge_ingpadboundary,

		 devp->rdev.lldi.sge_egrstatuspagesize);



	devp->rdev.hw_queue.t4_eq_status_entries =
@@ -1069,8 +1069,8 @@ static void *c4iw_uld_add(const struct cxgb4_lld_info *infop) 
	}

	ctx->lldi = *infop;



	pr_debug("%s found device %s nchan %u nrxq %u ntxq %u nports %u\n",

		 __func__, pci_name(ctx->lldi.pdev),

	pr_debug("found device %s nchan %u nrxq %u ntxq %u nports %u\n",

		 pci_name(ctx->lldi.pdev),

		 ctx->lldi.nchan, ctx->lldi.nrxq,

		 ctx->lldi.ntxq, ctx->lldi.nports);
@@ -1203,7 +1203,7 @@ static int c4iw_uld_state_change(void *handle, enum cxgb4_state new_state) 
{

	struct uld_ctx *ctx = handle;



	pr_debug("%s new_state %u\n", __func__, new_state);

	pr_debug("new_state %u\n", new_state);

	switch (new_state) {

	case CXGB4_STATE_UP:

		pr_info("%s: Up\n", pci_name(ctx->lldi.pdev));

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

+5 −8
Original line number Diff line number Diff line
@@ -537,8 +537,7 @@ static inline struct c4iw_mm_entry *remove_mmap(struct c4iw_ucontext *ucontext, 
		if (mm->key == key && mm->len == len) {

			list_del_init(&mm->entry);

			spin_unlock(&ucontext->mmap_lock);

			pr_debug("%s key 0x%x addr 0x%llx len %d\n",

				 __func__, key,

			pr_debug("key 0x%x addr 0x%llx len %d\n", key,

				 (unsigned long long)mm->addr, mm->len);

			return mm;

		}
@@ -551,8 +550,8 @@ static inline void insert_mmap(struct c4iw_ucontext *ucontext, 
			       struct c4iw_mm_entry *mm)

{

	spin_lock(&ucontext->mmap_lock);

	pr_debug("%s key 0x%x addr 0x%llx len %d\n",

		 __func__, mm->key, (unsigned long long)mm->addr, mm->len);

	pr_debug("key 0x%x addr 0x%llx len %d\n",

		 mm->key, (unsigned long long)mm->addr, mm->len);

	list_add_tail(&mm->entry, &ucontext->mmaps);

	spin_unlock(&ucontext->mmap_lock);

}
@@ -671,16 +670,14 @@ enum c4iw_mmid_state { 
#define MPA_V2_IRD_ORD_MASK             0x3FFF



#define c4iw_put_ep(ep) {						\

	pr_debug("put_ep (via %s:%u) ep %p refcnt %d\n",		\

		 __func__, __LINE__,					\

	pr_debug("put_ep ep %p refcnt %d\n",		\

		 ep, kref_read(&((ep)->kref)));				\

	WARN_ON(kref_read(&((ep)->kref)) < 1);				\

	kref_put(&((ep)->kref), _c4iw_free_ep);				\

}



#define c4iw_get_ep(ep) {						\

	pr_debug("get_ep (via %s:%u) ep %p, refcnt %d\n",		\

		 __func__, __LINE__,					\

	pr_debug("get_ep ep %p, refcnt %d\n",		\

		 ep, kref_read(&((ep)->kref)));				\

	kref_get(&((ep)->kref));					\

}

drivers/infiniband/hw/cxgb4/mem.c

+13 −13
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int _c4iw_write_mem_inline(struct c4iw_rdev *rdev, u32 addr, u32 len, 
		cmd |= cpu_to_be32(T5_ULP_MEMIO_IMM_F);



	addr &= 0x7FFFFFF;

	pr_debug("%s addr 0x%x len %u\n", __func__, addr, len);

	pr_debug("addr 0x%x len %u\n", addr, len);

	num_wqe = DIV_ROUND_UP(len, C4IW_MAX_INLINE_SIZE);

	c4iw_init_wr_wait(&wr_wait);

	for (i = 0; i < num_wqe; i++) {
@@ -285,8 +285,8 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry, 
		mutex_unlock(&rdev->stats.lock);

		*stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);

	}

	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);

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

		 stag_state, type, pdid, stag_idx);



	/* write TPT entry */

	if (reset_tpt_entry)
@@ -327,8 +327,8 @@ static int write_pbl(struct c4iw_rdev *rdev, __be64 *pbl, 
{

	int err;



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

		 __func__, pbl_addr, rdev->lldi.vr->pbl.start,

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

		 pbl_addr, rdev->lldi.vr->pbl.start,

		 pbl_size);



	err = write_adapter_mem(rdev, pbl_addr >> 5, pbl_size << 3, pbl, NULL);
@@ -372,7 +372,7 @@ static int finish_mem_reg(struct c4iw_mr *mhp, u32 stag) 
	mhp->attr.stag = stag;

	mmid = stag >> 8;

	mhp->ibmr.rkey = mhp->ibmr.lkey = stag;

	pr_debug("%s mmid 0x%x mhp %p\n", __func__, mmid, mhp);

	pr_debug("mmid 0x%x mhp %p\n", mmid, mhp);

	return insert_handle(mhp->rhp, &mhp->rhp->mmidr, mhp, mmid);

}
@@ -422,7 +422,7 @@ struct ib_mr *c4iw_get_dma_mr(struct ib_pd *pd, int acc) 
	int ret;

	u32 stag = T4_STAG_UNSET;



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

	pr_debug("ib_pd %p\n", pd);

	php = to_c4iw_pd(pd);

	rhp = php->rhp;
@@ -479,7 +479,7 @@ struct ib_mr *c4iw_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 
	struct c4iw_pd *php;

	struct c4iw_mr *mhp;



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

	pr_debug("ib_pd %p\n", pd);



	if (length == ~0ULL)

		return ERR_PTR(-EINVAL);
@@ -616,7 +616,7 @@ struct ib_mw *c4iw_alloc_mw(struct ib_pd *pd, enum ib_mw_type type, 
		ret = -ENOMEM;

		goto dealloc_win;

	}

	pr_debug("%s mmid 0x%x mhp %p stag 0x%x\n", __func__, mmid, mhp, stag);

	pr_debug("mmid 0x%x mhp %p stag 0x%x\n", mmid, mhp, stag);

	return &(mhp->ibmw);



dealloc_win:
@@ -641,7 +641,7 @@ int c4iw_dealloc_mw(struct ib_mw *mw) 
	deallocate_window(&rhp->rdev, mhp->attr.stag, mhp->dereg_skb);

	kfree_skb(mhp->dereg_skb);

	kfree(mhp);

	pr_debug("%s ib_mw %p mmid 0x%x ptr %p\n", __func__, mw, mmid, mhp);

	pr_debug("ib_mw %p mmid 0x%x ptr %p\n", mw, mmid, mhp);

	return 0;

}
@@ -699,7 +699,7 @@ struct ib_mr *c4iw_alloc_mr(struct ib_pd *pd, 
		goto err3;

	}



	pr_debug("%s mmid 0x%x mhp %p stag 0x%x\n", __func__, mmid, mhp, stag);

	pr_debug("mmid 0x%x mhp %p stag 0x%x\n", mmid, mhp, stag);

	return &(mhp->ibmr);

err3:

	dereg_mem(&rhp->rdev, stag, mhp->attr.pbl_size,
@@ -744,7 +744,7 @@ int c4iw_dereg_mr(struct ib_mr *ib_mr) 
	struct c4iw_mr *mhp;

	u32 mmid;



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

	pr_debug("ib_mr %p\n", ib_mr);



	mhp = to_c4iw_mr(ib_mr);

	rhp = mhp->rhp;
@@ -762,7 +762,7 @@ int c4iw_dereg_mr(struct ib_mr *ib_mr) 
		kfree((void *) (unsigned long) mhp->kva);

	if (mhp->umem)

		ib_umem_release(mhp->umem);

	pr_debug("%s mmid 0x%x ptr %p\n", __func__, mmid, mhp);

	pr_debug("mmid 0x%x ptr %p\n", mmid, mhp);

	kfree(mhp);

	return 0;

}