linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git] / drivers / infiniband / hw / mthca / mthca_qp.c
index b66aa49..fba608e 100644 (file)
@@ -2,7 +2,7 @@
  * Copyright (c) 2004 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Cisco Systems. All rights reserved.
  * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
- * Copyright (c) 2004 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004 Voltaire, Inc. All rights reserved. 
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -39,8 +39,6 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 
-#include <asm/io.h>
-
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_cache.h>
 #include <rdma/ib_pack.h>
@@ -101,10 +99,6 @@ enum {
        MTHCA_QP_BIT_RSC = 1 <<  3
 };
 
-enum {
-       MTHCA_SEND_DOORBELL_FENCE = 1 << 5
-};
-
 struct mthca_qp_path {
        __be32 port_pkey;
        u8     rnr_retry;
@@ -228,8 +222,9 @@ static void *get_send_wqe(struct mthca_qp *qp, int n)
                         (PAGE_SIZE - 1));
 }
 
-static void mthca_wq_reset(struct mthca_wq *wq)
+static void mthca_wq_init(struct mthca_wq *wq)
 {
+       spin_lock_init(&wq->lock);
        wq->next_ind  = 0;
        wq->last_comp = wq->max - 1;
        wq->head      = 0;
@@ -245,7 +240,7 @@ void mthca_qp_event(struct mthca_dev *dev, u32 qpn,
        spin_lock(&dev->qp_table.lock);
        qp = mthca_array_get(&dev->qp_table.qp, qpn & (dev->limits.num_qps - 1));
        if (qp)
-               ++qp->refcount;
+               atomic_inc(&qp->refcount);
        spin_unlock(&dev->qp_table.lock);
 
        if (!qp) {
@@ -253,19 +248,14 @@ void mthca_qp_event(struct mthca_dev *dev, u32 qpn,
                return;
        }
 
-       if (event_type == IB_EVENT_PATH_MIG)
-               qp->port = qp->alt_port;
-
        event.device      = &dev->ib_dev;
        event.event       = event_type;
        event.element.qp  = &qp->ibqp;
        if (qp->ibqp.event_handler)
                qp->ibqp.event_handler(&event, qp->ibqp.qp_context);
 
-       spin_lock(&dev->qp_table.lock);
-       if (!--qp->refcount)
+       if (atomic_dec_and_test(&qp->refcount))
                wake_up(&qp->wait);
-       spin_unlock(&dev->qp_table.lock);
 }
 
 static int to_mthca_state(enum ib_qp_state ib_state)
@@ -296,6 +286,207 @@ static int to_mthca_st(int transport)
        }
 }
 
