31 files changed, 227 insertions, 183 deletions
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index f1e82a92e61e..5130fc55b8e2 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -927,8 +927,7 @@ int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, __be64 service_mask,
        unsigned long flags;
        int ret = 0;
-        service_mask = service_mask ? service_mask :
+        service_mask = service_mask ? service_mask : ~cpu_to_be64(0);
-                       __constant_cpu_to_be64(~0ULL);
        service_id &= service_mask;
        if ((service_id & IB_SERVICE_ID_AGN_MASK) == IB_CM_ASSIGN_SERVICE_ID &&
            (service_id != IB_CM_ASSIGN_SERVICE_ID))
@@ -954,7 +953,7 @@ int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, __be64 service_mask,
        spin_lock_irqsave(&cm.lock, flags);
        if (service_id == IB_CM_ASSIGN_SERVICE_ID) {
                cm_id->service_id = cpu_to_be64(cm.listen_service_id++);
-                cm_id->service_mask = __constant_cpu_to_be64(~0ULL);
+                cm_id->service_mask = ~cpu_to_be64(0);
        } else {
                cm_id->service_id = service_id;
                cm_id->service_mask = service_mask;
@@ -1134,7 +1133,7 @@ int ib_send_cm_req(struct ib_cm_id *cm_id,
                        goto error1;
        }
        cm_id->service_id = param->service_id;
-        cm_id->service_mask = __constant_cpu_to_be64(~0ULL);
+        cm_id->service_mask = ~cpu_to_be64(0);
        cm_id_priv->timeout_ms = cm_convert_to_ms(
                                    param->primary_path->packet_life_time) * 2 +
                                 cm_convert_to_ms(
@@ -1545,7 +1544,7 @@ static int cm_req_handler(struct cm_work *work)
        cm_id_priv->id.cm_handler = listen_cm_id_priv->id.cm_handler;
        cm_id_priv->id.context = listen_cm_id_priv->id.context;
        cm_id_priv->id.service_id = req_msg->service_id;
-        cm_id_priv->id.service_mask = __constant_cpu_to_be64(~0ULL);
+        cm_id_priv->id.service_mask = ~cpu_to_be64(0);
        cm_process_routed_req(req_msg, work->mad_recv_wc->wc);
        cm_format_paths_from_req(req_msg, &work->path[0], &work->path[1]);
@@ -2898,7 +2897,7 @@ int ib_send_cm_sidr_req(struct ib_cm_id *cm_id,
                goto out;
        cm_id->service_id = param->service_id;
-        cm_id->service_mask = __constant_cpu_to_be64(~0ULL);
+        cm_id->service_mask = ~cpu_to_be64(0);
        cm_id_priv->timeout_ms = param->timeout_ms;
        cm_id_priv->max_cm_retries = param->max_cm_retries;
        ret = cm_alloc_msg(cm_id_priv, &msg);
@@ -2992,7 +2991,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
        cm_id_priv->id.cm_handler = cur_cm_id_priv->id.cm_handler;
        cm_id_priv->id.context = cur_cm_id_priv->id.context;
        cm_id_priv->id.service_id = sidr_req_msg->service_id;
-        cm_id_priv->id.service_mask = __constant_cpu_to_be64(~0ULL);
+        cm_id_priv->id.service_mask = ~cpu_to_be64(0);
        cm_format_sidr_req_event(work, &cur_cm_id_priv->id);
        cm_process_work(cm_id_priv, work);
@@ -3789,7 +3788,7 @@ static int __init ib_cm_init(void)
        rwlock_init(&cm.device_lock);
        spin_lock_init(&cm.lock);
        cm.listen_service_table = RB_ROOT;
-        cm.listen_service_id = __constant_be64_to_cpu(IB_CM_ASSIGN_SERVICE_ID);
+        cm.listen_service_id = be64_to_cpu(IB_CM_ASSIGN_SERVICE_ID);
        cm.remote_id_table = RB_ROOT;
        cm.remote_qp_table = RB_ROOT;
        cm.remote_sidr_table = RB_ROOT;
diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h
index aec9c7af825d..7e63c08f697c 100644
--- a/drivers/infiniband/core/cm_msgs.h
+++ b/drivers/infiniband/core/cm_msgs.h
@@ -44,17 +44,17 @@
 #define IB_CM_CLASS_VERSION     2 /* IB specification 1.2 */
-#define CM_REQ_ATTR_ID      __constant_htons(0x0010)
+#define CM_REQ_ATTR_ID          cpu_to_be16(0x0010)
-#define CM_MRA_ATTR_ID      __constant_htons(0x0011)
+#define CM_MRA_ATTR_ID          cpu_to_be16(0x0011)
-#define CM_REJ_ATTR_ID      __constant_htons(0x0012)
+#define CM_REJ_ATTR_ID          cpu_to_be16(0x0012)
-#define CM_REP_ATTR_ID      __constant_htons(0x0013)
+#define CM_REP_ATTR_ID          cpu_to_be16(0x0013)
-#define CM_RTU_ATTR_ID      __constant_htons(0x0014)
+#define CM_RTU_ATTR_ID          cpu_to_be16(0x0014)
-#define CM_DREQ_ATTR_ID     __constant_htons(0x0015)
+#define CM_DREQ_ATTR_ID         cpu_to_be16(0x0015)
-#define CM_DREP_ATTR_ID     __constant_htons(0x0016)
+#define CM_DREP_ATTR_ID         cpu_to_be16(0x0016)
-#define CM_SIDR_REQ_ATTR_ID __constant_htons(0x0017)
+#define CM_SIDR_REQ_ATTR_ID     cpu_to_be16(0x0017)
-#define CM_SIDR_REP_ATTR_ID __constant_htons(0x0018)
+#define CM_SIDR_REP_ATTR_ID     cpu_to_be16(0x0018)
-#define CM_LAP_ATTR_ID      __constant_htons(0x0019)
+#define CM_LAP_ATTR_ID          cpu_to_be16(0x0019)
-#define CM_APR_ATTR_ID      __constant_htons(0x001A)
+#define CM_APR_ATTR_ID          cpu_to_be16(0x001A)
 enum cm_msg_sequence {
        CM_MSG_SEQUENCE_REQ,
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 7913b804311e..d1fba4153332 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -193,7 +193,7 @@ void ib_dealloc_device(struct ib_device *device)
        BUG_ON(device->reg_state != IB_DEV_UNREGISTERED);
-        ib_device_unregister_sysfs(device);
+        kobject_put(&device->dev.kobj);
 }
 EXPORT_SYMBOL(ib_dealloc_device);
@@ -348,6 +348,8 @@ void ib_unregister_device(struct ib_device *device)
        mutex_unlock(&device_mutex);
+        ib_device_unregister_sysfs(device);
        spin_lock_irqsave(&device->client_data_lock, flags);
        list_for_each_entry_safe(context, tmp, &device->client_data_list, list)
                kfree(context);
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 5c54fc2350be..de922a04ca2d 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -301,6 +301,16 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,
        mad_agent_priv->agent.context = context;
        mad_agent_priv->agent.qp = port_priv->qp_info[qpn].qp;
        mad_agent_priv->agent.port_num = port_num;
+        spin_lock_init(&mad_agent_priv->lock);
+        INIT_LIST_HEAD(&mad_agent_priv->send_list);
+        INIT_LIST_HEAD(&mad_agent_priv->wait_list);
+        INIT_LIST_HEAD(&mad_agent_priv->done_list);
+        INIT_LIST_HEAD(&mad_agent_priv->rmpp_list);
+        INIT_DELAYED_WORK(&mad_agent_priv->timed_work, timeout_sends);
+        INIT_LIST_HEAD(&mad_agent_priv->local_list);
+        INIT_WORK(&mad_agent_priv->local_work, local_completions);
+        atomic_set(&mad_agent_priv->refcount, 1);
+        init_completion(&mad_agent_priv->comp);
        spin_lock_irqsave(&port_priv->reg_lock, flags);
        mad_agent_priv->agent.hi_tid = ++ib_mad_client_id;
@@ -350,17 +360,6 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,
        list_add_tail(&mad_agent_priv->agent_list, &port_priv->agent_list);
        spin_unlock_irqrestore(&port_priv->reg_lock, flags);
-        spin_lock_init(&mad_agent_priv->lock);
-        INIT_LIST_HEAD(&mad_agent_priv->send_list);
-        INIT_LIST_HEAD(&mad_agent_priv->wait_list);
-        INIT_LIST_HEAD(&mad_agent_priv->done_list);
-        INIT_LIST_HEAD(&mad_agent_priv->rmpp_list);
-        INIT_DELAYED_WORK(&mad_agent_priv->timed_work, timeout_sends);
-        INIT_LIST_HEAD(&mad_agent_priv->local_list);
-        INIT_WORK(&mad_agent_priv->local_work, local_completions);
-        atomic_set(&mad_agent_priv->refcount, 1);
-        init_completion(&mad_agent_priv->comp);
        return &mad_agent_priv->agent;
 error4:
@@ -743,9 +742,7 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv,
                break;
        case IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_CONSUMED:
                kmem_cache_free(ib_mad_cache, mad_priv);
-                kfree(local);
+                break;
-                ret = 1;
-                goto out;
        case IB_MAD_RESULT_SUCCESS:
                /* Treat like an incoming receive MAD */
                port_priv = ib_get_mad_port(mad_agent_priv->agent.device,
@@ -756,10 +753,12 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv,
                                                        &mad_priv->mad.mad);
                }
                if (!port_priv || !recv_mad_agent) {
+                        /*
+                         * No receiving agent so drop packet and
+                         * generate send completion.
+                         */
                        kmem_cache_free(ib_mad_cache, mad_priv);
-                        kfree(local);
+                        break;
-                        ret = 0;
-                        goto out;
                }
                local->mad_priv = mad_priv;
                local->recv_mad_agent = recv_mad_agent;
@@ -2356,7 +2355,7 @@ static void local_completions(struct work_struct *work)
        struct ib_mad_local_private *local;
        struct ib_mad_agent_private *recv_mad_agent;
        unsigned long flags;
-        int recv = 0;
+        int free_mad;
        struct ib_wc wc;
        struct ib_mad_send_wc mad_send_wc;
@@ -2370,14 +2369,15 @@ static void local_completions(struct work_struct *work)
                                   completion_list);
                list_del(&local->completion_list);
                spin_unlock_irqrestore(&mad_agent_priv->lock, flags);
+                free_mad = 0;
                if (local->mad_priv) {
                        recv_mad_agent = local->recv_mad_agent;
                        if (!recv_mad_agent) {
                                printk(KERN_ERR PFX "No receive MAD agent for local completion\n");
+                                free_mad = 1;
                                goto local_send_completion;
                        }
-                        recv = 1;
                        /*
                         * Defined behavior is to complete response
                         * before request
@@ -2422,7 +2422,7 @@ local_send_completion:
                spin_lock_irqsave(&mad_agent_priv->lock, flags);
                atomic_dec(&mad_agent_priv->refcount);
-                if (!recv)
+                if (free_mad)
                        kmem_cache_free(ib_mad_cache, local->mad_priv);
                kfree(local);
        }
diff --git a/drivers/infiniband/core/mad_rmpp.c b/drivers/infiniband/core/mad_rmpp.c
index 3af2b84cd838..57a3c6f947b2 100644
--- a/drivers/infiniband/core/mad_rmpp.c
+++ b/drivers/infiniband/core/mad_rmpp.c
@@ -735,7 +735,7 @@ process_rmpp_data(struct ib_mad_agent_private *agent,
                goto bad;
        }
-        if (rmpp_hdr->seg_num == __constant_htonl(1)) {
+        if (rmpp_hdr->seg_num == cpu_to_be32(1)) {
                if (!(ib_get_rmpp_flags(rmpp_hdr) & IB_MGMT_RMPP_FLAG_FIRST)) {
                        rmpp_status = IB_MGMT_RMPP_STATUS_BAD_SEG;
                        goto bad;
diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index 7863a50d56f2..1865049e80f7 100644
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -395,6 +395,8 @@ static void update_sm_ah(struct work_struct *work)
        }
        spin_lock_irq(&port->ah_lock);
+        if (port->sm_ah)
+                kref_put(&port->sm_ah->ref, free_sm_ah);
        port->sm_ah = new_ah;
        spin_unlock_irq(&port->ah_lock);
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index b43f7d3682d3..5c04cfb54cb9 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -66,11 +66,6 @@ struct port_table_attribute {
        int                     index;
 };
-static inline int ibdev_is_alive(const struct ib_device *dev)
-{
-        return dev->reg_state == IB_DEV_REGISTERED;
-}
 static ssize_t port_attr_show(struct kobject *kobj,
                              struct attribute *attr, char *buf)
 {
@@ -80,8 +75,6 @@ static ssize_t port_attr_show(struct kobject *kobj,
        if (!port_attr->show)
                return -EIO;
-        if (!ibdev_is_alive(p->ibdev))
-                return -ENODEV;
        return port_attr->show(p, port_attr, buf);
 }
@@ -562,9 +555,6 @@ static ssize_t show_node_type(struct device *device,
 {
        struct ib_device *dev = container_of(device, struct ib_device, dev);
-        if (!ibdev_is_alive(dev))
-                return -ENODEV;
        switch (dev->node_type) {
        case RDMA_NODE_IB_CA:     return sprintf(buf, "%d: CA\n", dev->node_type);
        case RDMA_NODE_RNIC:      return sprintf(buf, "%d: RNIC\n", dev->node_type);
@@ -581,9 +571,6 @@ static ssize_t show_sys_image_guid(struct device *device,
        struct ib_device_attr attr;
        ssize_t ret;
-        if (!ibdev_is_alive(dev))
-                return -ENODEV;
        ret = ib_query_device(dev, &attr);
        if (ret)
                return ret;
@@ -600,9 +587,6 @@ static ssize_t show_node_guid(struct device *device,
 {
        struct ib_device *dev = container_of(device, struct ib_device, dev);
-        if (!ibdev_is_alive(dev))
-                return -ENODEV;
        return sprintf(buf, "%04x:%04x:%04x:%04x\n",
                       be16_to_cpu(((__be16 *) &dev->node_guid)[0]),
                       be16_to_cpu(((__be16 *) &dev->node_guid)[1]),
@@ -848,6 +832,9 @@ void ib_device_unregister_sysfs(struct ib_device *device)
        struct kobject *p, *t;
        struct ib_port *port;
+        /* Hold kobject until ib_dealloc_device() */
+        kobject_get(&device->dev.kobj);
        list_for_each_entry_safe(p, t, &device->port_list, entry) {
                list_del(&p->entry);
                port = container_of(p, struct ib_port, kobj);
diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.c b/drivers/infiniband/hw/cxgb3/cxio_hal.c
index 4dcf08b3fd83..d4d7204c11ed 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;
@@ -938,6 +938,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) {
@@ -1204,11 +1221,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;
        }
@@ -1223,6 +1241,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));
@@ -1277,6 +1302,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 656fe47bc84f..e44dc2289471 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;
 };
 static inline int cxio_num_stags(struct cxio_rdev *rdev_p)
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.sgl[0].len = cpu_to_be32(0);
-                wqe->write.num_sgle = __constant_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) %
+                offset += mhp->attr.va_fbo &
-                          (1UL << (12 + mhp->attr.page_size));
+                          ((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) %
+                wqe->recv.sgl[i].to = cpu_to_be64(((u32)wr->sg_list[i].addr) &
-                                (1UL << (12 + page_size[i])));
+                                ((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]);
diff --git a/drivers/infiniband/hw/ehca/ehca_sqp.c b/drivers/infiniband/hw/ehca/ehca_sqp.c
index 44447aaa5501..c568b28f4e20 100644
--- a/drivers/infiniband/hw/ehca/ehca_sqp.c
+++ b/drivers/infiniband/hw/ehca/ehca_sqp.c
@@ -46,11 +46,11 @@
 #include "ehca_iverbs.h"
 #include "hcp_if.h"
-#define IB_MAD_STATUS_REDIRECT          __constant_htons(0x0002)
+#define IB_MAD_STATUS_REDIRECT          cpu_to_be16(0x0002)
-#define IB_MAD_STATUS_UNSUP_VERSION     __constant_htons(0x0004)
+#define IB_MAD_STATUS_UNSUP_VERSION     cpu_to_be16(0x0004)
-#define IB_MAD_STATUS_UNSUP_METHOD      __constant_htons(0x0008)
+#define IB_MAD_STATUS_UNSUP_METHOD      cpu_to_be16(0x0008)
-#define IB_PMA_CLASS_PORT_INFO          __constant_htons(0x0001)
+#define IB_PMA_CLASS_PORT_INFO          cpu_to_be16(0x0001)
 /**
 * ehca_define_sqp - Defines special queue pair 1 (GSI QP). When special queue
diff --git a/drivers/infiniband/hw/ipath/ipath_eeprom.c b/drivers/infiniband/hw/ipath/ipath_eeprom.c
index dc37277f1c80..fc7181985e8e 100644
--- a/drivers/infiniband/hw/ipath/ipath_eeprom.c
+++ b/drivers/infiniband/hw/ipath/ipath_eeprom.c
@@ -772,8 +772,8 @@ void ipath_get_eeprom_info(struct ipath_devdata *dd)
                         "0x%x, not 0x%x\n", csum, ifp->if_csum);
                goto done;
        }
-        if (*(__be64 *) ifp->if_guid == 0ULL ||
+        if (*(__be64 *) ifp->if_guid == cpu_to_be64(0) ||
-            *(__be64 *) ifp->if_guid == __constant_cpu_to_be64(-1LL)) {
+            *(__be64 *) ifp->if_guid == ~cpu_to_be64(0)) {
                ipath_dev_err(dd, "Invalid GUID %llx from flash; "
                              "ignoring\n",
                              *(unsigned long long *) ifp->if_guid);
diff --git a/drivers/infiniband/hw/ipath/ipath_init_chip.c b/drivers/infiniband/hw/ipath/ipath_init_chip.c
index 64aeefbd2a5d..077879c0bdb5 100644
--- a/drivers/infiniband/hw/ipath/ipath_init_chip.c
+++ b/drivers/infiniband/hw/ipath/ipath_init_chip.c
@@ -455,7 +455,7 @@ static void init_shadow_tids(struct ipath_devdata *dd)
        if (!addrs) {
                ipath_dev_err(dd, "failed to allocate shadow dma handle "
                              "array, no expected sends!\n");
-                vfree(dd->ipath_pageshadow);
+                vfree(pages);
                dd->ipath_pageshadow = NULL;
                return;
        }
diff --git a/drivers/infiniband/hw/ipath/ipath_mad.c b/drivers/infiniband/hw/ipath/ipath_mad.c
index 17a123197477..16a702d46018 100644
--- a/drivers/infiniband/hw/ipath/ipath_mad.c
+++ b/drivers/infiniband/hw/ipath/ipath_mad.c
@@ -37,10 +37,10 @@
 #include "ipath_verbs.h"
 #include "ipath_common.h"
-#define IB_SMP_UNSUP_VERSION    __constant_htons(0x0004)
+#define IB_SMP_UNSUP_VERSION    cpu_to_be16(0x0004)
-#define IB_SMP_UNSUP_METHOD     __constant_htons(0x0008)
+#define IB_SMP_UNSUP_METHOD     cpu_to_be16(0x0008)
-#define IB_SMP_UNSUP_METH_ATTR  __constant_htons(0x000C)
+#define IB_SMP_UNSUP_METH_ATTR  cpu_to_be16(0x000C)
-#define IB_SMP_INVALID_FIELD    __constant_htons(0x001C)
+#define IB_SMP_INVALID_FIELD    cpu_to_be16(0x001C)
 static int reply(struct ib_smp *smp)
 {
@@ -789,12 +789,12 @@ static int recv_subn_set_pkeytable(struct ib_smp *smp,
        return recv_subn_get_pkeytable(smp, ibdev);
 }
-#define IB_PMA_CLASS_PORT_INFO          __constant_htons(0x0001)
+#define IB_PMA_CLASS_PORT_INFO          cpu_to_be16(0x0001)
-#define IB_PMA_PORT_SAMPLES_CONTROL     __constant_htons(0x0010)
+#define IB_PMA_PORT_SAMPLES_CONTROL     cpu_to_be16(0x0010)
-#define IB_PMA_PORT_SAMPLES_RESULT      __constant_htons(0x0011)
+#define IB_PMA_PORT_SAMPLES_RESULT      cpu_to_be16(0x0011)
-#define IB_PMA_PORT_COUNTERS            __constant_htons(0x0012)
+#define IB_PMA_PORT_COUNTERS            cpu_to_be16(0x0012)
-#define IB_PMA_PORT_COUNTERS_EXT        __constant_htons(0x001D)
+#define IB_PMA_PORT_COUNTERS_EXT        cpu_to_be16(0x001D)
-#define IB_PMA_PORT_SAMPLES_RESULT_EXT  __constant_htons(0x001E)
+#define IB_PMA_PORT_SAMPLES_RESULT_EXT  cpu_to_be16(0x001E)
 struct ib_perf {
        u8 base_version;
@@ -884,19 +884,19 @@ struct ib_pma_portcounters {
        __be32 port_rcv_packets;
 } __attribute__ ((packed));
-#define IB_PMA_SEL_SYMBOL_ERROR                 __constant_htons(0x0001)
+#define IB_PMA_SEL_SYMBOL_ERROR                 cpu_to_be16(0x0001)
-#define IB_PMA_SEL_LINK_ERROR_RECOVERY          __constant_htons(0x0002)
+#define IB_PMA_SEL_LINK_ERROR_RECOVERY          cpu_to_be16(0x0002)
-#define IB_PMA_SEL_LINK_DOWNED                  __constant_htons(0x0004)
+#define IB_PMA_SEL_LINK_DOWNED                  cpu_to_be16(0x0004)
-#define IB_PMA_SEL_PORT_RCV_ERRORS              __constant_htons(0x0008)
+#define IB_PMA_SEL_PORT_RCV_ERRORS              cpu_to_be16(0x0008)
-#define IB_PMA_SEL_PORT_RCV_REMPHYS_ERRORS      __constant_htons(0x0010)
+#define IB_PMA_SEL_PORT_RCV_REMPHYS_ERRORS      cpu_to_be16(0x0010)
-#define IB_PMA_SEL_PORT_XMIT_DISCARDS           __constant_htons(0x0040)
+#define IB_PMA_SEL_PORT_XMIT_DISCARDS           cpu_to_be16(0x0040)
-#define IB_PMA_SEL_LOCAL_LINK_INTEGRITY_ERRORS  __constant_htons(0x0200)
+#define IB_PMA_SEL_LOCAL_LINK_INTEGRITY_ERRORS  cpu_to_be16(0x0200)
-#define IB_PMA_SEL_EXCESSIVE_BUFFER_OVERRUNS    __constant_htons(0x0400)
+#define IB_PMA_SEL_EXCESSIVE_BUFFER_OVERRUNS    cpu_to_be16(0x0400)
-#define IB_PMA_SEL_PORT_VL15_DROPPED            __constant_htons(0x0800)
+#define IB_PMA_SEL_PORT_VL15_DROPPED            cpu_to_be16(0x0800)
-#define IB_PMA_SEL_PORT_XMIT_DATA               __constant_htons(0x1000)
+#define IB_PMA_SEL_PORT_XMIT_DATA               cpu_to_be16(0x1000)
-#define IB_PMA_SEL_PORT_RCV_DATA                __constant_htons(0x2000)
+#define IB_PMA_SEL_PORT_RCV_DATA                cpu_to_be16(0x2000)
-#define IB_PMA_SEL_PORT_XMIT_PACKETS            __constant_htons(0x4000)
+#define IB_PMA_SEL_PORT_XMIT_PACKETS            cpu_to_be16(0x4000)
-#define IB_PMA_SEL_PORT_RCV_PACKETS             __constant_htons(0x8000)
+#define IB_PMA_SEL_PORT_RCV_PACKETS             cpu_to_be16(0x8000)
 struct ib_pma_portcounters_ext {
        u8 reserved;
@@ -913,14 +913,14 @@ struct ib_pma_portcounters_ext {
        __be64 port_multicast_rcv_packets;
 } __attribute__ ((packed));
-#define IB_PMA_SELX_PORT_XMIT_DATA              __constant_htons(0x0001)
+#define IB_PMA_SELX_PORT_XMIT_DATA              cpu_to_be16(0x0001)
-#define IB_PMA_SELX_PORT_RCV_DATA               __constant_htons(0x0002)
+#define IB_PMA_SELX_PORT_RCV_DATA               cpu_to_be16(0x0002)
-#define IB_PMA_SELX_PORT_XMIT_PACKETS           __constant_htons(0x0004)
+#define IB_PMA_SELX_PORT_XMIT_PACKETS           cpu_to_be16(0x0004)
-#define IB_PMA_SELX_PORT_RCV_PACKETS            __constant_htons(0x0008)
+#define IB_PMA_SELX_PORT_RCV_PACKETS            cpu_to_be16(0x0008)
-#define IB_PMA_SELX_PORT_UNI_XMIT_PACKETS       __constant_htons(0x0010)
+#define IB_PMA_SELX_PORT_UNI_XMIT_PACKETS       cpu_to_be16(0x0010)
-#define IB_PMA_SELX_PORT_UNI_RCV_PACKETS        __constant_htons(0x0020)
+#define IB_PMA_SELX_PORT_UNI_RCV_PACKETS        cpu_to_be16(0x0020)
-#define IB_PMA_SELX_PORT_MULTI_XMIT_PACKETS     __constant_htons(0x0040)
+#define IB_PMA_SELX_PORT_MULTI_XMIT_PACKETS     cpu_to_be16(0x0040)
-#define IB_PMA_SELX_PORT_MULTI_RCV_PACKETS      __constant_htons(0x0080)
+#define IB_PMA_SELX_PORT_MULTI_RCV_PACKETS      cpu_to_be16(0x0080)
 static int recv_pma_get_classportinfo(struct ib_perf *pmp)
 {
@@ -933,7 +933,7 @@ static int recv_pma_get_classportinfo(struct ib_perf *pmp)
                pmp->status |= IB_SMP_INVALID_FIELD;
        /* Indicate AllPortSelect is valid (only one port anyway) */
-        p->cap_mask = __constant_cpu_to_be16(1 << 8);
+        p->cap_mask = cpu_to_be16(1 << 8);
        p->base_version = 1;
        p->class_version = 1;
        /*
@@ -951,12 +951,11 @@ static int recv_pma_get_classportinfo(struct ib_perf *pmp)
 * We support 5 counters which only count the mandatory quantities.
 */
 #define COUNTER_MASK(q, n) (q << ((9 - n) * 3))
-#define COUNTER_MASK0_9 \
+#define COUNTER_MASK0_9 cpu_to_be32(COUNTER_MASK(1, 0) | \
-        __constant_cpu_to_be32(COUNTER_MASK(1, 0) | \
+                                    COUNTER_MASK(1, 1) | \
-                               COUNTER_MASK(1, 1) | \
+                                    COUNTER_MASK(1, 2) | \
-                               COUNTER_MASK(1, 2) | \
+                                    COUNTER_MASK(1, 3) | \
-                               COUNTER_MASK(1, 3) | \
+                                    COUNTER_MASK(1, 4))
-                               COUNTER_MASK(1, 4))
 static int recv_pma_get_portsamplescontrol(struct ib_perf *pmp,
                                           struct ib_device *ibdev, u8 port)
