tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Divy Le Ray <divy@chelsio.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

authored by Divy Le Ray and committed by Jeff Garzik 6cdbd77e 59cf8107

+10 -12
unified split
+2
drivers/net/cxgb3/cxgb3_main.c
··· 770 if (err) 771 goto out; 772 773 err = setup_sge_qsets(adap); 774 if (err) 775 goto out;
··· 770 if (err) 771 goto out; 772 773 + t3_write_reg(adap, A_ULPRX_TDDP_PSZ, V_HPZ0(PAGE_SHIFT - 12)); 774 + 775 err = setup_sge_qsets(adap); 776 if (err) 777 goto out;
+2 -12
drivers/net/cxgb3/cxgb3_offload.c
··· 743 } 744 } 745 746 - static int do_set_tcb_rpl(struct t3cdev *dev, struct sk_buff *skb) 747 - { 748 - struct cpl_set_tcb_rpl *rpl = cplhdr(skb); 749 - 750 - if (rpl->status != CPL_ERR_NONE) 751 - printk(KERN_ERR 752 - "Unexpected SET_TCB_RPL status %u for tid %u\n", 753 - rpl->status, GET_TID(rpl)); 754 - return CPL_RET_BUF_DONE; 755 - } 756 - 757 static int do_trace(struct t3cdev *dev, struct sk_buff *skb) 758 { 759 struct cpl_trace_pkt *p = cplhdr(skb); ··· 1204 t3_register_cpl_handler(CPL_CLOSE_CON_RPL, do_hwtid_rpl); 1205 t3_register_cpl_handler(CPL_ABORT_REQ_RSS, do_abort_req_rss); 1206 t3_register_cpl_handler(CPL_ACT_ESTABLISH, do_act_establish); 1207 - t3_register_cpl_handler(CPL_SET_TCB_RPL, do_set_tcb_rpl); 1208 t3_register_cpl_handler(CPL_RDMA_TERMINATE, do_term); 1209 t3_register_cpl_handler(CPL_RDMA_EC_STATUS, do_hwtid_rpl); 1210 t3_register_cpl_handler(CPL_TRACE_PKT, do_trace);
··· 743 } 744 } 745 746 static int do_trace(struct t3cdev *dev, struct sk_buff *skb) 747 { 748 struct cpl_trace_pkt *p = cplhdr(skb); ··· 1215 t3_register_cpl_handler(CPL_CLOSE_CON_RPL, do_hwtid_rpl); 1216 t3_register_cpl_handler(CPL_ABORT_REQ_RSS, do_abort_req_rss); 1217 t3_register_cpl_handler(CPL_ACT_ESTABLISH, do_act_establish); 1218 + t3_register_cpl_handler(CPL_SET_TCB_RPL, do_hwtid_rpl); 1219 + t3_register_cpl_handler(CPL_GET_TCB_RPL, do_hwtid_rpl); 1220 t3_register_cpl_handler(CPL_RDMA_TERMINATE, do_term); 1221 t3_register_cpl_handler(CPL_RDMA_EC_STATUS, do_hwtid_rpl); 1222 t3_register_cpl_handler(CPL_TRACE_PKT, do_trace);
+6
drivers/net/cxgb3/regs.h
··· 1234 1235 #define A_ULPRX_ISCSI_TAGMASK 0x514 1236 1237 #define A_ULPRX_TDDP_LLIMIT 0x51c 1238 1239 #define A_ULPRX_TDDP_ULIMIT 0x520 1240 1241 #define A_ULPRX_STAG_LLIMIT 0x52c 1242
··· 1234 1235 #define A_ULPRX_ISCSI_TAGMASK 0x514 1236 1237 + #define S_HPZ0 0 1238 + #define M_HPZ0 0xf 1239 + #define V_HPZ0(x) ((x) << S_HPZ0) 1240 + #define G_HPZ0(x) (((x) >> S_HPZ0) & M_HPZ0) 1241 + 1242 #define A_ULPRX_TDDP_LLIMIT 0x51c 1243 1244 #define A_ULPRX_TDDP_ULIMIT 0x520 1245 + #define A_ULPRX_TDDP_PSZ 0x528 1246 1247 #define A_ULPRX_STAG_LLIMIT 0x52c 1248