+static const struct {
+       int trans;
+       u32 req_param[NUM_TRANS];
+       u32 opt_param[NUM_TRANS];
+} state_table[IB_QPS_ERR + 1][IB_QPS_ERR + 1] = {
+       [IB_QPS_RESET] = {
+               [IB_QPS_RESET] = { .trans = MTHCA_TRANS_ANY2RST },
+               [IB_QPS_ERR] = { .trans = MTHCA_TRANS_ANY2ERR },
+               [IB_QPS_INIT]  = {
+                       .trans = MTHCA_TRANS_RST2INIT,
+                       .req_param = {
+                               [UD]  = (IB_QP_PKEY_INDEX |
+                                        IB_QP_PORT       |
+                                        IB_QP_QKEY),
+                               [UC]  = (IB_QP_PKEY_INDEX |
+                                        IB_QP_PORT       |
+                                        IB_QP_ACCESS_FLAGS),
+                               [RC]  = (IB_QP_PKEY_INDEX |
+                                        IB_QP_PORT       |
+                                        IB_QP_ACCESS_FLAGS),
+                               [MLX] = (IB_QP_PKEY_INDEX |
+                                        IB_QP_QKEY),
+                       },
+                       /* bug-for-bug compatibility with VAPI: */
+                       .opt_param = {
+                               [MLX] = IB_QP_PORT
+                       }
+               },
+       },
+       [IB_QPS_INIT]  = {
+               [IB_QPS_RESET] = { .trans = MTHCA_TRANS_ANY2RST },
+               [IB_QPS_ERR] = { .trans = MTHCA_TRANS_ANY2ERR },
+               [IB_QPS_INIT]  = {
+                       .trans = MTHCA_TRANS_INIT2INIT,
+                       .opt_param = {
+                               [UD]  = (IB_QP_PKEY_INDEX |
+                                        IB_QP_PORT       |
+                                        IB_QP_QKEY),
+                               [UC]  = (IB_QP_PKEY_INDEX |
+                                        IB_QP_PORT       |
+                                        IB_QP_ACCESS_FLAGS),
+                               [RC]  = (IB_QP_PKEY_INDEX |
+                                        IB_QP_PORT       |
+                                        IB_QP_ACCESS_FLAGS),
+                               [MLX] = (IB_QP_PKEY_INDEX |
+                                        IB_QP_QKEY),
+                       }
+               },
+               [IB_QPS_RTR]   = {
+                       .trans = MTHCA_TRANS_INIT2RTR,
+                       .req_param = {
+                               [UC]  = (IB_QP_AV                  |
+                                        IB_QP_PATH_MTU            |
+                                        IB_QP_DEST_QPN            |
+                                        IB_QP_RQ_PSN),
+                               [RC]  = (IB_QP_AV                  |
+                                        IB_QP_PATH_MTU            |
+                                        IB_QP_DEST_QPN            |
+                                        IB_QP_RQ_PSN              |
+                                        IB_QP_MAX_DEST_RD_ATOMIC  |
+                                        IB_QP_MIN_RNR_TIMER),
+                       },
+                       .opt_param = {
+                               [UD]  = (IB_QP_PKEY_INDEX |
+                                        IB_QP_QKEY),
+                               [UC]  = (IB_QP_ALT_PATH     |
+                                        IB_QP_ACCESS_FLAGS |
+                                        IB_QP_PKEY_INDEX),
+                               [RC]  = (IB_QP_ALT_PATH     |
+                                        IB_QP_ACCESS_FLAGS |
+                                        IB_QP_PKEY_INDEX),
+                               [MLX] = (IB_QP_PKEY_INDEX |
+                                        IB_QP_QKEY),
+                       }
+               }
+       },
+       [IB_QPS_RTR]   = {
+               [IB_QPS_RESET] = { .trans = MTHCA_TRANS_ANY2RST },
+               [IB_QPS_ERR] = { .trans = MTHCA_TRANS_ANY2ERR },
+               [IB_QPS_RTS]   = {
+                       .trans = MTHCA_TRANS_RTR2RTS,
+                       .req_param = {
+                               [UD]  = IB_QP_SQ_PSN,
+                               [UC]  = IB_QP_SQ_PSN,
+                               [RC]  = (IB_QP_TIMEOUT           |
+                                        IB_QP_RETRY_CNT         |
+                                        IB_QP_RNR_RETRY         |
+                                        IB_QP_SQ_PSN            |
+                                        IB_QP_MAX_QP_RD_ATOMIC),
+                               [MLX] = IB_QP_SQ_PSN,
+                       },
+                       .opt_param = {
+                               [UD]  = (IB_QP_CUR_STATE             |
+                                        IB_QP_QKEY),
+                               [UC]  = (IB_QP_CUR_STATE             |
+                                        IB_QP_ALT_PATH              |
+                                        IB_QP_ACCESS_FLAGS          |
+                                        IB_QP_PATH_MIG_STATE),
+                               [RC]  = (IB_QP_CUR_STATE             |
+                                        IB_QP_ALT_PATH              |
+                                        IB_QP_ACCESS_FLAGS          |
+                                        IB_QP_MIN_RNR_TIMER         |
+                                        IB_QP_PATH_MIG_STATE),
+                               [MLX] = (IB_QP_CUR_STATE             |
+                                        IB_QP_QKEY),
+                       }
+               }
+       },
+       [IB_QPS_RTS]   = {
+               [IB_QPS_RESET] = { .trans = MTHCA_TRANS_ANY2RST },
+               [IB_QPS_ERR] = { .trans = MTHCA_TRANS_ANY2ERR },
+               [IB_QPS_RTS]   = {
+                       .trans = MTHCA_TRANS_RTS2RTS,
+                       .opt_param = {
+                               [UD]  = (IB_QP_CUR_STATE             |
+                                        IB_QP_QKEY),
+                               [UC]  = (IB_QP_ACCESS_FLAGS          |
+                                        IB_QP_ALT_PATH              |
+                                        IB_QP_PATH_MIG_STATE),
+                               [RC]  = (IB_QP_ACCESS_FLAGS          |
+                                        IB_QP_ALT_PATH              |
+                                        IB_QP_PATH_MIG_STATE        |
+                                        IB_QP_MIN_RNR_TIMER),
+                               [MLX] = (IB_QP_CUR_STATE             |
+                                        IB_QP_QKEY),
+                       }
+               },
+               [IB_QPS_SQD]   = {
+                       .trans = MTHCA_TRANS_RTS2SQD,
+               },
+       },
+       [IB_QPS_SQD]   = {
+               [IB_QPS_RESET] = { .trans = MTHCA_TRANS_ANY2RST },
+               [IB_QPS_ERR] = { .trans = MTHCA_TRANS_ANY2ERR },
+               [IB_QPS_RTS]   = {
+                       .trans = MTHCA_TRANS_SQD2RTS,
+                       .opt_param = {
+                               [UD]  = (IB_QP_CUR_STATE             |
+                                        IB_QP_QKEY),
+                               [UC]  = (IB_QP_CUR_STATE             |
+                                        IB_QP_ALT_PATH              |
+                                        IB_QP_ACCESS_FLAGS          |
+                                        IB_QP_PATH_MIG_STATE),
+                               [RC]  = (IB_QP_CUR_STATE             |
+                                        IB_QP_ALT_PATH              |
+                                        IB_QP_ACCESS_FLAGS          |
+                                        IB_QP_MIN_RNR_TIMER         |
+                                        IB_QP_PATH_MIG_STATE),
+                               [MLX] = (IB_QP_CUR_STATE             |
+                                        IB_QP_QKEY),
+                       }
+               },
+               [IB_QPS_SQD]   = {
+                       .trans = MTHCA_TRANS_SQD2SQD,
+                       .opt_param = {
+                               [UD]  = (IB_QP_PKEY_INDEX            |
+                                        IB_QP_QKEY),
+                               [UC]  = (IB_QP_AV                    |
+                                        IB_QP_CUR_STATE             |
+                                        IB_QP_ALT_PATH              |
+                                        IB_QP_ACCESS_FLAGS          |
+                                        IB_QP_PKEY_INDEX            |
+                                        IB_QP_PATH_MIG_STATE),
+                               [RC]  = (IB_QP_AV                    |
+                                        IB_QP_TIMEOUT               |
+                                        IB_QP_RETRY_CNT             |
+                                        IB_QP_RNR_RETRY             |
+                                        IB_QP_MAX_QP_RD_ATOMIC      |
+                                        IB_QP_MAX_DEST_RD_ATOMIC    |
+                                        IB_QP_CUR_STATE             |
+                                        IB_QP_ALT_PATH              |
+                                        IB_QP_ACCESS_FLAGS          |
+                                        IB_QP_PKEY_INDEX            |
+                                        IB_QP_MIN_RNR_TIMER         |
+                                        IB_QP_PATH_MIG_STATE),
+                               [MLX] = (IB_QP_PKEY_INDEX            |
+                                        IB_QP_QKEY),
+                       }
+               }
+       },
+       [IB_QPS_SQE]   = {
+               [IB_QPS_RESET] = { .trans = MTHCA_TRANS_ANY2RST },
+               [IB_QPS_ERR] = { .trans = MTHCA_TRANS_ANY2ERR },
+               [IB_QPS_RTS]   = {
+                       .trans = MTHCA_TRANS_SQERR2RTS,
+                       .opt_param = {
+                               [UD]  = (IB_QP_CUR_STATE             |
+                                        IB_QP_QKEY),
+                               [UC]  = (IB_QP_CUR_STATE             |
+                                        IB_QP_ACCESS_FLAGS),
+                               [MLX] = (IB_QP_CUR_STATE             |
+                                        IB_QP_QKEY),
+                       }
+               }
+       },
+       [IB_QPS_ERR] = {
+               [IB_QPS_RESET] = { .trans = MTHCA_TRANS_ANY2RST },
+               [IB_QPS_ERR] = { .trans = MTHCA_TRANS_ANY2ERR }
+       }
+};
+
 static void store_attrs(struct mthca_sqp *sqp, struct ib_qp_attr *attr,
                        int attr_mask)
 {
@@ -358,175 +549,23 @@ static __be32 get_hw_access_flags(struct mthca_qp *qp, struct ib_qp_attr *attr,
        return cpu_to_be32(hw_access_flags);
 }
 
-static inline enum ib_qp_state to_ib_qp_state(int mthca_state)
-{
-       switch (mthca_state) {
-       case MTHCA_QP_STATE_RST:      return IB_QPS_RESET;
-       case MTHCA_QP_STATE_INIT:     return IB_QPS_INIT;
-       case MTHCA_QP_STATE_RTR:      return IB_QPS_RTR;
-       case MTHCA_QP_STATE_RTS:      return IB_QPS_RTS;
-       case MTHCA_QP_STATE_DRAINING:
-       case MTHCA_QP_STATE_SQD:      return IB_QPS_SQD;
-       case MTHCA_QP_STATE_SQE:      return IB_QPS_SQE;
-       case MTHCA_QP_STATE_ERR:      return IB_QPS_ERR;
-       default:                      return -1;
-       }
-}
-
-static inline enum ib_mig_state to_ib_mig_state(int mthca_mig_state)
-{
-       switch (mthca_mig_state) {
-       case 0:  return IB_MIG_ARMED;
-       case 1:  return IB_MIG_REARM;
-       case 3:  return IB_MIG_MIGRATED;
-       default: return -1;
-       }
-}
-
-static int to_ib_qp_access_flags(int mthca_flags)
-{
-       int ib_flags = 0;
-
-       if (mthca_flags & MTHCA_QP_BIT_RRE)
-               ib_flags |= IB_ACCESS_REMOTE_READ;
-       if (mthca_flags & MTHCA_QP_BIT_RWE)
-               ib_flags |= IB_ACCESS_REMOTE_WRITE;
-       if (mthca_flags & MTHCA_QP_BIT_RAE)
-               ib_flags |= IB_ACCESS_REMOTE_ATOMIC;
-
-       return ib_flags;
-}
-
-static void to_ib_ah_attr(struct mthca_dev *dev, struct ib_ah_attr *ib_ah_attr,
-                               struct mthca_qp_path *path)
-{
-       memset(ib_ah_attr, 0, sizeof *path);
-       ib_ah_attr->port_num      = (be32_to_cpu(path->port_pkey) >> 24) & 0x3;
-
-       if (ib_ah_attr->port_num == 0 || ib_ah_attr->port_num > dev->limits.num_ports)
-               return;
-
-       ib_ah_attr->dlid          = be16_to_cpu(path->rlid);
-       ib_ah_attr->sl            = be32_to_cpu(path->sl_tclass_flowlabel) >> 28;
-       ib_ah_attr->src_path_bits = path->g_mylmc & 0x7f;
-       ib_ah_attr->static_rate   = mthca_rate_to_ib(dev,
-                                                    path->static_rate & 0x7,
-                                                    ib_ah_attr->port_num);
-       ib_ah_attr->ah_flags      = (path->g_mylmc & (1 << 7)) ? IB_AH_GRH : 0;
-       if (ib_ah_attr->ah_flags) {
-               ib_ah_attr->grh.sgid_index = path->mgid_index & (dev->limits.gid_table_len - 1);
-               ib_ah_attr->grh.hop_limit  = path->hop_limit;
-               ib_ah_attr->grh.traffic_class =
-                       (be32_to_cpu(path->sl_tclass_flowlabel) >> 20) & 0xff;
-               ib_ah_attr->grh.flow_label =
-                       be32_to_cpu(path->sl_tclass_flowlabel) & 0xfffff;
-               memcpy(ib_ah_attr->grh.dgid.raw,
-                       path->rgid, sizeof ib_ah_attr->grh.dgid.raw);
-       }
-}
-
-int mthca_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, int qp_attr_mask,
-                  struct ib_qp_init_attr *qp_init_attr)
-{
-       struct mthca_dev *dev = to_mdev(ibqp->device);
-       struct mthca_qp *qp = to_mqp(ibqp);
-       int err;
-       struct mthca_mailbox *mailbox;
-       struct mthca_qp_param *qp_param;
-       struct mthca_qp_context *context;
-       int mthca_state;
-       u8 status;
-
-       mailbox = mthca_alloc_mailbox(dev, GFP_KERNEL);
-       if (IS_ERR(mailbox))
-               return PTR_ERR(mailbox);
-
-       err = mthca_QUERY_QP(dev, qp->qpn, 0, mailbox, &status);
-       if (err)
-               goto out;
-       if (status) {
-               mthca_warn(dev, "QUERY_QP returned status %02x\n", status);
-               err = -EINVAL;
-               goto out;
-       }
-
-       qp_param    = mailbox->buf;
-       context     = &qp_param->context;
-       mthca_state = be32_to_cpu(context->flags) >> 28;
-
-       qp_attr->qp_state            = to_ib_qp_state(mthca_state);
-       qp_attr->cur_qp_state        = qp_attr->qp_state;
-       qp_attr->path_mtu            = context->mtu_msgmax >> 5;
-       qp_attr->path_mig_state      =
-               to_ib_mig_state((be32_to_cpu(context->flags) >> 11) & 0x3);
-       qp_attr->qkey                = be32_to_cpu(context->qkey);
-       qp_attr->rq_psn              = be32_to_cpu(context->rnr_nextrecvpsn) & 0xffffff;
-       qp_attr->sq_psn              = be32_to_cpu(context->next_send_psn) & 0xffffff;
-       qp_attr->dest_qp_num         = be32_to_cpu(context->remote_qpn) & 0xffffff;
-       qp_attr->qp_access_flags     =
-               to_ib_qp_access_flags(be32_to_cpu(context->params2));
-       qp_attr->cap.max_send_wr     = qp->sq.max;
-       qp_attr->cap.max_recv_wr     = qp->rq.max;
-       qp_attr->cap.max_send_sge    = qp->sq.max_gs;
-       qp_attr->cap.max_recv_sge    = qp->rq.max_gs;
-       qp_attr->cap.max_inline_data = qp->max_inline_data;
-
-       if (qp->transport == RC || qp->transport == UC) {
-               to_ib_ah_attr(dev, &qp_attr->ah_attr, &context->pri_path);
-               to_ib_ah_attr(dev, &qp_attr->alt_ah_attr, &context->alt_path);
-       }
-
-       qp_attr->pkey_index     = be32_to_cpu(context->pri_path.port_pkey) & 0x7f;
-       qp_attr->alt_pkey_index = be32_to_cpu(context->alt_path.port_pkey) & 0x7f;
-
-       /* qp_attr->en_sqd_async_notify is only applicable in modify qp */
-       qp_attr->sq_draining = mthca_state == MTHCA_QP_STATE_DRAINING;
-
-       qp_attr->max_rd_atomic = 1 << ((be32_to_cpu(context->params1) >> 21) & 0x7);
-
-       qp_attr->max_dest_rd_atomic =
-               1 << ((be32_to_cpu(context->params2) >> 21) & 0x7);
-       qp_attr->min_rnr_timer      =
-               (be32_to_cpu(context->rnr_nextrecvpsn) >> 24) & 0x1f;
-       qp_attr->port_num           = qp_attr->ah_attr.port_num;
-       qp_attr->timeout            = context->pri_path.ackto >> 3;
-       qp_attr->retry_cnt          = (be32_to_cpu(context->params1) >> 16) & 0x7;
-       qp_attr->rnr_retry          = context->pri_path.rnr_retry >> 5;
-       qp_attr->alt_port_num       = qp_attr->alt_ah_attr.port_num;
-       qp_attr->alt_timeout        = context->alt_path.ackto >> 3;
-       qp_init_attr->cap           = qp_attr->cap;
-
-out:
-       mthca_free_mailbox(dev, mailbox);
-       return err;
-}
-
-static int mthca_path_set(struct mthca_dev *dev, struct ib_ah_attr *ah,
-                         struct mthca_qp_path *path, u8 port)
+static void mthca_path_set(struct ib_ah_attr *ah, struct mthca_qp_path *path)
 {
        path->g_mylmc     = ah->src_path_bits & 0x7f;
        path->rlid        = cpu_to_be16(ah->dlid);
-       path->static_rate = mthca_get_rate(dev, ah->static_rate, port);
+       path->static_rate = !!ah->static_rate;
 
        if (ah->ah_flags & IB_AH_GRH) {
-               if (ah->grh.sgid_index >= dev->limits.gid_table_len) {
-                       mthca_dbg(dev, "sgid_index (%u) too large. max is %d\n",
-                                 ah->grh.sgid_index, dev->limits.gid_table_len-1);
-                       return -1;
-               }
-
                path->g_mylmc   |= 1 << 7;
                path->mgid_index = ah->grh.sgid_index;
                path->hop_limit  = ah->grh.hop_limit;
-               path->sl_tclass_flowlabel =
+               path->sl_tclass_flowlabel = 
                        cpu_to_be32((ah->sl << 28)                |
-                                   (ah->grh.traffic_class << 20) |
+                                   (ah->grh.traffic_class << 20) | 
                                    (ah->grh.flow_label));
                memcpy(path->rgid, ah->grh.dgid.raw, 16);
        } else
                path->sl_tclass_flowlabel = cpu_to_be32(ah->sl << 28);
-
-       return 0;
 }
 
 int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
