6 files changed, 47 insertions, 17 deletions

diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.c b/drivers/infiniband/hw/cxgb3/cxio_hal.c
index 11efd3528ce4..a4a82bff7100 100644
--- a/drivers/infiniband/hw/cxgb3/cxio_hal.c
+++ b/drivers/infiniband/hw/cxgb3/cxio_hal.c
@@ -450,7 +450,7 @@ static int cqe_completes_wr(struct t3_cqe *cqe, struct t3_wq *wq)
         if ((CQE_OPCODE(*cqe) == T3_READ_RESP) && SQ_TYPE(*cqe))
                 return 0;
 
-        if ((CQE_OPCODE(*cqe) == T3_SEND) && RQ_TYPE(*cqe) &&
+        if (CQE_SEND_OPCODE(*cqe) && RQ_TYPE(*cqe) &&
             Q_EMPTY(wq->rq_rptr, wq->rq_wptr))
                 return 0;
 
@@ -941,6 +941,23 @@ int cxio_rdev_open(struct cxio_rdev *rdev_p)
         if (!rdev_p->t3cdev_p)
                 rdev_p->t3cdev_p = dev2t3cdev(netdev_p);
         rdev_p->t3cdev_p->ulp = (void *) rdev_p;
+
+        err = rdev_p->t3cdev_p->ctl(rdev_p->t3cdev_p, GET_EMBEDDED_INFO,
+                                         &(rdev_p->fw_info));
+        if (err) {
+                printk(KERN_ERR "%s t3cdev_p(%p)->ctl returned error %d.\n",
+                     __func__, rdev_p->t3cdev_p, err);
+                goto err1;
+        }
+        if (G_FW_VERSION_MAJOR(rdev_p->fw_info.fw_vers) != CXIO_FW_MAJ) {
+                printk(KERN_ERR MOD "fatal firmware version mismatch: "
+                       "need version %u but adapter has version %u\n",
+                       CXIO_FW_MAJ,
+                       G_FW_VERSION_MAJOR(rdev_p->fw_info.fw_vers));
+                err = -EINVAL;
+                goto err1;
+        }
+
         err = rdev_p->t3cdev_p->ctl(rdev_p->t3cdev_p, RDMA_GET_PARAMS,
                                          &(rdev_p->rnic_info));
         if (err) {
@@ -1207,11 +1224,12 @@ int cxio_poll_cq(struct t3_wq *wq, struct t3_cq *cq, struct t3_cqe *cqe,
                 }
 
                 /* incoming SEND with no receive posted failures */
-                if ((CQE_OPCODE(*hw_cqe) == T3_SEND) && RQ_TYPE(*hw_cqe) &&
+                if (CQE_SEND_OPCODE(*hw_cqe) && RQ_TYPE(*hw_cqe) &&
                     Q_EMPTY(wq->rq_rptr, wq->rq_wptr)) {
                         ret = -1;
                         goto skip_cqe;
                 }
+                BUG_ON((*cqe_flushed == 0) && !SW_CQE(*hw_cqe));
                 goto proc_cqe;
         }
 
@@ -1226,6 +1244,13 @@ int cxio_poll_cq(struct t3_wq *wq, struct t3_cq *cq, struct t3_cqe *cqe,
                  * then we complete this with TPT_ERR_MSN and mark the wq in
                  * error.
                  */
+
+                if (Q_EMPTY(wq->rq_rptr, wq->rq_wptr)) {
+                        wq->error = 1;
+                        ret = -1;
+                        goto skip_cqe;
+                }
+
                 if (unlikely((CQE_WRID_MSN(*hw_cqe) != (wq->rq_rptr + 1)))) {
                         wq->error = 1;
                         hw_cqe->header |= htonl(V_CQE_STATUS(TPT_ERR_MSN));
@@ -1280,6 +1305,7 @@ proc_cqe:
                         cxio_hal_pblpool_free(wq->rdev,
                                 wq->rq[Q_PTR2IDX(wq->rq_rptr,
                                 wq->rq_size_log2)].pbl_addr, T3_STAG0_PBL_SIZE);
+                BUG_ON(Q_EMPTY(wq->rq_rptr, wq->rq_wptr));
                 wq->rq_rptr++;
         }
 
diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.h b/drivers/infiniband/hw/cxgb3/cxio_hal.h
index 9ed65b055171..094a66d1480c 100644
--- a/drivers/infiniband/hw/cxgb3/cxio_hal.h
+++ b/drivers/infiniband/hw/cxgb3/cxio_hal.h
@@ -61,6 +61,8 @@
 
 #define T3_MAX_DEV_NAME_LEN 32
 
+#define CXIO_FW_MAJ 7
+
 struct cxio_hal_ctrl_qp {
         u32 wptr;
         u32 rptr;
@@ -108,6 +110,7 @@ struct cxio_rdev {
         struct gen_pool *pbl_pool;
         struct gen_pool *rqt_pool;
         struct list_head entry;
+        struct ch_embedded_info fw_info;
         u32     flags;
 #define CXIO_ERROR_FATAL        1
 };
diff --git a/drivers/infiniband/hw/cxgb3/cxio_wr.h b/drivers/infiniband/hw/cxgb3/cxio_wr.h
index 04618f7bfbb3..ff9be1a13106 100644
--- a/drivers/infiniband/hw/cxgb3/cxio_wr.h
+++ b/drivers/infiniband/hw/cxgb3/cxio_wr.h
@@ -604,6 +604,12 @@ struct t3_cqe {
 #define CQE_STATUS(x)     (G_CQE_STATUS(be32_to_cpu((x).header)))
 #define CQE_OPCODE(x)     (G_CQE_OPCODE(be32_to_cpu((x).header)))
 
+#define CQE_SEND_OPCODE(x)( \
+        (G_CQE_OPCODE(be32_to_cpu((x).header)) == T3_SEND) || \
+        (G_CQE_OPCODE(be32_to_cpu((x).header)) == T3_SEND_WITH_SE) || \
+        (G_CQE_OPCODE(be32_to_cpu((x).header)) == T3_SEND_WITH_INV) || \
+        (G_CQE_OPCODE(be32_to_cpu((x).header)) == T3_SEND_WITH_SE_INV))
+
 #define CQE_LEN(x)        (be32_to_cpu((x).len))
 
 /* used for RQ completion processing */
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index 44e936e48a31..8699947aaf6c 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -1678,6 +1678,9 @@ static int terminate(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)
 {
         struct iwch_ep *ep = ctx;
 
+        if (state_read(&ep->com) != FPDU_MODE)
+                return CPL_RET_BUF_DONE;
+
         PDBG("%s ep %p\n", __func__, ep);
         skb_pull(skb, sizeof(struct cpl_rdma_terminate));
         PDBG("%s saving %d bytes of term msg\n", __func__, skb->len);
diff --git a/drivers/infiniband/hw/cxgb3/iwch_ev.c b/drivers/infiniband/hw/cxgb3/iwch_ev.c
index 7b67a6771720..743c5d8b8806 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_ev.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_ev.c
@@ -179,11 +179,6 @@ void iwch_ev_dispatch(struct cxio_rdev *rdev_p, struct sk_buff *skb)
         case TPT_ERR_BOUND:
         case TPT_ERR_INVALIDATE_SHARED_MR:
         case TPT_ERR_INVALIDATE_MR_WITH_MW_BOUND:
-                printk(KERN_ERR "%s - CQE Err qpid 0x%x opcode %d status 0x%x "
-                       "type %d wrid.hi 0x%x wrid.lo 0x%x \n", __func__,
-                       CQE_QPID(rsp_msg->cqe), CQE_OPCODE(rsp_msg->cqe),
-                       CQE_STATUS(rsp_msg->cqe), CQE_TYPE(rsp_msg->cqe),
-                       CQE_WRID_HI(rsp_msg->cqe), CQE_WRID_LOW(rsp_msg->cqe));
                 (*chp->ibcq.comp_handler)(&chp->ibcq, chp->ibcq.cq_context);
                 post_qp_event(rnicp, chp, rsp_msg, IB_EVENT_QP_ACCESS_ERR, 1);
                 break;
diff --git a/drivers/infiniband/hw/cxgb3/iwch_qp.c b/drivers/infiniband/hw/cxgb3/iwch_qp.c
index 19661b2f0406..c758fbd58478 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_qp.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_qp.c
@@ -99,8 +99,8 @@ static int build_rdma_write(union t3_wr *wqe, struct ib_send_wr *wr,
         if (wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM) {
                 plen = 4;
                 wqe->write.sgl[0].stag = wr->ex.imm_data;
-                wqe->write.sgl[0].len = __constant_cpu_to_be32(0);
-                wqe->write.num_sgle = __constant_cpu_to_be32(0);
+                wqe->write.sgl[0].len = cpu_to_be32(0);
+                wqe->write.num_sgle = cpu_to_be32(0);
                 *flit_cnt = 6;
         } else {
                 plen = 0;
@@ -195,15 +195,12 @@ static int build_inv_stag(union t3_wr *wqe, struct ib_send_wr *wr,
         return 0;
 }
 
-/*
- * TBD: this is going to be moved to firmware. Missing pdid/qpid check for now.
- */
 static int iwch_sgl2pbl_map(struct iwch_dev *rhp, struct ib_sge *sg_list,
                             u32 num_sgle, u32 * pbl_addr, u8 * page_size)
 {
         int i;
         struct iwch_mr *mhp;
-        u32 offset;
+        u64 offset;
         for (i = 0; i < num_sgle; i++) {
 
                 mhp = get_mhp(rhp, (sg_list[i].lkey) >> 8);
@@ -235,8 +232,8 @@ static int iwch_sgl2pbl_map(struct iwch_dev *rhp, struct ib_sge *sg_list,
                         return -EINVAL;
                 }
                 offset = sg_list[i].addr - mhp->attr.va_fbo;
-                offset += ((u32) mhp->attr.va_fbo) %
-                          (1UL << (12 + mhp->attr.page_size));
+                offset += mhp->attr.va_fbo &
+                          ((1UL << (12 + mhp->attr.page_size)) - 1);
                 pbl_addr[i] = ((mhp->attr.pbl_addr -
                                 rhp->rdev.rnic_info.pbl_base) >> 3) +
                               (offset >> (12 + mhp->attr.page_size));
@@ -266,8 +263,8 @@ static int build_rdma_recv(struct iwch_qp *qhp, union t3_wr *wqe,
                 wqe->recv.sgl[i].len = cpu_to_be32(wr->sg_list[i].length);
 
                 /* to in the WQE == the offset into the page */
-                wqe->recv.sgl[i].to = cpu_to_be64(((u32) wr->sg_list[i].addr) %
-                                (1UL << (12 + page_size[i])));
+                wqe->recv.sgl[i].to = cpu_to_be64(((u32)wr->sg_list[i].addr) &
+                                ((1UL << (12 + page_size[i])) - 1));
 
                 /* pbl_addr is the adapters address in the PBL */
                 wqe->recv.pbl_addr[i] = cpu_to_be32(pbl_addr[i]);