@@ -1137,7 +1136,7 @@ static int recv_pma_get_portsamplesresult_ext(struct ib_perf *pmp,
                status = dev->pma_sample_status;
        p->sample_status = cpu_to_be16(status);
        /* 64 bits */
-        p->extended_width = __constant_cpu_to_be32(0x80000000);
+        p->extended_width = cpu_to_be32(0x80000000);
        for (i = 0; i < ARRAY_SIZE(dev->pma_counter_select); i++)
                p->counter[i] = (status != IB_PMA_SAMPLE_STATUS_DONE) ? 0 :
                    cpu_to_be64(
@@ -1185,7 +1184,7 @@ static int recv_pma_get_portcounters(struct ib_perf *pmp,
                pmp->status |= IB_SMP_INVALID_FIELD;
        if (cntrs.symbol_error_counter > 0xFFFFUL)
-                p->symbol_error_counter = __constant_cpu_to_be16(0xFFFF);
+                p->symbol_error_counter = cpu_to_be16(0xFFFF);
        else
                p->symbol_error_counter =
                        cpu_to_be16((u16)cntrs.symbol_error_counter);
@@ -1199,17 +1198,17 @@ static int recv_pma_get_portcounters(struct ib_perf *pmp,
        else
                p->link_downed_counter = (u8)cntrs.link_downed_counter;
        if (cntrs.port_rcv_errors > 0xFFFFUL)
-                p->port_rcv_errors = __constant_cpu_to_be16(0xFFFF);
+                p->port_rcv_errors = cpu_to_be16(0xFFFF);
        else
                p->port_rcv_errors =
                        cpu_to_be16((u16) cntrs.port_rcv_errors);
        if (cntrs.port_rcv_remphys_errors > 0xFFFFUL)
-                p->port_rcv_remphys_errors = __constant_cpu_to_be16(0xFFFF);
+                p->port_rcv_remphys_errors = cpu_to_be16(0xFFFF);
        else
                p->port_rcv_remphys_errors =
                        cpu_to_be16((u16)cntrs.port_rcv_remphys_errors);
        if (cntrs.port_xmit_discards > 0xFFFFUL)
-                p->port_xmit_discards = __constant_cpu_to_be16(0xFFFF);
+                p->port_xmit_discards = cpu_to_be16(0xFFFF);
        else
                p->port_xmit_discards =
                        cpu_to_be16((u16)cntrs.port_xmit_discards);
@@ -1220,24 +1219,24 @@ static int recv_pma_get_portcounters(struct ib_perf *pmp,
        p->lli_ebor_errors = (cntrs.local_link_integrity_errors << 4) |
                cntrs.excessive_buffer_overrun_errors;
        if (cntrs.vl15_dropped > 0xFFFFUL)
-                p->vl15_dropped = __constant_cpu_to_be16(0xFFFF);
+                p->vl15_dropped = cpu_to_be16(0xFFFF);
        else
                p->vl15_dropped = cpu_to_be16((u16)cntrs.vl15_dropped);
        if (cntrs.port_xmit_data > 0xFFFFFFFFUL)
-                p->port_xmit_data = __constant_cpu_to_be32(0xFFFFFFFF);
+                p->port_xmit_data = cpu_to_be32(0xFFFFFFFF);
        else
                p->port_xmit_data = cpu_to_be32((u32)cntrs.port_xmit_data);
        if (cntrs.port_rcv_data > 0xFFFFFFFFUL)
-                p->port_rcv_data = __constant_cpu_to_be32(0xFFFFFFFF);
+                p->port_rcv_data = cpu_to_be32(0xFFFFFFFF);
        else
                p->port_rcv_data = cpu_to_be32((u32)cntrs.port_rcv_data);
        if (cntrs.port_xmit_packets > 0xFFFFFFFFUL)
-                p->port_xmit_packets = __constant_cpu_to_be32(0xFFFFFFFF);
+                p->port_xmit_packets = cpu_to_be32(0xFFFFFFFF);
        else
                p->port_xmit_packets =
                        cpu_to_be32((u32)cntrs.port_xmit_packets);
        if (cntrs.port_rcv_packets > 0xFFFFFFFFUL)
-                p->port_rcv_packets = __constant_cpu_to_be32(0xFFFFFFFF);
+                p->port_rcv_packets = cpu_to_be32(0xFFFFFFFF);
        else
                p->port_rcv_packets =
                        cpu_to_be32((u32) cntrs.port_rcv_packets);
diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
index 9170710b950d..79b3dbc97179 100644
--- a/drivers/infiniband/hw/ipath/ipath_rc.c
+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
@@ -1744,7 +1744,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                /* Signal completion event if the solicited bit is set. */
                ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc,
                               (ohdr->bth[0] &
-                                __constant_cpu_to_be32(1 << 23)) != 0);
+                                cpu_to_be32(1 << 23)) != 0);
                break;
        case OP(RDMA_WRITE_FIRST):
diff --git a/drivers/infiniband/hw/ipath/ipath_sdma.c b/drivers/infiniband/hw/ipath/ipath_sdma.c
index 8e255adf5d9b..4b0698590850 100644
--- a/drivers/infiniband/hw/ipath/ipath_sdma.c
+++ b/drivers/infiniband/hw/ipath/ipath_sdma.c
@@ -781,10 +781,10 @@ retry:
                descqp = &dd->ipath_sdma_descq[dd->ipath_sdma_descq_cnt].qw[0];
        descqp -= 2;
        /* SDmaLastDesc */
-        descqp[0] |= __constant_cpu_to_le64(1ULL << 11);
+        descqp[0] |= cpu_to_le64(1ULL << 11);
        if (tx->txreq.flags & IPATH_SDMA_TXREQ_F_INTREQ) {
                /* SDmaIntReq */
-                descqp[0] |= __constant_cpu_to_le64(1ULL << 15);
+                descqp[0] |= cpu_to_le64(1ULL << 15);
        }
        /* Commit writes to memory and advance the tail on the chip */
diff --git a/drivers/infiniband/hw/ipath/ipath_uc.c b/drivers/infiniband/hw/ipath/ipath_uc.c
index 82cc588b8bf2..22e60998f1a7 100644
--- a/drivers/infiniband/hw/ipath/ipath_uc.c
+++ b/drivers/infiniband/hw/ipath/ipath_uc.c
@@ -419,7 +419,7 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
                /* Signal completion event if the solicited bit is set. */
                ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc,
                               (ohdr->bth[0] &
-                                __constant_cpu_to_be32(1 << 23)) != 0);
+                                cpu_to_be32(1 << 23)) != 0);
                break;
        case OP(RDMA_WRITE_FIRST):