@@ -537,14 +576,18 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
        struct mthca_mailbox *mailbox;
        struct mthca_qp_param *qp_param;
        struct mthca_qp_context *qp_context;
-       u32 sqd_event = 0;
+       u32 req_param, opt_param;
        u8 status;
-       int err = -EINVAL;
-
-       mutex_lock(&qp->mutex);
+       int err;
 
        if (attr_mask & IB_QP_CUR_STATE) {
-               cur_state = attr->cur_qp_state;
+               if (attr->cur_qp_state != IB_QPS_RTR &&
+                   attr->cur_qp_state != IB_QPS_RTS &&
+                   attr->cur_qp_state != IB_QPS_SQD &&
+                   attr->cur_qp_state != IB_QPS_SQE)
+                       return -EINVAL;
+               else
+                       cur_state = attr->cur_qp_state;
        } else {
                spin_lock_irq(&qp->sq.lock);
                spin_lock(&qp->rq.lock);
@@ -553,48 +596,70 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
                spin_unlock_irq(&qp->sq.lock);
        }
 
-       new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state;
+       if (attr_mask & IB_QP_STATE) {
+               if (attr->qp_state < 0 || attr->qp_state > IB_QPS_ERR)
+                       return -EINVAL;
+               new_state = attr->qp_state;
+       } else
+               new_state = cur_state;
+
+       if (state_table[cur_state][new_state].trans == MTHCA_TRANS_INVALID) {
+               mthca_dbg(dev, "Illegal QP transition "
+                         "%d->%d\n", cur_state, new_state);
+               return -EINVAL;
+       }
+
+       req_param = state_table[cur_state][new_state].req_param[qp->transport];
+       opt_param = state_table[cur_state][new_state].opt_param[qp->transport];
 
