8 files changed, 60 insertions, 105 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
index 6966f943f440..09a30dd12b14 100644
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
@@ -1255,9 +1255,14 @@ int mthca_QUERY_ADAPTER(struct mthca_dev *dev,
         if (err)
                 goto out;
 
-        MTHCA_GET(adapter->vendor_id, outbox,   QUERY_ADAPTER_VENDOR_ID_OFFSET);
-        MTHCA_GET(adapter->device_id, outbox,   QUERY_ADAPTER_DEVICE_ID_OFFSET);
-        MTHCA_GET(adapter->revision_id, outbox, QUERY_ADAPTER_REVISION_ID_OFFSET);
+        if (!mthca_is_memfree(dev)) {
+                MTHCA_GET(adapter->vendor_id, outbox,
+                          QUERY_ADAPTER_VENDOR_ID_OFFSET);
+                MTHCA_GET(adapter->device_id, outbox,
+                          QUERY_ADAPTER_DEVICE_ID_OFFSET);
+                MTHCA_GET(adapter->revision_id, outbox,
+                          QUERY_ADAPTER_REVISION_ID_OFFSET);
+        }
         MTHCA_GET(adapter->inta_pin, outbox,    QUERY_ADAPTER_INTA_PIN_OFFSET);
 
         get_board_id(outbox + QUERY_ADAPTER_VSD_OFFSET / 4,
diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h
index 15aa32eb78b6..7bbdd1f4e6c7 100644
--- a/drivers/infiniband/hw/mthca/mthca_dev.h
+++ b/drivers/infiniband/hw/mthca/mthca_dev.h
@@ -60,13 +60,12 @@
 enum {
         MTHCA_FLAG_DDR_HIDDEN = 1 << 1,
         MTHCA_FLAG_SRQ        = 1 << 2,
-        MTHCA_FLAG_MSI        = 1 << 3,
-        MTHCA_FLAG_MSI_X      = 1 << 4,
-        MTHCA_FLAG_NO_LAM     = 1 << 5,
-        MTHCA_FLAG_FMR        = 1 << 6,
-        MTHCA_FLAG_MEMFREE    = 1 << 7,
-        MTHCA_FLAG_PCIE       = 1 << 8,
-        MTHCA_FLAG_SINAI_OPT  = 1 << 9
+        MTHCA_FLAG_MSI_X      = 1 << 3,
+        MTHCA_FLAG_NO_LAM     = 1 << 4,
+        MTHCA_FLAG_FMR        = 1 << 5,
+        MTHCA_FLAG_MEMFREE    = 1 << 6,
+        MTHCA_FLAG_PCIE       = 1 << 7,
+        MTHCA_FLAG_SINAI_OPT  = 1 << 8
 };
 
 enum {
diff --git a/drivers/infiniband/hw/mthca/mthca_eq.c b/drivers/infiniband/hw/mthca/mthca_eq.c
index b29de51b7f35..b60eb5df96e8 100644
--- a/drivers/infiniband/hw/mthca/mthca_eq.c
+++ b/drivers/infiniband/hw/mthca/mthca_eq.c
@@ -827,8 +827,7 @@ int mthca_init_eq_table(struct mthca_dev *dev)
         if (err)
                 goto err_out_free;
 
-        if (dev->mthca_flags & MTHCA_FLAG_MSI ||
-            dev->mthca_flags & MTHCA_FLAG_MSI_X) {
+        if (dev->mthca_flags & MTHCA_FLAG_MSI_X) {
                 dev->eq_table.clr_mask = 0;
         } else {
                 dev->eq_table.clr_mask =
@@ -839,8 +838,7 @@ int mthca_init_eq_table(struct mthca_dev *dev)
 
         dev->eq_table.arm_mask = 0;
 
-        intr = (dev->mthca_flags & MTHCA_FLAG_MSI) ?
-                128 : dev->eq_table.inta_pin;
+        intr = dev->eq_table.inta_pin;
 
         err = mthca_create_eq(dev, dev->limits.num_cqs + MTHCA_NUM_SPARE_EQE,
                               (dev->mthca_flags & MTHCA_FLAG_MSI_X) ? 128 : intr,
diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
index 60de6f93869e..cd3d8adbef9f 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -65,14 +65,9 @@ static int msi_x = 1;
 module_param(msi_x, int, 0444);
 MODULE_PARM_DESC(msi_x, "attempt to use MSI-X if nonzero");
 
-static int msi = 0;
-module_param(msi, int, 0444);
-MODULE_PARM_DESC(msi, "attempt to use MSI if nonzero (deprecated, use MSI-X instead)");
-
 #else /* CONFIG_PCI_MSI */
 
 #define msi_x (0)
-#define msi   (0)
 
 #endif /* CONFIG_PCI_MSI */
 
@@ -131,7 +126,7 @@ module_param_named(fmr_reserved_mtts, hca_profile.fmr_reserved_mtts, int, 0444);
 MODULE_PARM_DESC(fmr_reserved_mtts,
                  "number of memory translation table segments reserved for FMR");
 
-static const char mthca_version[] __devinitdata =
+static char mthca_version[] __devinitdata =
         DRV_NAME ": Mellanox InfiniBand HCA driver v"
         DRV_VERSION " (" DRV_RELDATE ")\n";
 
@@ -740,7 +735,8 @@ static int mthca_init_hca(struct mthca_dev *mdev)
         }
 
         mdev->eq_table.inta_pin = adapter.inta_pin;
-        mdev->rev_id            = adapter.revision_id;
+        if (!mthca_is_memfree(mdev))
+                mdev->rev_id = adapter.revision_id;
         memcpy(mdev->board_id, adapter.board_id, sizeof mdev->board_id);
 
         return 0;
@@ -816,13 +812,11 @@ static int mthca_setup_hca(struct mthca_dev *dev)
 
         err = mthca_NOP(dev, &status);
         if (err || status) {
-                if (dev->mthca_flags & (MTHCA_FLAG_MSI | MTHCA_FLAG_MSI_X)) {
+                if (dev->mthca_flags & MTHCA_FLAG_MSI_X) {
                         mthca_warn(dev, "NOP command failed to generate interrupt "
                                    "(IRQ %d).\n",
-                                   dev->mthca_flags & MTHCA_FLAG_MSI_X ?
-                                   dev->eq_table.eq[MTHCA_EQ_CMD].msi_x_vector :
-                                   dev->pdev->irq);
-                        mthca_warn(dev, "Trying again with MSI/MSI-X disabled.\n");
+                                   dev->eq_table.eq[MTHCA_EQ_CMD].msi_x_vector);
+                        mthca_warn(dev, "Trying again with MSI-X disabled.\n");
                 } else {
                         mthca_err(dev, "NOP command failed to generate interrupt "
                                   "(IRQ %d), aborting.\n",
@@ -1005,7 +999,7 @@ static struct {
                            .flags     = 0 },
         [ARBEL_COMPAT] = { .latest_fw = MTHCA_FW_VER(4, 8, 200),
                            .flags     = MTHCA_FLAG_PCIE },
-        [ARBEL_NATIVE] = { .latest_fw = MTHCA_FW_VER(5, 2, 0),
+        [ARBEL_NATIVE] = { .latest_fw = MTHCA_FW_VER(5, 3, 0),
                            .flags     = MTHCA_FLAG_MEMFREE |
                                         MTHCA_FLAG_PCIE },
         [SINAI]        = { .latest_fw = MTHCA_FW_VER(1, 2, 0),
@@ -1128,29 +1122,12 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type)
 
         if (msi_x && !mthca_enable_msi_x(mdev))
                 mdev->mthca_flags |= MTHCA_FLAG_MSI_X;
-        else if (msi) {
-                static int warned;
-
-                if (!warned) {
-                        printk(KERN_WARNING PFX "WARNING: MSI support will be "
-                               "removed from the ib_mthca driver in January 2008.\n");
-                        printk(KERN_WARNING "    If you are using MSI and cannot "
-                               "switch to MSI-X, please tell "
-                               "<general@lists.openfabrics.org>.\n");
-                        ++warned;
-                }
-
-                if (!pci_enable_msi(pdev))
-                        mdev->mthca_flags |= MTHCA_FLAG_MSI;
-        }
 
         err = mthca_setup_hca(mdev);
-        if (err == -EBUSY && (mdev->mthca_flags & (MTHCA_FLAG_MSI | MTHCA_FLAG_MSI_X))) {
+        if (err == -EBUSY && (mdev->mthca_flags & MTHCA_FLAG_MSI_X)) {
                 if (mdev->mthca_flags & MTHCA_FLAG_MSI_X)
                         pci_disable_msix(pdev);
-                if (mdev->mthca_flags & MTHCA_FLAG_MSI)
-                        pci_disable_msi(pdev);
-                mdev->mthca_flags &= ~(MTHCA_FLAG_MSI_X | MTHCA_FLAG_MSI);
+                mdev->mthca_flags &= ~MTHCA_FLAG_MSI_X;
 
                 err = mthca_setup_hca(mdev);
         }
@@ -1192,8 +1169,6 @@ err_cleanup:
 err_close:
         if (mdev->mthca_flags & MTHCA_FLAG_MSI_X)
                 pci_disable_msix(pdev);
-        if (mdev->mthca_flags & MTHCA_FLAG_MSI)
-                pci_disable_msi(pdev);
 
         mthca_close_hca(mdev);
 
@@ -1246,8 +1221,6 @@ static void __mthca_remove_one(struct pci_dev *pdev)
 
                 if (mdev->mthca_flags & MTHCA_FLAG_MSI_X)
                         pci_disable_msix(pdev);
-                if (mdev->mthca_flags & MTHCA_FLAG_MSI)
-                        pci_disable_msi(pdev);
 
                 ib_dealloc_device(&mdev->ib_dev);
                 mthca_release_regions(pdev, mdev->mthca_flags &
diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
index aa6c70a6a36f..3b6985557cb2 100644
--- a/drivers/infiniband/hw/mthca/mthca_mr.c
+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
@@ -613,8 +613,10 @@ int mthca_fmr_alloc(struct mthca_dev *dev, u32 pd,
                         sizeof *(mr->mem.tavor.mpt) * idx;
 
         mr->mtt = __mthca_alloc_mtt(dev, list_len, dev->mr_table.fmr_mtt_buddy);
-        if (IS_ERR(mr->mtt))
+        if (IS_ERR(mr->mtt)) {
+                err = PTR_ERR(mr->mtt);
                 goto err_out_table;
+        }
 
         mtt_seg = mr->mtt->first_seg * MTHCA_MTT_SEG_SIZE;
 
@@ -627,8 +629,10 @@ int mthca_fmr_alloc(struct mthca_dev *dev, u32 pd,
                 mr->mem.tavor.mtts = dev->mr_table.tavor_fmr.mtt_base + mtt_seg;
 
         mailbox = mthca_alloc_mailbox(dev, GFP_KERNEL);
-        if (IS_ERR(mailbox))
+        if (IS_ERR(mailbox)) {
+                err = PTR_ERR(mailbox);
                 goto err_out_free_mtt;
+        }
 
         mpt_entry = mailbox->buf;
 
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index 6bcde1cb9688..9e491df6419c 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -923,17 +923,13 @@ static struct ib_mr *mthca_reg_phys_mr(struct ib_pd       *pd,
         struct mthca_mr *mr;
         u64 *page_list;
         u64 total_size;
-        u64 mask;
+        unsigned long mask;
         int shift;
         int npages;
         int err;
         int i, j, n;
 
-        /* First check that we have enough alignment */
-        if ((*iova_start & ~PAGE_MASK) != (buffer_list[0].addr & ~PAGE_MASK))
-                return ERR_PTR(-EINVAL);
-
-        mask = 0;
+        mask = buffer_list[0].addr ^ *iova_start;
         total_size = 0;
         for (i = 0; i < num_phys_buf; ++i) {
                 if (i != 0)
@@ -947,17 +943,7 @@ static struct ib_mr *mthca_reg_phys_mr(struct ib_pd       *pd,
         if (mask & ~PAGE_MASK)
                 return ERR_PTR(-EINVAL);
 
-        /* Find largest page shift we can use to cover buffers */
-        for (shift = PAGE_SHIFT; shift < 31; ++shift)
-                if (num_phys_buf > 1) {
-                        if ((1ULL << shift) & mask)
-                                break;
-                } else {
-                        if (1ULL << shift >=
-                            buffer_list[0].size +
-                            (buffer_list[0].addr & ((1ULL << shift) - 1)))
-                                break;
-                }
+        shift = __ffs(mask | 1 << 31);
 
         buffer_list[0].size += buffer_list[0].addr & ((1ULL << shift) - 1);
         buffer_list[0].addr &= ~0ull << shift;
@@ -1270,6 +1256,8 @@ static int mthca_init_node_data(struct mthca_dev *dev)
                 goto out;
         }
 
+        if (mthca_is_memfree(dev))
+                dev->rev_id = be32_to_cpup((__be32 *) (out_mad->data + 32));
         memcpy(&dev->ib_dev.node_guid, out_mad->data + 12, 8);
 
 out:
diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
index 0e5461c65731..db5595bbf7f0 100644
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
@@ -1175,6 +1175,7 @@ static int mthca_alloc_qp_common(struct mthca_dev *dev,
 {
         int ret;
         int i;
+        struct mthca_next_seg *next;
 
         qp->refcount = 1;
         init_waitqueue_head(&qp->wait);
@@ -1217,7 +1218,6 @@ static int mthca_alloc_qp_common(struct mthca_dev *dev,
         }
 
         if (mthca_is_memfree(dev)) {
-                struct mthca_next_seg *next;
                 struct mthca_data_seg *scatter;
                 int size = (sizeof (struct mthca_next_seg) +
                             qp->rq.max_gs * sizeof (struct mthca_data_seg)) / 16;
@@ -1240,6 +1240,13 @@ static int mthca_alloc_qp_common(struct mthca_dev *dev,
                                                     qp->sq.wqe_shift) +
                                                    qp->send_wqe_offset);
                 }
+        } else {
+                for (i = 0; i < qp->rq.max; ++i) {
+                        next = get_recv_wqe(qp, i);
+                        next->nda_op = htonl((((i + 1) % qp->rq.max) <<
+                                              qp->rq.wqe_shift) | 1);
+                }
+
         }
 
         qp->sq.last = get_send_wqe(qp, qp->sq.max - 1);
@@ -1863,7 +1870,6 @@ int mthca_tavor_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
                 prev_wqe = qp->rq.last;
                 qp->rq.last = wqe;
 
-                ((struct mthca_next_seg *) wqe)->nda_op = 0;
                 ((struct mthca_next_seg *) wqe)->ee_nds =
                         cpu_to_be32(MTHCA_NEXT_DBD);
                 ((struct mthca_next_seg *) wqe)->flags = 0;
@@ -1885,9 +1891,6 @@ int mthca_tavor_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
 
                 qp->wrid[ind] = wr->wr_id;
 
-                ((struct mthca_next_seg *) prev_wqe)->nda_op =
-                        cpu_to_be32((ind << qp->rq.wqe_shift) | 1);
-                wmb();
                 ((struct mthca_next_seg *) prev_wqe)->ee_nds =
                         cpu_to_be32(MTHCA_NEXT_DBD | size);
 
diff --git a/drivers/infiniband/hw/mthca/mthca_srq.c b/drivers/infiniband/hw/mthca/mthca_srq.c
index 553d681f6813..a5ffff6e1026 100644
--- a/drivers/infiniband/hw/mthca/mthca_srq.c
+++ b/drivers/infiniband/hw/mthca/mthca_srq.c
@@ -175,9 +175,17 @@ static int mthca_alloc_srq_buf(struct mthca_dev *dev, struct mthca_pd *pd,
          * scatter list L_Keys to the sentry value of 0x100.
          */
         for (i = 0; i < srq->max; ++i) {
-                wqe = get_wqe(srq, i);
+                struct mthca_next_seg *next;
 
-                *wqe_to_link(wqe) = i < srq->max - 1 ? i + 1 : -1;
+                next = wqe = get_wqe(srq, i);
+
+                if (i < srq->max - 1) {
+                        *wqe_to_link(wqe) = i + 1;
+                        next->nda_op = htonl(((i + 1) << srq->wqe_shift) | 1);
+                } else {
+                        *wqe_to_link(wqe) = -1;
+                        next->nda_op = 0;
+                }
 
                 for (scatter = wqe + sizeof (struct mthca_next_seg);
                      (void *) scatter < wqe + (1 << srq->wqe_shift);
@@ -470,16 +478,15 @@ out:
 void mthca_free_srq_wqe(struct mthca_srq *srq, u32 wqe_addr)
 {
         int ind;
+        struct mthca_next_seg *last_free;
 
         ind = wqe_addr >> srq->wqe_shift;
 
         spin_lock(&srq->lock);
 
-        if (likely(srq->first_free >= 0))
-                *wqe_to_link(get_wqe(srq, srq->last_free)) = ind;
-        else
-                srq->first_free = ind;
-
+        last_free = get_wqe(srq, srq->last_free);
+        *wqe_to_link(last_free) = ind;
+        last_free->nda_op = htonl((ind << srq->wqe_shift) | 1);
         *wqe_to_link(get_wqe(srq, ind)) = -1;
         srq->last_free = ind;
 
@@ -506,15 +513,7 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
         first_ind = srq->first_free;
 
         for (nreq = 0; wr; wr = wr->next) {
-                ind = srq->first_free;
-
-                if (unlikely(ind < 0)) {
-                        mthca_err(dev, "SRQ %06x full\n", srq->srqn);
-                        err = -ENOMEM;
-                        *bad_wr = wr;
-                        break;
-                }
-
+                ind       = srq->first_free;
                 wqe       = get_wqe(srq, ind);
                 next_ind  = *wqe_to_link(wqe);
 
@@ -528,7 +527,6 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
                 prev_wqe  = srq->last;
                 srq->last = wqe;
 
-                ((struct mthca_next_seg *) wqe)->nda_op = 0;
                 ((struct mthca_next_seg *) wqe)->ee_nds = 0;
                 /* flags field will always remain 0 */
 
@@ -549,9 +547,6 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
                 if (i < srq->max_gs)
                         mthca_set_data_seg_inval(wqe);
 
-                ((struct mthca_next_seg *) prev_wqe)->nda_op =
-                        cpu_to_be32((ind << srq->wqe_shift) | 1);
-                wmb();
                 ((struct mthca_next_seg *) prev_wqe)->ee_nds =
                         cpu_to_be32(MTHCA_NEXT_DBD);
 
@@ -614,15 +609,7 @@ int mthca_arbel_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
         spin_lock_irqsave(&srq->lock, flags);
 
         for (nreq = 0; wr; ++nreq, wr = wr->next) {
-                ind = srq->first_free;
-
-                if (unlikely(ind < 0)) {
-                        mthca_err(dev, "SRQ %06x full\n", srq->srqn);
-                        err = -ENOMEM;
-                        *bad_wr = wr;
-                        break;
-                }
-
+                ind       = srq->first_free;
                 wqe       = get_wqe(srq, ind);
                 next_ind  = *wqe_to_link(wqe);
 
@@ -633,8 +620,6 @@ int mthca_arbel_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
                         break;
                 }
 
-                ((struct mthca_next_seg *) wqe)->nda_op =
-                        cpu_to_be32((next_ind << srq->wqe_shift) | 1);
                 ((struct mthca_next_seg *) wqe)->ee_nds = 0;
                 /* flags field will always remain 0 */