diff --git a/drivers/infiniband/hw/ipath/ipath_ud.c b/drivers/infiniband/hw/ipath/ipath_ud.c
index 91c74cc797ae..6076cb61bf6a 100644
--- a/drivers/infiniband/hw/ipath/ipath_ud.c
+++ b/drivers/infiniband/hw/ipath/ipath_ud.c
@@ -370,7 +370,7 @@ int ipath_make_ud_req(struct ipath_qp *qp)
         */
        ohdr->bth[1] = ah_attr->dlid >= IPATH_MULTICAST_LID_BASE &&
                ah_attr->dlid != IPATH_PERMISSIVE_LID ?
-                __constant_cpu_to_be32(IPATH_MULTICAST_QPN) :
+                cpu_to_be32(IPATH_MULTICAST_QPN) :
                cpu_to_be32(wqe->wr.wr.ud.remote_qpn);
        ohdr->bth[2] = cpu_to_be32(qp->s_next_psn++ & IPATH_PSN_MASK);
        /*
@@ -573,7 +573,7 @@ void ipath_ud_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
        /* Signal completion event if the solicited bit is set. */
        ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc,
                       (ohdr->bth[0] &
-                        __constant_cpu_to_be32(1 << 23)) != 0);
+                        cpu_to_be32(1 << 23)) != 0);
 bail:;
 }
