lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

RDMA/cxgb3: Fix TERM codes

Browse Source 
Fix TERMINATE layer, type, and ecode values based on
conformance testing.

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Steve Wise
2007-04-26 15:21:02 -05:00
committed by Roland Dreier
parent 347fcfbed2
commit 4a97d47ef7
1 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
drivers/infiniband/hw/cxgb3/iwch_qp.c
View File

@@ -471,43 +471,62 @@ int iwch_bind_mw(struct ib_qp *qp,
return err; return err;
} }
static void build_term_codes(int t3err, u8 *layer_type, u8 *ecode, int tagged) static inline void build_term_codes(struct respQ_msg_t *rsp_msg,
u8 *layer_type, u8 *ecode)
{ {
switch (t3err) { int status = TPT_ERR_INTERNAL_ERR;
int tagged = 0;
int opcode = -1;
int rqtype = 0;
int send_inv = 0;
if (rsp_msg) {
status = CQE_STATUS(rsp_msg->cqe);
opcode = CQE_OPCODE(rsp_msg->cqe);
rqtype = RQ_TYPE(rsp_msg->cqe);
send_inv = (opcode == T3_SEND_WITH_INV) ||
(opcode == T3_SEND_WITH_SE_INV);
tagged = (opcode == T3_RDMA_WRITE) ||
(rqtype && (opcode == T3_READ_RESP));
}
switch (status) {
case TPT_ERR_STAG: case TPT_ERR_STAG:
if (tagged == 1) { if (send_inv) {
*layer_type = LAYER_DDP|DDP_TAGGED_ERR; *layer_type = LAYER_RDMAP|RDMAP_REMOTE_OP;
*ecode = DDPT_INV_STAG; *ecode = RDMAP_CANT_INV_STAG;
} else if (tagged == 2) { } else {
*layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT; *layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
*ecode = RDMAP_INV_STAG; *ecode = RDMAP_INV_STAG;
} }
break; break;
case TPT_ERR_PDID: case TPT_ERR_PDID:
case TPT_ERR_QPID: *layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
case TPT_ERR_ACCESS: if ((opcode == T3_SEND_WITH_INV) ||
if (tagged == 1) { (opcode == T3_SEND_WITH_SE_INV))
*layer_type = LAYER_DDP|DDP_TAGGED_ERR; *ecode = RDMAP_CANT_INV_STAG;
*ecode = DDPT_STAG_NOT_ASSOC; else
} else if (tagged == 2) {
*layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
*ecode = RDMAP_STAG_NOT_ASSOC; *ecode = RDMAP_STAG_NOT_ASSOC;
} break;
case TPT_ERR_QPID:
*layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
*ecode = RDMAP_STAG_NOT_ASSOC;
break;
case TPT_ERR_ACCESS:
*layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
*ecode = RDMAP_ACC_VIOL;
break; break;
case TPT_ERR_WRAP: case TPT_ERR_WRAP:
*layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT; *layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
*ecode = RDMAP_TO_WRAP; *ecode = RDMAP_TO_WRAP;
break; break;
case TPT_ERR_BOUND: case TPT_ERR_BOUND:
if (tagged == 1) { if (tagged) {
*layer_type = LAYER_DDP|DDP_TAGGED_ERR; *layer_type = LAYER_DDP|DDP_TAGGED_ERR;
*ecode = DDPT_BASE_BOUNDS; *ecode = DDPT_BASE_BOUNDS;
} else if (tagged == 2) { } else {
*layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT; *layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
*ecode = RDMAP_BASE_BOUNDS; *ecode = RDMAP_BASE_BOUNDS;
} else {
*layer_type = LAYER_DDP|DDP_UNTAGGED_ERR;
*ecode = DDPU_MSG_TOOBIG;
} }
break; break;
case TPT_ERR_INVALIDATE_SHARED_MR: case TPT_ERR_INVALIDATE_SHARED_MR:
@@ -591,8 +610,6 @@ int iwch_post_terminate(struct iwch_qp *qhp, struct respQ_msg_t *rsp_msg)
{ {
union t3_wr *wqe; union t3_wr *wqe;
struct terminate_message *term; struct terminate_message *term;
int status;
int tagged = 0;
struct sk_buff *skb; struct sk_buff *skb;
PDBG("%s %d\n", __FUNCTION__, __LINE__); PDBG("%s %d\n", __FUNCTION__, __LINE__);
@@ -610,17 +627,7 @@ int iwch_post_terminate(struct iwch_qp *qhp, struct respQ_msg_t *rsp_msg)
/* immediate data starts here. */ /* immediate data starts here. */
term = (struct terminate_message *)wqe->send.sgl; term = (struct terminate_message *)wqe->send.sgl;
if (rsp_msg) { build_term_codes(rsp_msg, &term->layer_etype, &term->ecode);
status = CQE_STATUS(rsp_msg->cqe);
if (CQE_OPCODE(rsp_msg->cqe) == T3_RDMA_WRITE)
tagged = 1;
if ((CQE_OPCODE(rsp_msg->cqe) == T3_READ_REQ) ||
(CQE_OPCODE(rsp_msg->cqe) == T3_READ_RESP))
tagged = 2;
} else {
status = TPT_ERR_INTERNAL_ERR;
}
build_term_codes(status, &term->layer_etype, &term->ecode, tagged);
build_fw_riwrh((void *)wqe, T3_WR_SEND, build_fw_riwrh((void *)wqe, T3_WR_SEND,
T3_COMPLETION_FLAG | T3_NOTIFY_FLAG, 1, T3_COMPLETION_FLAG | T3_NOTIFY_FLAG, 1,
qhp->ep->hwtid, 5); qhp->ep->hwtid, 5);