-       if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, attr_mask)) {
-               mthca_dbg(dev, "Bad QP transition (transport %d) "
-                         "%d->%d with attr 0x%08x\n",
-                         qp->transport, cur_state, new_state,
-                         attr_mask);
-               goto out;
+       if ((req_param & attr_mask) != req_param) {
+               mthca_dbg(dev, "QP transition "
+                         "%d->%d missing req attr 0x%08x\n",
+                         cur_state, new_state,
+                         req_param & ~attr_mask);
+               return -EINVAL;
        }
 
-       if ((attr_mask & IB_QP_PKEY_INDEX) &&
+       if (attr_mask & ~(req_param | opt_param | IB_QP_STATE)) {
+               mthca_dbg(dev, "QP transition (transport %d) "
+                         "%d->%d has extra attr 0x%08x\n",
+                         qp->transport,
+                         cur_state, new_state,
+                         attr_mask & ~(req_param | opt_param |
+                                                IB_QP_STATE));
+               return -EINVAL;
+       }
+
+       if ((attr_mask & IB_QP_PKEY_INDEX) && 
             attr->pkey_index >= dev->limits.pkey_table_len) {
-               mthca_dbg(dev, "P_Key index (%u) too large. max is %d\n",
-                         attr->pkey_index, dev->limits.pkey_table_len-1);
-               goto out;
+               mthca_dbg(dev, "PKey index (%u) too large. max is %d\n",
+                         attr->pkey_index,dev->limits.pkey_table_len-1); 
+               return -EINVAL;
        }
 
        if ((attr_mask & IB_QP_PORT) &&
            (attr->port_num == 0 || attr->port_num > dev->limits.num_ports)) {
                mthca_dbg(dev, "Port number (%u) is invalid\n", attr->port_num);
-               goto out;
+               return -EINVAL;
        }
 
        if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC &&
            attr->max_rd_atomic > dev->limits.max_qp_init_rdma) {
                mthca_dbg(dev, "Max rdma_atomic as initiator %u too large (max is %d)\n",
                          attr->max_rd_atomic, dev->limits.max_qp_init_rdma);
-               goto out;
+               return -EINVAL;
        }
 
        if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC &&
            attr->max_dest_rd_atomic > 1 << dev->qp_table.rdb_shift) {
                mthca_dbg(dev, "Max rdma_atomic as responder %u too large (max %d)\n",
                          attr->max_dest_rd_atomic, 1 << dev->qp_table.rdb_shift);
-               goto out;
+               return -EINVAL;
        }
 
        mailbox = mthca_alloc_mailbox(dev, GFP_KERNEL);
