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

Commit bdc590b9 authored by Hariprasad Shenai's avatar Hariprasad Shenai Committed by David S. Miller
Browse files

iw_cxgb4/cxgb4/cxgb4vf/cxgb4i/csiostor: Cleanup register defines/macros... 


iw_cxgb4/cxgb4/cxgb4vf/cxgb4i/csiostor: Cleanup register defines/macros related to all other cpl messages

This patch cleanups all other macros/register define related to
CPL messages that are defined in t4_msg.h and the affected files

Signed-off-by: default avatarAnish Bhatt <anish@chelsio.com>
Signed-off-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6c53e938

drivers/infiniband/hw/cxgb4/cm.c

+10 −10
Original line number Diff line number Diff line
@@ -3501,19 +3501,19 @@ static void build_cpl_pass_accept_req(struct sk_buff *skb, int stid , u8 tos) 
	req = (struct cpl_pass_accept_req *)__skb_push(skb, sizeof(*req));

	memset(req, 0, sizeof(*req));

	req->l2info = cpu_to_be16(V_SYN_INTF(intf) |

			 V_SYN_MAC_IDX(G_RX_MACIDX(

			 V_SYN_MAC_IDX(RX_MACIDX_G(

			 (__force int) htonl(l2info))) |

			 F_SYN_XACT_MATCH);

	eth_hdr_len = is_t4(dev->rdev.lldi.adapter_type) ?

			    G_RX_ETHHDR_LEN((__force int) htonl(l2info)) :

			    G_RX_T5_ETHHDR_LEN((__force int) htonl(l2info));

	req->hdr_len = cpu_to_be32(V_SYN_RX_CHAN(G_RX_CHAN(

			    RX_ETHHDR_LEN_G((__force int)htonl(l2info)) :

			    RX_T5_ETHHDR_LEN_G((__force int)htonl(l2info));

	req->hdr_len = cpu_to_be32(V_SYN_RX_CHAN(RX_CHAN_G(

					(__force int) htonl(l2info))) |

				   V_TCP_HDR_LEN(G_RX_TCPHDR_LEN(

				   V_TCP_HDR_LEN(RX_TCPHDR_LEN_G(

					(__force int) htons(hdr_len))) |

				   V_IP_HDR_LEN(G_RX_IPHDR_LEN(

				   V_IP_HDR_LEN(RX_IPHDR_LEN_G(

					(__force int) htons(hdr_len))) |

				   V_ETH_HDR_LEN(G_RX_ETHHDR_LEN(eth_hdr_len)));

				   V_ETH_HDR_LEN(RX_ETHHDR_LEN_G(eth_hdr_len)));

	req->vlan = (__force __be16) vlantag;

	req->len = (__force __be16) len;

	req->tos_stid = cpu_to_be32(PASS_OPEN_TID_V(stid) |
@@ -3613,7 +3613,7 @@ static int rx_pkt(struct c4iw_dev *dev, struct sk_buff *skb) 
	struct neighbour *neigh;



	/* Drop all non-SYN packets */

	if (!(cpl->l2info & cpu_to_be32(F_RXF_SYN)))

	if (!(cpl->l2info & cpu_to_be32(RXF_SYN_F)))

		goto reject;



	/*
@@ -3635,8 +3635,8 @@ static int rx_pkt(struct c4iw_dev *dev, struct sk_buff *skb) 
	}



	eth_hdr_len = is_t4(dev->rdev.lldi.adapter_type) ?

			    G_RX_ETHHDR_LEN(htonl(cpl->l2info)) :

			    G_RX_T5_ETHHDR_LEN(htonl(cpl->l2info));

			    RX_ETHHDR_LEN_G(htonl(cpl->l2info)) :

			    RX_T5_ETHHDR_LEN_G(htonl(cpl->l2info));

	if (eth_hdr_len == ETH_HLEN) {

		eh = (struct ethhdr *)(req + 1);

		iph = (struct iphdr *)(eh + 1);

drivers/infiniband/hw/cxgb4/mem.c

+2 −2
Original line number Diff line number Diff line
@@ -86,14 +86,14 @@ static int _c4iw_write_mem_dma_aligned(struct c4iw_rdev *rdev, u32 addr, 
	req->wr.wr_lo = wait ? (__force __be64)(unsigned long) &wr_wait : 0L;

	req->wr.wr_mid = cpu_to_be32(FW_WR_LEN16_V(DIV_ROUND_UP(wr_len, 16)));

	req->cmd = cpu_to_be32(ULPTX_CMD_V(ULP_TX_MEM_WRITE));

	req->cmd |= cpu_to_be32(V_T5_ULP_MEMIO_ORDER(1));

	req->cmd |= cpu_to_be32(T5_ULP_MEMIO_ORDER_V(1));

	req->dlen = cpu_to_be32(ULP_MEMIO_DATA_LEN_V(len>>5));

	req->len16 = cpu_to_be32(DIV_ROUND_UP(wr_len-sizeof(req->wr), 16));

	req->lock_addr = cpu_to_be32(ULP_MEMIO_ADDR_V(addr));



	sgl = (struct ulptx_sgl *)(req + 1);

	sgl->cmd_nsge = cpu_to_be32(ULPTX_CMD_V(ULP_TX_SC_DSGL) |

				    ULPTX_NSGE(1));

				    ULPTX_NSGE_V(1));

	sgl->len0 = cpu_to_be32(len);

	sgl->addr0 = cpu_to_be64(data);

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+4 −4
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ static void filter_rpl(struct adapter *adap, const struct cpl_set_tcb_rpl *rpl) 
	if (idx >= adap->tids.ftid_base && nidx <

	   (adap->tids.nftids + adap->tids.nsftids)) {

		idx = nidx;

		ret = GET_TCB_COOKIE(rpl->cookie);

		ret = TCB_COOKIE_G(rpl->cookie);

		f = &adap->tids.ftid_tab[idx];



		if (ret == FW_FILTER_WR_FLT_DELETED) {
@@ -724,7 +724,7 @@ static int fwevtq_handler(struct sge_rspq *q, const __be64 *rsp, 


	if (likely(opcode == CPL_SGE_EGR_UPDATE)) {

		const struct cpl_sge_egr_update *p = (void *)rsp;

		unsigned int qid = EGR_QID(ntohl(p->opcode_qid));

		unsigned int qid = EGR_QID_G(ntohl(p->opcode_qid));

		struct sge_txq *txq;



		txq = q->adap->sge.egr_map[qid - q->adap->sge.egr_start];
@@ -3483,8 +3483,8 @@ int cxgb4_remove_server(const struct net_device *dev, unsigned int stid, 
	req = (struct cpl_close_listsvr_req *)__skb_put(skb, sizeof(*req));

	INIT_TP_WR(req, 0);

	OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_CLOSE_LISTSRV_REQ, stid));

	req->reply_ctrl = htons(NO_REPLY(0) | (ipv6 ? LISTSVR_IPV6(1) :

				LISTSVR_IPV6(0)) | QUEUENO(queue));

	req->reply_ctrl = htons(NO_REPLY_V(0) | (ipv6 ? LISTSVR_IPV6_V(1) :

				LISTSVR_IPV6_V(0)) | QUEUENO_V(queue));

	ret = t4_mgmt_tx(adap, skb);

	return net_xmit_eval(ret);

}

drivers/net/ethernet/chelsio/cxgb4/l2t.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static int write_l2e(struct adapter *adap, struct l2t_entry *e, int sync) 
	OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_L2T_WRITE_REQ,

					e->idx | (sync ? F_SYNC_WR : 0) |

					TID_QID_V(adap->sge.fw_evtq.abs_id)));

	req->params = htons(L2T_W_PORT(e->lport) | L2T_W_NOREPLY(!sync));

	req->params = htons(L2T_W_PORT_V(e->lport) | L2T_W_NOREPLY_V(!sync));

	req->l2t_idx = htons(e->idx);

	req->vlan = htons(e->vlan);

	if (e->neigh && !(e->neigh->dev->flags & IFF_LOOPBACK))

drivers/net/ethernet/chelsio/cxgb4/sge.c

+5 −4
Original line number Diff line number Diff line
@@ -821,7 +821,8 @@ static void write_sgl(const struct sk_buff *skb, struct sge_txq *q, 
		sgl->addr0 = cpu_to_be64(addr[1]);

	}



	sgl->cmd_nsge = htonl(ULPTX_CMD_V(ULP_TX_SC_DSGL) | ULPTX_NSGE(nfrags));

	sgl->cmd_nsge = htonl(ULPTX_CMD_V(ULP_TX_SC_DSGL) |

			      ULPTX_NSGE_V(nfrags));

	if (likely(--nfrags == 0))

		return;

	/*
@@ -1761,7 +1762,7 @@ int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp, 
	pkt = (const struct cpl_rx_pkt *)rsp;

	csum_ok = pkt->csum_calc && !pkt->err_vec &&

		  (q->netdev->features & NETIF_F_RXCSUM);

	if ((pkt->l2info & htonl(RXF_TCP)) &&

	if ((pkt->l2info & htonl(RXF_TCP_F)) &&

	    (q->netdev->features & NETIF_F_GRO) && csum_ok && !pkt->ip_frag) {

		do_gro(rxq, si, pkt);

		return 0;
@@ -1783,11 +1784,11 @@ int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp, 


	rxq->stats.pkts++;



	if (csum_ok && (pkt->l2info & htonl(RXF_UDP | RXF_TCP))) {

	if (csum_ok && (pkt->l2info & htonl(RXF_UDP_F | RXF_TCP_F))) {

		if (!pkt->ip_frag) {

			skb->ip_summed = CHECKSUM_UNNECESSARY;

			rxq->stats.rx_cso++;

		} else if (pkt->l2info & htonl(RXF_IP)) {

		} else if (pkt->l2info & htonl(RXF_IP_F)) {

			__sum16 c = (__force __sum16)pkt->csum;

			skb->csum = csum_unfold(c);

			skb->ip_summed = CHECKSUM_COMPLETE;