diff --git a/drivers/infiniband/hw/ipath/ipath_user_pages.c b/drivers/infiniband/hw/ipath/ipath_user_pages.c
index 0190edc8044e..855911e7396d 100644
--- a/drivers/infiniband/hw/ipath/ipath_user_pages.c
+++ b/drivers/infiniband/hw/ipath/ipath_user_pages.c
@@ -209,20 +209,20 @@ void ipath_release_user_pages_on_close(struct page **p, size_t num_pages)
        mm = get_task_mm(current);
        if (!mm)
-                goto bail;
+                return;
        work = kmalloc(sizeof(*work), GFP_KERNEL);
        if (!work)
                goto bail_mm;
-        goto bail;
        INIT_WORK(&work->work, user_pages_account);
        work->mm = mm;
        work->num_pages = num_pages;
+        schedule_work(&work->work);
+        return;
 bail_mm:
        mmput(mm);
-bail:
        return;
 }
diff --git a/drivers/infiniband/hw/ipath/ipath_user_sdma.c b/drivers/infiniband/hw/ipath/ipath_user_sdma.c
index 82d9a0b5ca2f..7bff4b9baa0a 100644
--- a/drivers/infiniband/hw/ipath/ipath_user_sdma.c
+++ b/drivers/infiniband/hw/ipath/ipath_user_sdma.c
@@ -667,13 +667,13 @@ static inline __le64 ipath_sdma_make_desc0(struct ipath_devdata *dd,
 static inline __le64 ipath_sdma_make_first_desc0(__le64 descq)
 {
-        return descq | __constant_cpu_to_le64(1ULL << 12);
+        return descq | cpu_to_le64(1ULL << 12);
 }
 static inline __le64 ipath_sdma_make_last_desc0(__le64 descq)
 {
                                              /* last */  /* dma head */
-        return descq | __constant_cpu_to_le64(1ULL << 11 | 1ULL << 13);
+        return descq | cpu_to_le64(1ULL << 11 | 1ULL << 13);
 }
 static inline __le64 ipath_sdma_make_desc1(u64 addr)
@@ -763,7 +763,7 @@ static int ipath_user_sdma_push_pkts(struct ipath_devdata *dd,
                if (ofs >= IPATH_SMALLBUF_DWORDS) {
                        for (i = 0; i < pkt->naddr; i++) {
                                dd->ipath_sdma_descq[dtail].qw[0] |=
-                                        __constant_cpu_to_le64(1ULL << 14);
+                                        cpu_to_le64(1ULL << 14);
                                if (++dtail == dd->ipath_sdma_descq_cnt)
                                        dtail = 0;
                        }
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index cdf0e6abd34d..9289ab4b0ae8 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -1585,7 +1585,7 @@ static int ipath_query_port(struct ib_device *ibdev,
        u64 ibcstat;
        memset(props, 0, sizeof(*props));
-        props->lid = lid ? lid : __constant_be16_to_cpu(IB_LID_PERMISSIVE);
+        props->lid = lid ? lid : be16_to_cpu(IB_LID_PERMISSIVE);
        props->lmc = dd->ipath_lmc;
        props->sm_lid = dev->sm_lid;
        props->sm_sl = dev->sm_sl;
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.h b/drivers/infiniband/hw/ipath/ipath_verbs.h
index 11e3f613df93..ae6cff4abffc 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.h
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.h
@@ -86,11 +86,11 @@
 #define IB_PMA_SAMPLE_STATUS_RUNNING    0x02
 /* Mandatory IB performance counter select values. */
-#define IB_PMA_PORT_XMIT_DATA   __constant_htons(0x0001)
+#define IB_PMA_PORT_XMIT_DATA   cpu_to_be16(0x0001)
-#define IB_PMA_PORT_RCV_DATA    __constant_htons(0x0002)
+#define IB_PMA_PORT_RCV_DATA    cpu_to_be16(0x0002)
-#define IB_PMA_PORT_XMIT_PKTS   __constant_htons(0x0003)
+#define IB_PMA_PORT_XMIT_PKTS   cpu_to_be16(0x0003)
-#define IB_PMA_PORT_RCV_PKTS    __constant_htons(0x0004)
+#define IB_PMA_PORT_RCV_PKTS    cpu_to_be16(0x0004)
-#define IB_PMA_PORT_XMIT_WAIT   __constant_htons(0x0005)
+#define IB_PMA_PORT_XMIT_WAIT   cpu_to_be16(0x0005)
 struct ib_reth {
        __be64 vaddr;
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index 606f1e2ef284..19e68ab66168 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -147,7 +147,8 @@ static void update_sm_ah(struct mlx4_ib_dev *dev, u8 port_num, u16 lid, u8 sl)
 * Snoop SM MADs for port info and P_Key table sets, so we can
 * synthesize LID change and P_Key change events.
 */
-static void smp_snoop(struct ib_device *ibdev, u8 port_num, struct ib_mad *mad)
+static void smp_snoop(struct ib_device *ibdev, u8 port_num, struct ib_mad *mad,
+                                u16 prev_lid)
 {
        struct ib_event event;
@@ -157,6 +158,7 @@ static void smp_snoop(struct ib_device *ibdev, u8 port_num, struct ib_mad *mad)
                if (mad->mad_hdr.attr_id == IB_SMP_ATTR_PORT_INFO) {
                        struct ib_port_info *pinfo =
                                (struct ib_port_info *) ((struct ib_smp *) mad)->data;
+                        u16 lid = be16_to_cpu(pinfo->lid);
                        update_sm_ah(to_mdev(ibdev), port_num,
                                     be16_to_cpu(pinfo->sm_lid),
@@ -165,12 +167,15 @@ static void smp_snoop(struct ib_device *ibdev, u8 port_num, struct ib_mad *mad)
                        event.device           = ibdev;
                        event.element.port_num = port_num;
-                        if (pinfo->clientrereg_resv_subnetto & 0x80)
+                        if (pinfo->clientrereg_resv_subnetto & 0x80) {
                                event.event    = IB_EVENT_CLIENT_REREGISTER;
-                        else
+                                ib_dispatch_event(&event);
-                                event.event    = IB_EVENT_LID_CHANGE;
+                        }
-                        ib_dispatch_event(&event);
+                        if (prev_lid != lid) {
+                                event.event    = IB_EVENT_LID_CHANGE;
+                                ib_dispatch_event(&event);
+                        }
                }
                if (mad->mad_hdr.attr_id == IB_SMP_ATTR_PKEY_TABLE) {
@@ -228,8 +233,9 @@ int mlx4_ib_process_mad(struct ib_device *ibdev, int mad_flags,	u8 port_num,
                        struct ib_wc *in_wc, struct ib_grh *in_grh,
                        struct ib_mad *in_mad, struct ib_mad *out_mad)
 {
-        u16 slid;
+        u16 slid, prev_lid = 0;
        int err;
+        struct ib_port_attr pattr;
        slid = in_wc ? in_wc->slid : be16_to_cpu(IB_LID_PERMISSIVE);
@@ -263,6 +269,13 @@ int mlx4_ib_process_mad(struct ib_device *ibdev, int mad_flags,	u8 port_num,
        } else
                return IB_MAD_RESULT_SUCCESS;
+        if ((in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_LID_ROUTED ||
+             in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE) &&
+            in_mad->mad_hdr.method == IB_MGMT_METHOD_SET &&
+            in_mad->mad_hdr.attr_id == IB_SMP_ATTR_PORT_INFO &&
+            !ib_query_port(ibdev, port_num, &pattr))
+                prev_lid = pattr.lid;
        err = mlx4_MAD_IFC(to_mdev(ibdev),
                           mad_flags & IB_MAD_IGNORE_MKEY,
                           mad_flags & IB_MAD_IGNORE_BKEY,
@@ -271,7 +284,7 @@ int mlx4_ib_process_mad(struct ib_device *ibdev, int mad_flags,	u8 port_num,
                return IB_MAD_RESULT_FAILURE;
        if (!out_mad->mad_hdr.status) {
-                smp_snoop(ibdev, port_num, in_mad);
+                smp_snoop(ibdev, port_num, in_mad, prev_lid);
                node_desc_override(ibdev, out_mad);
        }
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 61588bd273bd..2ccb9d31771f 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -699,11 +699,12 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr)
        struct mlx4_ib_dev *ibdev = ibdev_ptr;
        int p;
+        mlx4_ib_mad_cleanup(ibdev);
+        ib_unregister_device(&ibdev->ib_dev);
        for (p = 1; p <= ibdev->num_ports; ++p)
                mlx4_CLOSE_PORT(dev, p);
-        mlx4_ib_mad_cleanup(ibdev);
-        ib_unregister_device(&ibdev->ib_dev);
        iounmap(ibdev->uar_map);
        mlx4_uar_free(dev, &ibdev->priv_uar);
        mlx4_pd_free(dev, ibdev->priv_pdn);
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index a91cb4c3fa5c..f385a24d31d2 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -71,17 +71,17 @@ enum {
 };
 static const __be32 mlx4_ib_opcode[] = {
-        [IB_WR_SEND]                    = __constant_cpu_to_be32(MLX4_OPCODE_SEND),
+        [IB_WR_SEND]                    = cpu_to_be32(MLX4_OPCODE_SEND),
-        [IB_WR_LSO]                     = __constant_cpu_to_be32(MLX4_OPCODE_LSO),
+        [IB_WR_LSO]                     = cpu_to_be32(MLX4_OPCODE_LSO),
-        [IB_WR_SEND_WITH_IMM]           = __constant_cpu_to_be32(MLX4_OPCODE_SEND_IMM),
+        [IB_WR_SEND_WITH_IMM]           = cpu_to_be32(MLX4_OPCODE_SEND_IMM),
-        [IB_WR_RDMA_WRITE]              = __constant_cpu_to_be32(MLX4_OPCODE_RDMA_WRITE),
+        [IB_WR_RDMA_WRITE]              = cpu_to_be32(MLX4_OPCODE_RDMA_WRITE),
-        [IB_WR_RDMA_WRITE_WITH_IMM]     = __constant_cpu_to_be32(MLX4_OPCODE_RDMA_WRITE_IMM),
+        [IB_WR_RDMA_WRITE_WITH_IMM]     = cpu_to_be32(MLX4_OPCODE_RDMA_WRITE_IMM),
-        [IB_WR_RDMA_READ]               = __constant_cpu_to_be32(MLX4_OPCODE_RDMA_READ),
+        [IB_WR_RDMA_READ]               = cpu_to_be32(MLX4_OPCODE_RDMA_READ),
-        [IB_WR_ATOMIC_CMP_AND_SWP]      = __constant_cpu_to_be32(MLX4_OPCODE_ATOMIC_CS),
+        [IB_WR_ATOMIC_CMP_AND_SWP]      = cpu_to_be32(MLX4_OPCODE_ATOMIC_CS),
-        [IB_WR_ATOMIC_FETCH_AND_ADD]    = __constant_cpu_to_be32(MLX4_OPCODE_ATOMIC_FA),
+        [IB_WR_ATOMIC_FETCH_AND_ADD]    = cpu_to_be32(MLX4_OPCODE_ATOMIC_FA),
-        [IB_WR_SEND_WITH_INV]           = __constant_cpu_to_be32(MLX4_OPCODE_SEND_INVAL),
+        [IB_WR_SEND_WITH_INV]           = cpu_to_be32(MLX4_OPCODE_SEND_INVAL),
-        [IB_WR_LOCAL_INV]               = __constant_cpu_to_be32(MLX4_OPCODE_LOCAL_INVAL),
+        [IB_WR_LOCAL_INV]               = cpu_to_be32(MLX4_OPCODE_LOCAL_INVAL),
-        [IB_WR_FAST_REG_MR]             = __constant_cpu_to_be32(MLX4_OPCODE_FMR),
+        [IB_WR_FAST_REG_MR]             = cpu_to_be32(MLX4_OPCODE_FMR),
 };
 static struct mlx4_ib_sqp *to_msqp(struct mlx4_ib_qp *mqp)
diff --git a/drivers/infiniband/hw/mthca/mthca_mad.c b/drivers/infiniband/hw/mthca/mthca_mad.c
index 640449582aba..5648659ff0b0 100644
--- a/drivers/infiniband/hw/mthca/mthca_mad.c
+++ b/drivers/infiniband/hw/mthca/mthca_mad.c
@@ -104,7 +104,8 @@ static void update_sm_ah(struct mthca_dev *dev,
 */
 static void smp_snoop(struct ib_device *ibdev,
                      u8 port_num,
-                      struct ib_mad *mad)
+                      struct ib_mad *mad,
+                      u16 prev_lid)
 {
        struct ib_event event;
@@ -114,6 +115,7 @@ static void smp_snoop(struct ib_device *ibdev,
                if (mad->mad_hdr.attr_id == IB_SMP_ATTR_PORT_INFO) {
                        struct ib_port_info *pinfo =
                                (struct ib_port_info *) ((struct ib_smp *) mad)->data;
+                        u16 lid = be16_to_cpu(pinfo->lid);
                        mthca_update_rate(to_mdev(ibdev), port_num);
                        update_sm_ah(to_mdev(ibdev), port_num,
@@ -123,12 +125,15 @@ static void smp_snoop(struct ib_device *ibdev,
                        event.device           = ibdev;
                        event.element.port_num = port_num;
-                        if (pinfo->clientrereg_resv_subnetto & 0x80)
+                        if (pinfo->clientrereg_resv_subnetto & 0x80) {
                                event.event    = IB_EVENT_CLIENT_REREGISTER;
-                        else
+                                ib_dispatch_event(&event);
-                                event.event    = IB_EVENT_LID_CHANGE;
+                        }
-                        ib_dispatch_event(&event);
+                        if (prev_lid != lid) {
+                                event.event    = IB_EVENT_LID_CHANGE;
+                                ib_dispatch_event(&event);
+                        }
                }
                if (mad->mad_hdr.attr_id == IB_SMP_ATTR_PKEY_TABLE) {
@@ -196,6 +201,8 @@ int mthca_process_mad(struct ib_device *ibdev,
        int err;
        u8 status;
        u16 slid = in_wc ? in_wc->slid : be16_to_cpu(IB_LID_PERMISSIVE);
+        u16 prev_lid = 0;
+        struct ib_port_attr pattr;
        /* Forward locally generated traps to the SM */
        if (in_mad->mad_hdr.method == IB_MGMT_METHOD_TRAP &&
@@ -233,6 +240,12 @@ int mthca_process_mad(struct ib_device *ibdev,
                        return IB_MAD_RESULT_SUCCESS;
        } else
                return IB_MAD_RESULT_SUCCESS;
+        if ((in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_LID_ROUTED ||
+             in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE) &&
+            in_mad->mad_hdr.method == IB_MGMT_METHOD_SET &&
+            in_mad->mad_hdr.attr_id == IB_SMP_ATTR_PORT_INFO &&
+            !ib_query_port(ibdev, port_num, &pattr))
+                prev_lid = pattr.lid;
        err = mthca_MAD_IFC(to_mdev(ibdev),
                            mad_flags & IB_MAD_IGNORE_MKEY,
@@ -252,7 +265,7 @@ int mthca_process_mad(struct ib_device *ibdev,
        }
        if (!out_mad->mad_hdr.status) {
-                smp_snoop(ibdev, port_num, in_mad);
+                smp_snoop(ibdev, port_num, in_mad, prev_lid);
                node_desc_override(ibdev, out_mad);
        }
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 0bd2a4ff0842..353c13b91e8f 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -660,8 +660,12 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
        path = __path_find(dev, phdr->hwaddr + 4);
        if (!path || !path->valid) {
-                if (!path)
+                int new_path = 0;
+                if (!path) {
                        path = path_rec_create(dev, phdr->hwaddr + 4);
+                        new_path = 1;
+                }
                if (path) {
                        /* put pseudoheader back on for next time */
                        skb_push(skb, sizeof *phdr);
@@ -669,7 +673,8 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
                        if (!path->query && path_rec_start(dev, path)) {
                                spin_unlock_irqrestore(&priv->lock, flags);
-                                path_free(dev, path);
+                                if (new_path)
+                                        path_free(dev, path);
                                return;
                        } else
                                __path_add(dev, path);
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index 319b188145be..ea9e1556e0d6 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -401,13 +401,6 @@ static void iser_route_handler(struct rdma_cm_id *cma_id)
        if (ret)
                goto failure;
-        iser_dbg("path.mtu is %d setting it to %d\n",
-                 cma_id->route.path_rec->mtu, IB_MTU_1024);
-        /* we must set the MTU to 1024 as this is what the target is assuming */
-        if (cma_id->route.path_rec->mtu > IB_MTU_1024)
-                cma_id->route.path_rec->mtu = IB_MTU_1024;
        memset(&conn_param, 0, sizeof conn_param);
        conn_param.responder_resources = 4;
        conn_param.initiator_depth     = 1;