-       if (IS_ERR(mailbox)) {
-               err = PTR_ERR(mailbox);
-               goto out;
-       }
+       if (IS_ERR(mailbox))
+               return PTR_ERR(mailbox);
        qp_param = mailbox->buf;
        qp_context = &qp_param->context;
        memset(qp_param, 0, sizeof *qp_param);
@@ -623,14 +688,8 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
 
        if (qp->transport == MLX || qp->transport == UD)
                qp_context->mtu_msgmax = (IB_MTU_2048 << 5) | 11;
-       else if (attr_mask & IB_QP_PATH_MTU) {
-               if (attr->path_mtu < IB_MTU_256 || attr->path_mtu > IB_MTU_2048) {
-                       mthca_dbg(dev, "path MTU (%u) is invalid\n",
-                                 attr->path_mtu);
-                       goto out_mailbox;
-               }
+       else if (attr_mask & IB_QP_PATH_MTU)
                qp_context->mtu_msgmax = (attr->path_mtu << 5) | 31;
-       }
 
        if (mthca_is_memfree(dev)) {
                if (qp->rq.max)
@@ -656,7 +715,7 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
 
        if (qp->transport == MLX)
                qp_context->pri_path.port_pkey |=
-                       cpu_to_be32(qp->port << 24);
+                       cpu_to_be32(to_msqp(qp)->port << 24);
        else {
                if (attr_mask & IB_QP_PORT) {
                        qp_context->pri_path.port_pkey |=
@@ -674,15 +733,12 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
        if (attr_mask & IB_QP_RNR_RETRY) {
                qp_context->alt_path.rnr_retry = qp_context->pri_path.rnr_retry =
                        attr->rnr_retry << 5;
-               qp_param->opt_param_mask |= cpu_to_be32(MTHCA_QP_OPTPAR_RNR_RETRY |
+               qp_param->opt_param_mask |= cpu_to_be32(MTHCA_QP_OPTPAR_RNR_RETRY | 
                                                        MTHCA_QP_OPTPAR_ALT_RNR_RETRY);
        }
 
        if (attr_mask & IB_QP_AV) {
-               if (mthca_path_set(dev, &attr->ah_attr, &qp_context->pri_path,
-                                  attr_mask & IB_QP_PORT ? attr->port_num : qp->port))
-                       goto out_mailbox;
-
+               mthca_path_set(&attr->ah_attr, &qp_context->pri_path);
                qp_param->opt_param_mask |= cpu_to_be32(MTHCA_QP_OPTPAR_PRIMARY_ADDR_PATH);
        }
 
@@ -692,23 +748,14 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
        }
 
        if (attr_mask & IB_QP_ALT_PATH) {
-               if (attr->alt_pkey_index >= dev->limits.pkey_table_len) {
-                       mthca_dbg(dev, "Alternate P_Key index (%u) too large. max is %d\n",
-                                 attr->alt_pkey_index, dev->limits.pkey_table_len-1);
-                       goto out_mailbox;
-               }
-
                if (attr->alt_port_num == 0 || attr->alt_port_num > dev->limits.num_ports) {
-                       mthca_dbg(dev, "Alternate port number (%u) is invalid\n",
+                       mthca_dbg(dev, "Alternate port number (%u) is invalid\n", 
                                attr->alt_port_num);
-                       goto out_mailbox;
+                       return -EINVAL;
                }
 
-               if (mthca_path_set(dev, &attr->alt_ah_attr, &qp_context->alt_path,
-                                  attr->alt_ah_attr.port_num))
-                       goto out_mailbox;
-
-               qp_context->alt_path.port_pkey |= cpu_to_be32(attr->alt_pkey_index |
+               mthca_path_set(&attr->alt_ah_attr, &qp_context->alt_path);
+               qp_context->alt_path.port_pkey |= cpu_to_be32(attr->alt_pkey_index | 
                                                              attr->alt_port_num << 24);
                qp_context->alt_path.ackto = attr->alt_timeout << 3;
                qp_param->opt_param_mask |= cpu_to_be32(MTHCA_QP_OPTPAR_ALT_ADDR_PATH);
@@ -794,31 +841,23 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
                qp_context->srqn = cpu_to_be32(1 << 24 |
                                               to_msrq(ibqp->srq)->srqn);
 
-       if (cur_state == IB_QPS_RTS && new_state == IB_QPS_SQD  &&
-           attr_mask & IB_QP_EN_SQD_ASYNC_NOTIFY               &&
-           attr->en_sqd_async_notify)
-               sqd_event = 1 << 31;
-
-       err = mthca_MODIFY_QP(dev, cur_state, new_state, qp->qpn, 0,
-                             mailbox, sqd_event, &status);
-       if (err)
-               goto out_mailbox;
+       err = mthca_MODIFY_QP(dev, state_table[cur_state][new_state].trans,
+                             qp->qpn, 0, mailbox, 0, &status);
        if (status) {
-               mthca_warn(dev, "modify QP %d->%d returned status %02x.\n",
-                          cur_state, new_state, status);
+               mthca_warn(dev, "modify QP %d returned status %02x.\n",
+                          state_table[cur_state][new_state].trans, status);
                err = -EINVAL;
-               goto out_mailbox;
        }
 
-       qp->state = new_state;
-       if (attr_mask & IB_QP_ACCESS_FLAGS)
-               qp->atomic_rd_en = attr->qp_access_flags;
-       if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC)
-               qp->resp_depth = attr->max_dest_rd_atomic;
-       if (attr_mask & IB_QP_PORT)
-               qp->port = attr->port_num;
-       if (attr_mask & IB_QP_ALT_PATH)
-               qp->alt_port = attr->alt_port_num;
+       if (!err) {
+               qp->state = new_state;
+               if (attr_mask & IB_QP_ACCESS_FLAGS)
+                       qp->atomic_rd_en = attr->qp_access_flags;
+               if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC)
+                       qp->resp_depth = attr->max_dest_rd_atomic;
+       }
+
+       mthca_free_mailbox(dev, mailbox);
 
        if (is_sqp(dev, qp))
                store_attrs(to_msqp(qp), attr, attr_mask);
@@ -830,30 +869,30 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
        if (is_qp0(dev, qp)) {
                if (cur_state != IB_QPS_RTR &&
                    new_state == IB_QPS_RTR)
-                       init_port(dev, qp->port);
+                       init_port(dev, to_msqp(qp)->port);
 
                if (cur_state != IB_QPS_RESET &&
                    cur_state != IB_QPS_ERR &&
                    (new_state == IB_QPS_RESET ||
                     new_state == IB_QPS_ERR))
-                       mthca_CLOSE_IB(dev, qp->port, &status);
+                       mthca_CLOSE_IB(dev, to_msqp(qp)->port, &status);
        }
 
        /*
         * If we moved a kernel QP to RESET, clean up all old CQ
         * entries and reinitialize the QP.
         */
-       if (new_state == IB_QPS_RESET && !qp->ibqp.uobject) {
-               mthca_cq_clean(dev, to_mcq(qp->ibqp.send_cq), qp->qpn,
+       if (!err && new_state == IB_QPS_RESET && !qp->ibqp.uobject) {
+               mthca_cq_clean(dev, to_mcq(qp->ibqp.send_cq)->cqn, qp->qpn,
                               qp->ibqp.srq ? to_msrq(qp->ibqp.srq) : NULL);
                if (qp->ibqp.send_cq != qp->ibqp.recv_cq)
-                       mthca_cq_clean(dev, to_mcq(qp->ibqp.recv_cq), qp->qpn,
+                       mthca_cq_clean(dev, to_mcq(qp->ibqp.recv_cq)->cqn, qp->qpn,
                                       qp->ibqp.srq ? to_msrq(qp->ibqp.srq) : NULL);
 
-               mthca_wq_reset(&qp->sq);
+               mthca_wq_init(&qp->sq);
                qp->sq.last = get_send_wqe(qp, qp->sq.max - 1);
 
-               mthca_wq_reset(&qp->rq);
+               mthca_wq_init(&qp->rq);
                qp->rq.last = get_recv_wqe(qp, qp->rq.max - 1);
 
                if (mthca_is_memfree(dev)) {
@@ -862,11 +901,6 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
                }
        }
 
-out_mailbox:
-       mthca_free_mailbox(dev, mailbox);
-
-out:
-       mutex_unlock(&qp->mutex);
        return err;
 }
 
@@ -1044,10 +1078,10 @@ static int mthca_map_memfree(struct mthca_dev *dev,
                if (ret)
                        goto err_qpc;
 
-               ret = mthca_table_get(dev, dev->qp_table.rdb_table,
-                                     qp->qpn << dev->qp_table.rdb_shift);
-               if (ret)
-                       goto err_eqpc;
+               ret = mthca_table_get(dev, dev->qp_table.rdb_table,
+                                     qp->qpn << dev->qp_table.rdb_shift);
+               if (ret)
+                       goto err_eqpc;
 
        }
 
@@ -1110,18 +1144,14 @@ static int mthca_alloc_qp_common(struct mthca_dev *dev,
        int ret;
        int i;
 
-       qp->refcount = 1;
+       atomic_set(&qp->refcount, 1);
        init_waitqueue_head(&qp->wait);
-       mutex_init(&qp->mutex);
        qp->state        = IB_QPS_RESET;
        qp->atomic_rd_en = 0;
        qp->resp_depth   = 0;
        qp->sq_policy    = send_policy;
-       mthca_wq_reset(&qp->sq);
-       mthca_wq_reset(&qp->rq);
-
-       spin_lock_init(&qp->sq.lock);
-       spin_lock_init(&qp->rq.lock);
+       mthca_wq_init(&qp->sq);
+       mthca_wq_init(&qp->rq);
 
        ret = mthca_map_memfree(dev, qp);
        if (ret)
@@ -1232,6 +1262,10 @@ int mthca_alloc_qp(struct mthca_dev *dev,
 {
        int err;
 
+       err = mthca_set_qp_size(dev, cap, pd, qp);
+       if (err)
+               return err;
+
        switch (type) {
        case IB_QPT_RC: qp->transport = RC; break;
        case IB_QPT_UC: qp->transport = UC; break;
@@ -1239,17 +1273,10 @@ int mthca_alloc_qp(struct mthca_dev *dev,
        default: return -EINVAL;
        }
 
-       err = mthca_set_qp_size(dev, cap, pd, qp);
-       if (err)
-               return err;
-
        qp->qpn = mthca_alloc(&dev->qp_table.alloc);
        if (qp->qpn == -1)
                return -ENOMEM;
 
-       /* initialize port to zero for error-catching. */
-       qp->port = 0;
-
        err = mthca_alloc_qp_common(dev, pd, send_cq, recv_cq,
                                    send_policy, qp);
        if (err) {
@@ -1265,32 +1292,6 @@ int mthca_alloc_qp(struct mthca_dev *dev,
        return 0;
 }
 
-static void mthca_lock_cqs(struct mthca_cq *send_cq, struct mthca_cq *recv_cq)
-{
-       if (send_cq == recv_cq)
-               spin_lock_irq(&send_cq->lock);
-       else if (send_cq->cqn < recv_cq->cqn) {
-               spin_lock_irq(&send_cq->lock);
-               spin_lock_nested(&recv_cq->lock, SINGLE_DEPTH_NESTING);
-       } else {
-               spin_lock_irq(&recv_cq->lock);
-               spin_lock_nested(&send_cq->lock, SINGLE_DEPTH_NESTING);
-       }
-}
-
-static void mthca_unlock_cqs(struct mthca_cq *send_cq, struct mthca_cq *recv_cq)
-{
-       if (send_cq == recv_cq)
-               spin_unlock_irq(&send_cq->lock);
-       else if (send_cq->cqn < recv_cq->cqn) {
-               spin_unlock(&recv_cq->lock);
-               spin_unlock_irq(&send_cq->lock);
-       } else {
-               spin_unlock(&send_cq->lock);
-               spin_unlock_irq(&recv_cq->lock);
-       }
-}
-
 int mthca_alloc_sqp(struct mthca_dev *dev,
                    struct mthca_pd *pd,
                    struct mthca_cq *send_cq,
@@ -1304,7 +1305,6 @@ int mthca_alloc_sqp(struct mthca_dev *dev,
        u32 mqpn = qpn * 2 + dev->qp_table.sqp_start + port - 1;
        int err;
 
-       sqp->qp.transport = MLX;
        err = mthca_set_qp_size(dev, cap, pd, &sqp->qp);
        if (err)
                return err;
@@ -1325,7 +1325,7 @@ int mthca_alloc_sqp(struct mthca_dev *dev,
        if (err)
                goto err_out;
 
-       sqp->qp.port      = port;
+       sqp->port = port;
        sqp->qp.qpn       = mqpn;
        sqp->qp.transport = MLX;
 
@@ -1343,13 +1343,17 @@ int mthca_alloc_sqp(struct mthca_dev *dev,
         * Lock CQs here, so that CQ polling code can do QP lookup
         * without taking a lock.
         */
-       mthca_lock_cqs(send_cq, recv_cq);
+       spin_lock_irq(&send_cq->lock);
+       if (send_cq != recv_cq)
+               spin_lock(&recv_cq->lock);
 
        spin_lock(&dev->qp_table.lock);
        mthca_array_clear(&dev->qp_table.qp, mqpn);
        spin_unlock(&dev->qp_table.lock);
 
-       mthca_unlock_cqs(send_cq, recv_cq);
+       if (send_cq != recv_cq)
+               spin_unlock(&recv_cq->lock);
+       spin_unlock_irq(&send_cq->lock);
 
  err_out:
        dma_free_coherent(&dev->pdev->dev, sqp->header_buf_size,
@@ -1358,17 +1362,6 @@ int mthca_alloc_sqp(struct mthca_dev *dev,
        return err;
 }
 
-static inline int get_qp_refcount(struct mthca_dev *dev, struct mthca_qp *qp)
-{
-       int c;
-
-       spin_lock_irq(&dev->qp_table.lock);
-       c = qp->refcount;
-       spin_unlock_irq(&dev->qp_table.lock);
-
-       return c;
-}
-
 void mthca_free_qp(struct mthca_dev *dev,
                   struct mthca_qp *qp)
 {
@@ -1383,21 +1376,24 @@ void mthca_free_qp(struct mthca_dev *dev,
         * Lock CQs here, so that CQ polling code can do QP lookup
         * without taking a lock.
         */
-       mthca_lock_cqs(send_cq, recv_cq);
+       spin_lock_irq(&send_cq->lock);
+       if (send_cq != recv_cq)
+               spin_lock(&recv_cq->lock);
 
        spin_lock(&dev->qp_table.lock);
        mthca_array_clear(&dev->qp_table.qp,
                          qp->qpn & (dev->limits.num_qps - 1));
-       --qp->refcount;
        spin_unlock(&dev->qp_table.lock);
 
-       mthca_unlock_cqs(send_cq, recv_cq);
+       if (send_cq != recv_cq)
+               spin_unlock(&recv_cq->lock);
+       spin_unlock_irq(&send_cq->lock);
 
-       wait_event(qp->wait, !get_qp_refcount(dev, qp));
+       atomic_dec(&qp->refcount);
+       wait_event(qp->wait, !atomic_read(&qp->refcount));
 
        if (qp->state != IB_QPS_RESET)
-               mthca_MODIFY_QP(dev, qp->state, IB_QPS_RESET, qp->qpn, 0,
-                               NULL, 0, &status);
+               mthca_MODIFY_QP(dev, MTHCA_TRANS_ANY2RST, qp->qpn, 0, NULL, 0, &status);
 
        /*
         * If this is a userspace QP, the buffers, MR, CQs and so on
@@ -1405,10 +1401,10 @@ void mthca_free_qp(struct mthca_dev *dev,
         * unref the mem-free tables and free the QPN in our table.
         */
        if (!qp->ibqp.uobject) {
-               mthca_cq_clean(dev, to_mcq(qp->ibqp.send_cq), qp->qpn,
+               mthca_cq_clean(dev, to_mcq(qp->ibqp.send_cq)->cqn, qp->qpn,
                               qp->ibqp.srq ? to_msrq(qp->ibqp.srq) : NULL);
                if (qp->ibqp.send_cq != qp->ibqp.recv_cq)
-                       mthca_cq_clean(dev, to_mcq(qp->ibqp.recv_cq), qp->qpn,
+                       mthca_cq_clean(dev, to_mcq(qp->ibqp.recv_cq)->cqn, qp->qpn,
                                       qp->ibqp.srq ? to_msrq(qp->ibqp.srq) : NULL);
 
                mthca_free_memfree(dev, qp);
@@ -1471,10 +1467,10 @@ static int build_mlx_header(struct mthca_dev *dev, struct mthca_sqp *sqp,
                sqp->ud_header.lrh.source_lid = IB_LID_PERMISSIVE;
        sqp->ud_header.bth.solicited_event = !!(wr->send_flags & IB_SEND_SOLICITED);
        if (!sqp->qp.ibqp.qp_num)
-               ib_get_cached_pkey(&dev->ib_dev, sqp->qp.port,
+               ib_get_cached_pkey(&dev->ib_dev, sqp->port,
                                   sqp->pkey_index, &pkey);
        else
-               ib_get_cached_pkey(&dev->ib_dev, sqp->qp.port,
+               ib_get_cached_pkey(&dev->ib_dev, sqp->port,
                                   wr->wr.ud.pkey_index, &pkey);
        sqp->ud_header.bth.pkey = cpu_to_be16(pkey);
        sqp->ud_header.bth.destination_qpn = cpu_to_be32(wr->wr.ud.remote_qpn);
@@ -1526,7 +1522,7 @@ int mthca_tavor_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
        int i;
        int size;
        int size0 = 0;
-       u32 f0;
+       u32 f0 = 0;
        int ind;
        u8 op0 = 0;
 
@@ -1703,15 +1699,11 @@ int mthca_tavor_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
                                    mthca_opcode[wr->opcode]);
                wmb();
                ((struct mthca_next_seg *) prev_wqe)->ee_nds =
-                       cpu_to_be32((size0 ? 0 : MTHCA_NEXT_DBD) | size |
-                                   ((wr->send_flags & IB_SEND_FENCE) ?
-                                   MTHCA_NEXT_FENCE : 0));
+                       cpu_to_be32((size0 ? 0 : MTHCA_NEXT_DBD) | size);
 
                if (!size0) {
                        size0 = size;
                        op0   = mthca_opcode[wr->opcode];
-                       f0    = wr->send_flags & IB_SEND_FENCE ?
-                               MTHCA_SEND_DOORBELL_FENCE : 0;
                }
 
                ++ind;
@@ -1732,11 +1724,6 @@ out:
                mthca_write64(doorbell,
                              dev->kar + MTHCA_SEND_DOORBELL,
                              MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock));
-               /*
-                * Make sure doorbells don't leak out of SQ spinlock
-                * and reach the HCA out of order:
-                */
-               mmiowb();
        }
 
        qp->sq.next_ind = ind;
@@ -1768,7 +1755,23 @@ int mthca_tavor_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
 
        ind = qp->rq.next_ind;
 
-       for (nreq = 0; wr; wr = wr->next) {
+       for (nreq = 0; wr; ++nreq, wr = wr->next) {
+               if (unlikely(nreq == MTHCA_TAVOR_MAX_WQES_PER_RECV_DB)) {
+                       nreq = 0;
+
+                       doorbell[0] = cpu_to_be32((qp->rq.next_ind << qp->rq.wqe_shift) | size0);
+                       doorbell[1] = cpu_to_be32(qp->qpn << 8);
+
+                       wmb();
+
+                       mthca_write64(doorbell,
+                                     dev->kar + MTHCA_RECEIVE_DOORBELL,
+                                     MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock));
+
+                       qp->rq.head += MTHCA_TAVOR_MAX_WQES_PER_RECV_DB;
+                       size0 = 0;
+               }
+
                if (mthca_wq_overflow(&qp->rq, nreq, qp->ibqp.recv_cq)) {
                        mthca_err(dev, "RQ %06x full (%u head, %u tail,"
                                        " %d max, %d nreq)\n", qp->qpn,
@@ -1822,23 +1825,6 @@ int mthca_tavor_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
                ++ind;
                if (unlikely(ind >= qp->rq.max))
                        ind -= qp->rq.max;
-
-               ++nreq;
-               if (unlikely(nreq == MTHCA_TAVOR_MAX_WQES_PER_RECV_DB)) {
-                       nreq = 0;
-
-                       doorbell[0] = cpu_to_be32((qp->rq.next_ind << qp->rq.wqe_shift) | size0);
-                       doorbell[1] = cpu_to_be32(qp->qpn << 8);
-
-                       wmb();
-
-                       mthca_write64(doorbell,
-                                     dev->kar + MTHCA_RECEIVE_DOORBELL,
-                                     MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock));
-
-                       qp->rq.head += MTHCA_TAVOR_MAX_WQES_PER_RECV_DB;
-                       size0 = 0;
-               }
        }
 
 out:
@@ -1856,12 +1842,6 @@ out:
        qp->rq.next_ind = ind;
        qp->rq.head    += nreq;
 
-       /*
-        * Make sure doorbells don't leak out of RQ spinlock and reach
-        * the HCA out of order:
-        */
-       mmiowb();
-
        spin_unlock_irqrestore(&qp->rq.lock, flags);
        return err;
 }
@@ -1880,7 +1860,7 @@ int mthca_arbel_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
        int i;
        int size;
        int size0 = 0;
-       u32 f0;
+       u32 f0 = 0;
        int ind;
        u8 op0 = 0;
 
@@ -2081,15 +2061,11 @@ int mthca_arbel_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
                                    mthca_opcode[wr->opcode]);
                wmb();
                ((struct mthca_next_seg *) prev_wqe)->ee_nds =
-                       cpu_to_be32(MTHCA_NEXT_DBD | size |
-                                   ((wr->send_flags & IB_SEND_FENCE) ?
-                                    MTHCA_NEXT_FENCE : 0));
+                       cpu_to_be32(MTHCA_NEXT_DBD | size);
 
                if (!size0) {
                        size0 = size;
                        op0   = mthca_opcode[wr->opcode];
-                       f0    = wr->send_flags & IB_SEND_FENCE ?
-                               MTHCA_SEND_DOORBELL_FENCE : 0;
                }
 
                ++ind;
@@ -2123,12 +2099,6 @@ out:
                              MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock));
        }
 
-       /*
-        * Make sure doorbells don't leak out of SQ spinlock and reach
-        * the HCA out of order:
-        */
-       mmiowb();
-
        spin_unlock_irqrestore(&qp->sq.lock, flags);
        return err;
 }
@@ -2145,7 +2115,7 @@ int mthca_arbel_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
        int i;
        void *wqe;
 
-       spin_lock_irqsave(&qp->rq.lock, flags);
+       spin_lock_irqsave(&qp->rq.lock, flags);
 
        /* XXX check that state is OK to post receive */
 
@@ -2212,8 +2182,8 @@ out:
        return err;
 }
 
-void mthca_free_err_wqe(struct mthca_dev *dev, struct mthca_qp *qp, int is_send,
-                       int index, int *dbd, __be32 *new_wqe)
+int mthca_free_err_wqe(struct mthca_dev *dev, struct mthca_qp *qp, int is_send,
+                      int index, int *dbd, __be32 *new_wqe)
 {
        struct mthca_next_seg *next;
 
@@ -2223,7 +2193,7 @@ void mthca_free_err_wqe(struct mthca_dev *dev, struct mthca_qp *qp, int is_send,
         */
        if (qp->ibqp.srq) {
                *new_wqe = 0;
-               return;
+               return 0;
        }
 
        if (is_send)
@@ -2237,6 +2207,8 @@ void mthca_free_err_wqe(struct mthca_dev *dev, struct mthca_qp *qp, int is_send,
                        (next->ee_nds & cpu_to_be32(0x3f));
        else
                *new_wqe = 0;
+
+       return 0;
 }
 
 int __devinit mthca_init_qp_table(struct mthca_dev *dev)
@@ -2293,7 +2265,7 @@ int __devinit mthca_init_qp_table(struct mthca_dev *dev)
        return err;
 }
 
-void mthca_cleanup_qp_table(struct mthca_dev *dev)
+void __devexit mthca_cleanup_qp_table(struct mthca_dev *dev)
 {
        int i;
        u8 status;