Commit 6cdbd77e authored by Divy Le Ray's avatar Divy Le Ray Committed by Jeff Garzik
Browse files

cxgb3 - missing CPL hanler and register setting. 



Remove specific CPL handler.
Add missing CPL handler.
Add missing register setting when the interface is brought up.

Signed-off-by: default avatarDivy Le Ray <divy@chelsio.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 59cf8107

drivers/net/cxgb3/cxgb3_main.c

+2 −0
Original line number Diff line number Diff line
@@ -770,6 +770,8 @@ static int cxgb_up(struct adapter *adap) 
		if (err)

			goto out;



		t3_write_reg(adap, A_ULPRX_TDDP_PSZ, V_HPZ0(PAGE_SHIFT - 12));

		

		err = setup_sge_qsets(adap);

		if (err)

			goto out;

drivers/net/cxgb3/cxgb3_offload.c

+2 −12
Original line number Diff line number Diff line
@@ -743,17 +743,6 @@ static int do_act_establish(struct t3cdev *dev, struct sk_buff *skb) 
	}

}



static int do_set_tcb_rpl(struct t3cdev *dev, struct sk_buff *skb)

{

	struct cpl_set_tcb_rpl *rpl = cplhdr(skb);



	if (rpl->status != CPL_ERR_NONE)

		printk(KERN_ERR

		       "Unexpected SET_TCB_RPL status %u for tid %u\n",

		       rpl->status, GET_TID(rpl));

	return CPL_RET_BUF_DONE;

}



static int do_trace(struct t3cdev *dev, struct sk_buff *skb)

{

	struct cpl_trace_pkt *p = cplhdr(skb);
@@ -1215,7 +1204,8 @@ void __init cxgb3_offload_init(void) 
	t3_register_cpl_handler(CPL_CLOSE_CON_RPL, do_hwtid_rpl);

	t3_register_cpl_handler(CPL_ABORT_REQ_RSS, do_abort_req_rss);

	t3_register_cpl_handler(CPL_ACT_ESTABLISH, do_act_establish);

	t3_register_cpl_handler(CPL_SET_TCB_RPL, do_set_tcb_rpl);

	t3_register_cpl_handler(CPL_SET_TCB_RPL, do_hwtid_rpl);

	t3_register_cpl_handler(CPL_GET_TCB_RPL, do_hwtid_rpl);

	t3_register_cpl_handler(CPL_RDMA_TERMINATE, do_term);

	t3_register_cpl_handler(CPL_RDMA_EC_STATUS, do_hwtid_rpl);

	t3_register_cpl_handler(CPL_TRACE_PKT, do_trace);

drivers/net/cxgb3/regs.h

+6 −0
Original line number Diff line number Diff line
@@ -1234,9 +1234,15 @@ 


#define A_ULPRX_ISCSI_TAGMASK 0x514



#define S_HPZ0    0

#define M_HPZ0    0xf

#define V_HPZ0(x) ((x) << S_HPZ0)

#define G_HPZ0(x) (((x) >> S_HPZ0) & M_HPZ0)



#define A_ULPRX_TDDP_LLIMIT 0x51c



#define A_ULPRX_TDDP_ULIMIT 0x520

#define A_ULPRX_TDDP_PSZ 0x528



#define A_ULPRX_STAG_LLIMIT 0x52c