leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libcxgb,iw_cxgb4,cxgbit: add cxgb_mk_rx_data_ack()

Browse Source 
Add cxgb_mk_rx_data_ack() to remove duplicate
code to form CPL_RX_DATA_ACK hardware command.

Signed-off-by: Varun Prakash <varun@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Varun Prakash 2016-09-13 21:24:06 +05:30 committed by David S. Miller
parent 052f4731ed
commit 6e3b6fc201
3 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/infiniband/hw/cxgb4/cm.c
View File

@ -1354,9 +1354,9 @@ static void established_upcall(struct c4iw_ep *ep)
static int update_rx_credits(struct c4iw_ep *ep, u32 credits) static int update_rx_credits(struct c4iw_ep *ep, u32 credits)
{ {
struct cpl_rx_data_ack *req;
struct sk_buff *skb; struct sk_buff *skb;
int wrlen = roundup(sizeof *req, 16); u32 wrlen = roundup(sizeof(struct cpl_rx_data_ack), 16);
u32 credit_dack;
PDBG("%s ep %p tid %u credits %u\n", __func__, ep, ep->hwtid, credits); PDBG("%s ep %p tid %u credits %u\n", __func__, ep, ep->hwtid, credits);
skb = get_skb(NULL, wrlen, GFP_KERNEL); skb = get_skb(NULL, wrlen, GFP_KERNEL);
@ -1373,15 +1373,12 @@ static int update_rx_credits(struct c4iw_ep *ep, u32 credits)
if (ep->rcv_win > RCV_BUFSIZ_M * 1024) if (ep->rcv_win > RCV_BUFSIZ_M * 1024)
credits += ep->rcv_win - RCV_BUFSIZ_M * 1024; credits += ep->rcv_win - RCV_BUFSIZ_M * 1024;
req = (struct cpl_rx_data_ack *) skb_put(skb, wrlen); credit_dack = credits | RX_FORCE_ACK_F | RX_DACK_CHANGE_F |
memset(req, 0, wrlen); RX_DACK_MODE_V(dack_mode);
INIT_TP_WR(req, ep->hwtid);
OPCODE_TID(req) = cpu_to_be32(MK_OPCODE_TID(CPL_RX_DATA_ACK, cxgb_mk_rx_data_ack(skb, wrlen, ep->hwtid, ep->ctrlq_idx,
ep->hwtid)); credit_dack);
req->credit_dack = cpu_to_be32(credits | RX_FORCE_ACK_F |
RX_DACK_CHANGE_F |
RX_DACK_MODE_V(dack_mode));
set_wr_txq(skb, CPL_PRIORITY_ACK, ep->ctrlq_idx);
c4iw_ofld_send(&ep->com.dev->rdev, skb); c4iw_ofld_send(&ep->com.dev->rdev, skb);
return credits; return credits;
} }

15
drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.h
View File

@ -142,4 +142,19 @@ cxgb_mk_abort_rpl(struct sk_buff *skb, u32 len, u32 tid, u16 chan)
rpl->cmd = CPL_ABORT_NO_RST; rpl->cmd = CPL_ABORT_NO_RST;
set_wr_txq(skb, CPL_PRIORITY_DATA, chan); set_wr_txq(skb, CPL_PRIORITY_DATA, chan);
} }
static inline void
cxgb_mk_rx_data_ack(struct sk_buff *skb, u32 len, u32 tid, u16 chan,
u32 credit_dack)
{
struct cpl_rx_data_ack *req;
req = (struct cpl_rx_data_ack *)__skb_put(skb, len);
memset(req, 0, len);
INIT_TP_WR(req, tid);
OPCODE_TID(req) = cpu_to_be32(MK_OPCODE_TID(CPL_RX_DATA_ACK, tid));
req->credit_dack = cpu_to_be32(credit_dack);
set_wr_txq(skb, CPL_PRIORITY_ACK, chan);
}
#endif #endif

16
drivers/target/iscsi/cxgbit/cxgbit_cm.c
View File

@ -994,22 +994,18 @@ static void cxgbit_send_rx_credits(struct cxgbit_sock *csk, struct sk_buff *skb)
int cxgbit_rx_data_ack(struct cxgbit_sock *csk) int cxgbit_rx_data_ack(struct cxgbit_sock *csk)
{ {
struct sk_buff *skb; struct sk_buff *skb;
struct cpl_rx_data_ack *req; u32 len = roundup(sizeof(struct cpl_rx_data_ack), 16);
unsigned int len = roundup(sizeof(*req), 16); u32 credit_dack;
skb = alloc_skb(len, GFP_KERNEL); skb = alloc_skb(len, GFP_KERNEL);
if (!skb) if (!skb)
return -1; return -1;
req = (struct cpl_rx_data_ack *)__skb_put(skb, len); credit_dack = RX_DACK_CHANGE_F | RX_DACK_MODE_V(1) |
memset(req, 0, len); RX_CREDITS_V(csk->rx_credits);
set_wr_txq(skb, CPL_PRIORITY_ACK, csk->ctrlq_idx); cxgb_mk_rx_data_ack(skb, len, csk->tid, csk->ctrlq_idx,
INIT_TP_WR(req, csk->tid); credit_dack);
OPCODE_TID(req) = cpu_to_be32(MK_OPCODE_TID(CPL_RX_DATA_ACK,
csk->tid));
req->credit_dack = cpu_to_be32(RX_DACK_CHANGE_F | RX_DACK_MODE_V(1) |
RX_CREDITS_V(csk->rx_credits));
csk->rx_credits = 0; csk->rx_credits = 0;