Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / drivers / infiniband / hw / mthca / mthca_main.c
index 4d71ae8..9b9ff7b 100644 (file)
@@ -1,5 +1,7 @@
 /*
  * Copyright (c) 2004, 2005 Topspin Communications.  All rights reserved.
+ * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2005 Mellanox Technologies. 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
@@ -33,7 +35,6 @@
  */
 
 #include <linux/config.h>
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/errno.h>
@@ -51,6 +52,14 @@ MODULE_DESCRIPTION("Mellanox InfiniBand HCA low-level driver");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(DRV_VERSION);
 
+#ifdef CONFIG_INFINIBAND_MTHCA_DEBUG
+
+int mthca_debug_level = 0;
+module_param_named(debug_level, mthca_debug_level, int, 0644);
+MODULE_PARM_DESC(debug_level, "Enable debug tracing if > 0");
+
+#endif /* CONFIG_INFINIBAND_MTHCA_DEBUG */
+
 #ifdef CONFIG_PCI_MSI
 
 static int msi_x = 0;
@@ -68,19 +77,24 @@ MODULE_PARM_DESC(msi, "attempt to use MSI if nonzero");
 
 #endif /* CONFIG_PCI_MSI */
 
+static int tune_pci = 0;
+module_param(tune_pci, int, 0444);
+MODULE_PARM_DESC(tune_pci, "increase PCI burst from the default set by BIOS if nonzero");
+
 static const char mthca_version[] __devinitdata =
-       "ib_mthca: Mellanox InfiniBand HCA driver v"
+       DRV_NAME ": Mellanox InfiniBand HCA driver v"
        DRV_VERSION " (" DRV_RELDATE ")\n";
 
 static struct mthca_profile default_profile = {
-       .num_qp     = 1 << 16,
-       .rdb_per_qp = 4,
-       .num_cq     = 1 << 16,
-       .num_mcg    = 1 << 13,
-       .num_mpt    = 1 << 17,
-       .num_mtt    = 1 << 20,
-       .num_udav   = 1 << 15,  /* Tavor only */
-       .uarc_size  = 1 << 18,  /* Arbel only */
+       .num_qp            = 1 << 16,
+       .rdb_per_qp        = 4,
+       .num_cq            = 1 << 16,
+       .num_mcg           = 1 << 13,
+       .num_mpt           = 1 << 17,
+       .num_mtt           = 1 << 20,
+       .num_udav          = 1 << 15,   /* Tavor only */
+       .fmr_reserved_mtts = 1 << 18,   /* Tavor only */
+       .uarc_size         = 1 << 18,   /* Arbel only */
 };
 
 static int __devinit mthca_tune_pci(struct mthca_dev *mdev)
@@ -88,6 +102,9 @@ static int __devinit mthca_tune_pci(struct mthca_dev *mdev)
        int cap;
        u16 val;
 
+       if (!tune_pci)
+               return 0;
+
        /* First try to max out Read Byte Count */
        cap = pci_find_capability(mdev->pdev, PCI_CAP_ID_PCIX);
        if (cap) {
@@ -102,7 +119,7 @@ static int __devinit mthca_tune_pci(struct mthca_dev *mdev)
                                  "aborting.\n");
                        return -ENODEV;
                }
-       } else if (mdev->hca_type == TAVOR)
+       } else if (!(mdev->mthca_flags & MTHCA_FLAG_PCIE))
                mthca_info(mdev, "No PCI-X capability, not setting RBC.\n");
 
        cap = pci_find_capability(mdev->pdev, PCI_CAP_ID_EXP);
@@ -118,8 +135,7 @@ static int __devinit mthca_tune_pci(struct mthca_dev *mdev)
                                  "register, aborting.\n");
                        return -ENODEV;
                }
-       } else if (mdev->hca_type == ARBEL_NATIVE ||
-                  mdev->hca_type == ARBEL_COMPAT)
+       } else if (mdev->mthca_flags & MTHCA_FLAG_PCIE)
                mthca_info(mdev, "No PCI Express capability, "
                           "not setting Max Read Request Size.\n");
 
@@ -154,6 +170,13 @@ static int __devinit mthca_dev_lim(struct mthca_dev *mdev, struct mthca_dev_lim
                return -ENODEV;
        }
 
+       if (dev_lim->uar_size > pci_resource_len(mdev->pdev, 2)) {
+               mthca_err(mdev, "HCA reported UAR size of 0x%x bigger than "
+                         "PCI resource 2 size of 0x%lx, aborting.\n",
+                         dev_lim->uar_size, pci_resource_len(mdev->pdev, 2));
+               return -ENODEV;
+       }
+
        mdev->limits.num_ports          = dev_lim->num_ports;
        mdev->limits.vl_cap             = dev_lim->max_vl;
        mdev->limits.mtu_cap            = dev_lim->max_mtu;
@@ -161,15 +184,68 @@ static int __devinit mthca_dev_lim(struct mthca_dev *mdev, struct mthca_dev_lim
        mdev->limits.pkey_table_len     = dev_lim->max_pkeys;
        mdev->limits.local_ca_ack_delay = dev_lim->local_ca_ack_delay;
        mdev->limits.max_sg             = dev_lim->max_sg;
+       mdev->limits.max_wqes           = dev_lim->max_qp_sz;
+       mdev->limits.max_qp_init_rdma   = dev_lim->max_requester_per_qp;
        mdev->limits.reserved_qps       = dev_lim->reserved_qps;
+       mdev->limits.max_srq_wqes       = dev_lim->max_srq_sz;
        mdev->limits.reserved_srqs      = dev_lim->reserved_srqs;
        mdev->limits.reserved_eecs      = dev_lim->reserved_eecs;
+       mdev->limits.max_desc_sz        = dev_lim->max_desc_sz;
+       mdev->limits.max_srq_sge        = mthca_max_srq_sge(mdev);
+       /*
+        * Subtract 1 from the limit because we need to allocate a
+        * spare CQE so the HCA HW can tell the difference between an
+        * empty CQ and a full CQ.
+        */
+       mdev->limits.max_cqes           = dev_lim->max_cq_sz - 1;
        mdev->limits.reserved_cqs       = dev_lim->reserved_cqs;
        mdev->limits.reserved_eqs       = dev_lim->reserved_eqs;
        mdev->limits.reserved_mtts      = dev_lim->reserved_mtts;
        mdev->limits.reserved_mrws      = dev_lim->reserved_mrws;
        mdev->limits.reserved_uars      = dev_lim->reserved_uars;
        mdev->limits.reserved_pds       = dev_lim->reserved_pds;
+       mdev->limits.port_width_cap     = dev_lim->max_port_width;
+       mdev->limits.page_size_cap      = ~(u32) (dev_lim->min_page_sz - 1);
+       mdev->limits.flags              = dev_lim->flags;
+       /*
+        * For old FW that doesn't return static rate support, use a
+        * value of 0x3 (only static rate values of 0 or 1 are handled),
+        * except on Sinai, where even old FW can handle static rate
+        * values of 2 and 3.
+        */
+       if (dev_lim->stat_rate_support)
+               mdev->limits.stat_rate_support = dev_lim->stat_rate_support;
+       else if (mdev->mthca_flags & MTHCA_FLAG_SINAI_OPT)
+               mdev->limits.stat_rate_support = 0xf;
+       else
+               mdev->limits.stat_rate_support = 0x3;
+
+       /* IB_DEVICE_RESIZE_MAX_WR not supported by driver.
+          May be doable since hardware supports it for SRQ.
+
+          IB_DEVICE_N_NOTIFY_CQ is supported by hardware but not by driver.
+
+          IB_DEVICE_SRQ_RESIZE is supported by hardware but SRQ is not
+          supported by driver. */
+       mdev->device_cap_flags = IB_DEVICE_CHANGE_PHY_PORT |
+               IB_DEVICE_PORT_ACTIVE_EVENT |
+               IB_DEVICE_SYS_IMAGE_GUID |
+               IB_DEVICE_RC_RNR_NAK_GEN;
+
+       if (dev_lim->flags & DEV_LIM_FLAG_BAD_PKEY_CNTR)
+               mdev->device_cap_flags |= IB_DEVICE_BAD_PKEY_CNTR;
+
+       if (dev_lim->flags & DEV_LIM_FLAG_BAD_QKEY_CNTR)
+               mdev->device_cap_flags |= IB_DEVICE_BAD_QKEY_CNTR;
+
+       if (dev_lim->flags & DEV_LIM_FLAG_RAW_MULTI)
+               mdev->device_cap_flags |= IB_DEVICE_RAW_MULTI;
+
+       if (dev_lim->flags & DEV_LIM_FLAG_AUTO_PATH_MIG)
+               mdev->device_cap_flags |= IB_DEVICE_AUTO_PATH_MIG;
+
+       if (dev_lim->flags & DEV_LIM_FLAG_UD_AV_PORT_ENFORCE)
+               mdev->device_cap_flags |= IB_DEVICE_UD_AV_PORT_ENFORCE;
 
        if (dev_lim->flags & DEV_LIM_FLAG_SRQ)
                mdev->mthca_flags |= MTHCA_FLAG_SRQ;
@@ -184,7 +260,6 @@ static int __devinit mthca_init_tavor(struct mthca_dev *mdev)
        struct mthca_dev_lim        dev_lim;
        struct mthca_profile        profile;
        struct mthca_init_hca_param init_hca;
-       struct mthca_adapter        adapter;
 
        err = mthca_SYS_EN(mdev, &status);
        if (err) {
@@ -221,10 +296,16 @@ static int __devinit mthca_init_tavor(struct mthca_dev *mdev)
        }
 
        err = mthca_dev_lim(mdev, &dev_lim);
+       if (err) {
+               mthca_err(mdev, "QUERY_DEV_LIM command failed, aborting.\n");
+               goto err_disable;
+       }
 
        profile = default_profile;
        profile.num_uar   = dev_lim.uar_size / PAGE_SIZE;
        profile.uarc_size = 0;
+       if (mdev->mthca_flags & MTHCA_FLAG_SRQ)
+               profile.num_srq = dev_lim.max_srqs;
 
        err = mthca_make_profile(mdev, &profile, &dev_lim, &init_hca);
        if (err < 0)
@@ -242,26 +323,8 @@ static int __devinit mthca_init_tavor(struct mthca_dev *mdev)
                goto err_disable;
        }
 
-       err = mthca_QUERY_ADAPTER(mdev, &adapter, &status);
-       if (err) {
-               mthca_err(mdev, "QUERY_ADAPTER command failed, aborting.\n");
-               goto err_close;
-       }
-       if (status) {
-               mthca_err(mdev, "QUERY_ADAPTER returned status 0x%02x, "
-                         "aborting.\n", status);
-               err = -EINVAL;
-               goto err_close;
-       }
-
-       mdev->eq_table.inta_pin = adapter.inta_pin;
-       mdev->rev_id            = adapter.revision_id;
-
        return 0;
 
-err_close:
-       mthca_CLOSE_HCA(mdev, 0, &status);
-
 err_disable:
        mthca_SYS_DIS(mdev, &status);
 
@@ -363,10 +426,9 @@ static int __devinit mthca_init_icm(struct mthca_dev *mdev,
        }
 
        mdev->mr_table.mtt_table = mthca_alloc_icm_table(mdev, init_hca->mtt_base,
-                                                        mdev->limits.num_mtt_segs *
-                                                        init_hca->mtt_seg_sz,
-                                                        mdev->limits.reserved_mtts *
-                                                        init_hca->mtt_seg_sz, 1);
+                                                        MTHCA_MTT_SEG_SIZE,
+                                                        mdev->limits.num_mtt_segs,
+                                                        mdev->limits.reserved_mtts, 1);
        if (!mdev->mr_table.mtt_table) {
                mthca_err(mdev, "Failed to map MTT context memory, aborting.\n");
                err = -ENOMEM;
@@ -374,10 +436,9 @@ static int __devinit mthca_init_icm(struct mthca_dev *mdev,
        }
 
        mdev->mr_table.mpt_table = mthca_alloc_icm_table(mdev, init_hca->mpt_base,
-                                                        mdev->limits.num_mpts *
                                                         dev_lim->mpt_entry_sz,
-                                                        mdev->limits.reserved_mrws *
-                                                        dev_lim->mpt_entry_sz, 1);
+                                                        mdev->limits.num_mpts,
+                                                        mdev->limits.reserved_mrws, 1);
        if (!mdev->mr_table.mpt_table) {
                mthca_err(mdev, "Failed to map MPT context memory, aborting.\n");
                err = -ENOMEM;
@@ -385,10 +446,9 @@ static int __devinit mthca_init_icm(struct mthca_dev *mdev,
        }
 
        mdev->qp_table.qp_table = mthca_alloc_icm_table(mdev, init_hca->qpc_base,
-                                                       mdev->limits.num_qps *
                                                        dev_lim->qpc_entry_sz,
-                                                       mdev->limits.reserved_qps *
-                                                       dev_lim->qpc_entry_sz, 1);
+                                                       mdev->limits.num_qps,
+                                                       mdev->limits.reserved_qps, 0);
        if (!mdev->qp_table.qp_table) {
                mthca_err(mdev, "Failed to map QP context memory, aborting.\n");
                err = -ENOMEM;
@@ -396,29 +456,80 @@ static int __devinit mthca_init_icm(struct mthca_dev *mdev,
        }
 
        mdev->qp_table.eqp_table = mthca_alloc_icm_table(mdev, init_hca->eqpc_base,
-                                                        mdev->limits.num_qps *
                                                         dev_lim->eqpc_entry_sz,
-                                                        mdev->limits.reserved_qps *
-                                                        dev_lim->eqpc_entry_sz, 1);
+                                                        mdev->limits.num_qps,
+                                                        mdev->limits.reserved_qps, 0);
        if (!mdev->qp_table.eqp_table) {
                mthca_err(mdev, "Failed to map EQP context memory, aborting.\n");
                err = -ENOMEM;
                goto err_unmap_qp;
        }
 
-       mdev->cq_table.table = mthca_alloc_icm_table(mdev, init_hca->cqc_base,
-                                                    mdev->limits.num_cqs *
-                                                    dev_lim->cqc_entry_sz,
-                                                    mdev->limits.reserved_cqs *
-                                                    dev_lim->cqc_entry_sz, 1);
+       mdev->qp_table.rdb_table = mthca_alloc_icm_table(mdev, init_hca->rdb_base,
+                                                        MTHCA_RDB_ENTRY_SIZE,
+                                                        mdev->limits.num_qps <<
+                                                        mdev->qp_table.rdb_shift,
+                                                        0, 0);
+       if (!mdev->qp_table.rdb_table) {
+               mthca_err(mdev, "Failed to map RDB context memory, aborting\n");
+               err = -ENOMEM;
+               goto err_unmap_eqp;
+       }
+
+       mdev->cq_table.table = mthca_alloc_icm_table(mdev, init_hca->cqc_base,
+                                                   dev_lim->cqc_entry_sz,
+                                                   mdev->limits.num_cqs,
+                                                   mdev->limits.reserved_cqs, 0);
        if (!mdev->cq_table.table) {
                mthca_err(mdev, "Failed to map CQ context memory, aborting.\n");
                err = -ENOMEM;
-               goto err_unmap_eqp;
+               goto err_unmap_rdb;
+       }
+
+       if (mdev->mthca_flags & MTHCA_FLAG_SRQ) {
+               mdev->srq_table.table =
+                       mthca_alloc_icm_table(mdev, init_hca->srqc_base,
+                                             dev_lim->srq_entry_sz,
+                                             mdev->limits.num_srqs,
+                                             mdev->limits.reserved_srqs, 0);
+               if (!mdev->srq_table.table) {
+                       mthca_err(mdev, "Failed to map SRQ context memory, "
+                                 "aborting.\n");
+                       err = -ENOMEM;
+                       goto err_unmap_cq;
+               }
+       }
+
+       /*
+        * It's not strictly required, but for simplicity just map the
+        * whole multicast group table now.  The table isn't very big
+        * and it's a lot easier than trying to track ref counts.
+        */
+       mdev->mcg_table.table = mthca_alloc_icm_table(mdev, init_hca->mc_base,
+                                                     MTHCA_MGM_ENTRY_SIZE,
+                                                     mdev->limits.num_mgms +
+                                                     mdev->limits.num_amgms,
+                                                     mdev->limits.num_mgms +
+                                                     mdev->limits.num_amgms,
+                                                     0);
+       if (!mdev->mcg_table.table) {
+               mthca_err(mdev, "Failed to map MCG context memory, aborting.\n");
+               err = -ENOMEM;
+               goto err_unmap_srq;
        }
 
        return 0;
 
+err_unmap_srq:
+       if (mdev->mthca_flags & MTHCA_FLAG_SRQ)
+               mthca_free_icm_table(mdev, mdev->srq_table.table);
+
+err_unmap_cq:
+       mthca_free_icm_table(mdev, mdev->cq_table.table);
+
+err_unmap_rdb:
+       mthca_free_icm_table(mdev, mdev->qp_table.rdb_table);
+
 err_unmap_eqp:
        mthca_free_icm_table(mdev, mdev->qp_table.eqp_table);
 
@@ -443,12 +554,30 @@ err_free_aux:
        return err;
 }
 
+static void mthca_free_icms(struct mthca_dev *mdev)
+{
+       u8 status;
+
+       mthca_free_icm_table(mdev, mdev->mcg_table.table);
+       if (mdev->mthca_flags & MTHCA_FLAG_SRQ)
+               mthca_free_icm_table(mdev, mdev->srq_table.table);
+       mthca_free_icm_table(mdev, mdev->cq_table.table);
+       mthca_free_icm_table(mdev, mdev->qp_table.rdb_table);
+       mthca_free_icm_table(mdev, mdev->qp_table.eqp_table);
+       mthca_free_icm_table(mdev, mdev->qp_table.qp_table);
+       mthca_free_icm_table(mdev, mdev->mr_table.mpt_table);
+       mthca_free_icm_table(mdev, mdev->mr_table.mtt_table);
+       mthca_unmap_eq_icm(mdev);
+
+       mthca_UNMAP_ICM_AUX(mdev, &status);
+       mthca_free_icm(mdev, mdev->fw.arbel.aux_icm);
+}
+
 static int __devinit mthca_init_arbel(struct mthca_dev *mdev)
 {
        struct mthca_dev_lim        dev_lim;
        struct mthca_profile        profile;
        struct mthca_init_hca_param init_hca;
-       struct mthca_adapter        adapter;
        u64 icm_size;
        u8 status;
        int err;
@@ -493,6 +622,8 @@ static int __devinit mthca_init_arbel(struct mthca_dev *mdev)
        profile = default_profile;
        profile.num_uar  = dev_lim.uar_size / PAGE_SIZE;
        profile.num_udav = 0;
+       if (mdev->mthca_flags & MTHCA_FLAG_SRQ)
+               profile.num_srq = dev_lim.max_srqs;
 
        icm_size = mthca_make_profile(mdev, &profile, &dev_lim, &init_hca);
        if ((int) icm_size < 0) {
@@ -516,33 +647,10 @@ static int __devinit mthca_init_arbel(struct mthca_dev *mdev)
                goto err_free_icm;
        }
 
-       err = mthca_QUERY_ADAPTER(mdev, &adapter, &status);
-       if (err) {
-               mthca_err(mdev, "QUERY_ADAPTER command failed, aborting.\n");
-               goto err_free_icm;
-       }
-       if (status) {
-               mthca_err(mdev, "QUERY_ADAPTER returned status 0x%02x, "
-                         "aborting.\n", status);
-               err = -EINVAL;
-               goto err_free_icm;
-       }
-
-       mdev->eq_table.inta_pin = adapter.inta_pin;
-       mdev->rev_id            = adapter.revision_id;
-
        return 0;
 
 err_free_icm:
-       mthca_free_icm_table(mdev, mdev->cq_table.table);
-       mthca_free_icm_table(mdev, mdev->qp_table.eqp_table);
-       mthca_free_icm_table(mdev, mdev->qp_table.qp_table);
-       mthca_free_icm_table(mdev, mdev->mr_table.mpt_table);
-       mthca_free_icm_table(mdev, mdev->mr_table.mtt_table);
-       mthca_unmap_eq_icm(mdev);
-
-       mthca_UNMAP_ICM_AUX(mdev, &status);
-       mthca_free_icm(mdev, mdev->fw.arbel.aux_icm);
+       mthca_free_icms(mdev);
 
 err_stop_fw:
        mthca_UNMAP_FA(mdev, &status);
@@ -555,12 +663,59 @@ err_disable:
        return err;
 }
 
+static void mthca_close_hca(struct mthca_dev *mdev)
+{
+       u8 status;
+
+       mthca_CLOSE_HCA(mdev, 0, &status);
+
+       if (mthca_is_memfree(mdev)) {
+               mthca_free_icms(mdev);
+
+               mthca_UNMAP_FA(mdev, &status);
+               mthca_free_icm(mdev, mdev->fw.arbel.fw_icm);
+
+               if (!(mdev->mthca_flags & MTHCA_FLAG_NO_LAM))
+                       mthca_DISABLE_LAM(mdev, &status);
+       } else
+               mthca_SYS_DIS(mdev, &status);
+}
+
 static int __devinit mthca_init_hca(struct mthca_dev *mdev)
 {
-       if (mdev->hca_type == ARBEL_NATIVE)
-               return mthca_init_arbel(mdev);
+       u8 status;
+       int err;
+       struct mthca_adapter adapter;
+
+       if (mthca_is_memfree(mdev))
+               err = mthca_init_arbel(mdev);
        else
-               return mthca_init_tavor(mdev);
+               err = mthca_init_tavor(mdev);
+
+       if (err)
+               return err;
+
+       err = mthca_QUERY_ADAPTER(mdev, &adapter, &status);
+       if (err) {
+               mthca_err(mdev, "QUERY_ADAPTER command failed, aborting.\n");
+               goto err_close;
+       }
+       if (status) {
+               mthca_err(mdev, "QUERY_ADAPTER returned status 0x%02x, "
+                         "aborting.\n", status);
+               err = -EINVAL;
+               goto err_close;
+       }
+
+       mdev->eq_table.inta_pin = adapter.inta_pin;
+       mdev->rev_id            = adapter.revision_id;
+       memcpy(mdev->board_id, adapter.board_id, sizeof mdev->board_id);
+
+       return 0;
+
+err_close:
+       mthca_close_hca(mdev);
+       return err;
 }
 
 static int __devinit mthca_setup_hca(struct mthca_dev *dev)
@@ -570,11 +725,33 @@ static int __devinit mthca_setup_hca(struct mthca_dev *dev)
 
        MTHCA_INIT_DOORBELL_LOCK(&dev->doorbell_lock);
 
+       err = mthca_init_uar_table(dev);
+       if (err) {
+               mthca_err(dev, "Failed to initialize "
+                         "user access region table, aborting.\n");
+               return err;
+       }
+
+       err = mthca_uar_alloc(dev, &dev->driver_uar);
+       if (err) {
+               mthca_err(dev, "Failed to allocate driver access region, "
+                         "aborting.\n");
+               goto err_uar_table_free;
+       }
+
+       dev->kar = ioremap(dev->driver_uar.pfn << PAGE_SHIFT, PAGE_SIZE);
+       if (!dev->kar) {
+               mthca_err(dev, "Couldn't map kernel access region, "
+                         "aborting.\n");
+               err = -ENOMEM;
+               goto err_uar_free;
+       }
+
        err = mthca_init_pd_table(dev);
        if (err) {
                mthca_err(dev, "Failed to initialize "
                          "protection domain table, aborting.\n");
-               return err;
+               goto err_kar_unmap;
        }
 
        err = mthca_init_mr_table(dev);
@@ -584,20 +761,13 @@ static int __devinit mthca_setup_hca(struct mthca_dev *dev)
                goto err_pd_table_free;
        }
 
-       err = mthca_pd_alloc(dev, &dev->driver_pd);
+       err = mthca_pd_alloc(dev, 1, &dev->driver_pd);
        if (err) {
                mthca_err(dev, "Failed to create driver PD, "
                          "aborting.\n");
                goto err_mr_table_free;
        }
 
-       if (dev->hca_type == ARBEL_NATIVE) {
-               mthca_warn(dev, "Sorry, native MT25208 mode support is not done, "
-                          "aborting.\n");
-               err = -ENODEV;
-               goto err_pd_free;
-       }
-
        err = mthca_init_eq_table(dev);
        if (err) {
                mthca_err(dev, "Failed to initialize "
@@ -614,15 +784,19 @@ static int __devinit mthca_setup_hca(struct mthca_dev *dev)
 
        err = mthca_NOP(dev, &status);
        if (err || status) {
-               mthca_err(dev, "NOP command failed to generate interrupt, aborting.\n");
+               mthca_err(dev, "NOP command failed to generate interrupt (IRQ %d), aborting.\n",
+                         dev->mthca_flags & MTHCA_FLAG_MSI_X ?
+                         dev->eq_table.eq[MTHCA_EQ_CMD].msi_x_vector :
+                         dev->pdev->irq);
                if (dev->mthca_flags & (MTHCA_FLAG_MSI | MTHCA_FLAG_MSI_X))
                        mthca_err(dev, "Try again with MSI/MSI-X disabled.\n");
                else
                        mthca_err(dev, "BIOS or ACPI interrupt routing problem?\n");
 
                goto err_cmd_poll;
-       } else
-               mthca_dbg(dev, "NOP command IRQ test passed\n");
+       }
+
+       mthca_dbg(dev, "NOP command IRQ test passed\n");
 
        err = mthca_init_cq_table(dev);
        if (err) {
@@ -631,11 +805,18 @@ static int __devinit mthca_setup_hca(struct mthca_dev *dev)
                goto err_cmd_poll;
        }
 
+       err = mthca_init_srq_table(dev);
+       if (err) {
+               mthca_err(dev, "Failed to initialize "
+                         "shared receive queue table, aborting.\n");
+               goto err_cq_table_free;
+       }
+
        err = mthca_init_qp_table(dev);
        if (err) {
                mthca_err(dev, "Failed to initialize "
                          "queue pair table, aborting.\n");
-               goto err_cq_table_free;
+               goto err_srq_table_free;
        }
 
        err = mthca_init_av_table(dev);
@@ -660,6 +841,9 @@ err_av_table_free:
 err_qp_table_free:
        mthca_cleanup_qp_table(dev);
 
+err_srq_table_free:
+       mthca_cleanup_srq_table(dev);
+
 err_cq_table_free:
        mthca_cleanup_cq_table(dev);
 
@@ -677,6 +861,15 @@ err_mr_table_free:
 
 err_pd_table_free:
        mthca_cleanup_pd_table(dev);
+
+err_kar_unmap:
+       iounmap(dev->kar);
+
+err_uar_free:
+       mthca_uar_free(dev, &dev->driver_uar);
+
+err_uar_table_free:
+       mthca_cleanup_uar_table(dev);
        return err;
 }
 
@@ -686,37 +879,18 @@ static int __devinit mthca_request_regions(struct pci_dev *pdev,
        int err;
 
        /*
-        * We request our first BAR in two chunks, since the MSI-X
-        * vector table is right in the middle.
+        * We can't just use pci_request_regions() because the MSI-X
+        * table is right in the middle of the first BAR.  If we did
+        * pci_request_region and grab all of the first BAR, then
+        * setting up MSI-X would fail, since the PCI core wants to do
+        * request_mem_region on the MSI-X vector table.
         *
-        * This is why we can't just use pci_request_regions() -- if
-        * we did then setting up MSI-X would fail, since the PCI core
-        * wants to do request_mem_region on the MSI-X vector table.
+        * So just request what we need right now, and request any
+        * other regions we need when setting up EQs.
         */
-       if (!request_mem_region(pci_resource_start(pdev, 0) +
-                               MTHCA_HCR_BASE,
-                               MTHCA_HCR_SIZE,
-                               DRV_NAME)) {
-               err = -EBUSY;
-               goto err_hcr_failed;
-       }
-
-       if (!request_mem_region(pci_resource_start(pdev, 0) +
-                               MTHCA_ECR_BASE,
-                               MTHCA_MAP_ECR_SIZE,
-                               DRV_NAME)) {
-               err = -EBUSY;
-               goto err_ecr_failed;
-       }
-
-       if (!request_mem_region(pci_resource_start(pdev, 0) +
-                               MTHCA_CLR_INT_BASE,
-                               MTHCA_CLR_INT_SIZE,
-                               DRV_NAME)) {
-               err = -EBUSY;
-               goto err_int_failed;
-       }
-
+       if (!request_mem_region(pci_resource_start(pdev, 0) + MTHCA_HCR_BASE,
+                               MTHCA_HCR_SIZE, DRV_NAME))
+               return -EBUSY;
 
        err = pci_request_region(pdev, 2, DRV_NAME);
        if (err)
@@ -731,24 +905,11 @@ static int __devinit mthca_request_regions(struct pci_dev *pdev,
        return 0;
 
 err_bar4_failed:
-
        pci_release_region(pdev, 2);
-err_bar2_failed:
-
-       release_mem_region(pci_resource_start(pdev, 0) +
-                          MTHCA_CLR_INT_BASE,
-                          MTHCA_CLR_INT_SIZE);
-err_int_failed:
 
-       release_mem_region(pci_resource_start(pdev, 0) +
-                          MTHCA_ECR_BASE,
-                          MTHCA_MAP_ECR_SIZE);
-err_ecr_failed:
-
-       release_mem_region(pci_resource_start(pdev, 0) +
-                          MTHCA_HCR_BASE,
+err_bar2_failed:
+       release_mem_region(pci_resource_start(pdev, 0) + MTHCA_HCR_BASE,
                           MTHCA_HCR_SIZE);
-err_hcr_failed:
 
        return err;
 }
@@ -761,16 +922,7 @@ static void mthca_release_regions(struct pci_dev *pdev,
 
        pci_release_region(pdev, 2);
 
-       release_mem_region(pci_resource_start(pdev, 0) +
-                          MTHCA_CLR_INT_BASE,
-                          MTHCA_CLR_INT_SIZE);
-
-       release_mem_region(pci_resource_start(pdev, 0) +
-                          MTHCA_ECR_BASE,
-                          MTHCA_MAP_ECR_SIZE);
-
-       release_mem_region(pci_resource_start(pdev, 0) +
-                          MTHCA_HCR_BASE,
+       release_mem_region(pci_resource_start(pdev, 0) + MTHCA_HCR_BASE,
                           MTHCA_HCR_SIZE);
 }
 
@@ -798,31 +950,33 @@ static int __devinit mthca_enable_msi_x(struct mthca_dev *mdev)
        return 0;
 }
 
-static void mthca_close_hca(struct mthca_dev *mdev)
-{
-       u8 status;
-
-       mthca_CLOSE_HCA(mdev, 0, &status);
-
-       if (mdev->hca_type == ARBEL_NATIVE) {
-               mthca_free_icm_table(mdev, mdev->cq_table.table);
-               mthca_free_icm_table(mdev, mdev->qp_table.eqp_table);
-               mthca_free_icm_table(mdev, mdev->qp_table.qp_table);
-               mthca_free_icm_table(mdev, mdev->mr_table.mpt_table);
-               mthca_free_icm_table(mdev, mdev->mr_table.mtt_table);
-               mthca_unmap_eq_icm(mdev);
-
-               mthca_UNMAP_ICM_AUX(mdev, &status);
-               mthca_free_icm(mdev, mdev->fw.arbel.aux_icm);
-
-               mthca_UNMAP_FA(mdev, &status);
-               mthca_free_icm(mdev, mdev->fw.arbel.fw_icm);
+/* Types of supported HCA */
+enum {
+       TAVOR,                  /* MT23108                        */
+       ARBEL_COMPAT,           /* MT25208 in Tavor compat mode   */
+       ARBEL_NATIVE,           /* MT25208 with extended features */
+       SINAI                   /* MT25204 */
+};
 
-               if (!(mdev->mthca_flags & MTHCA_FLAG_NO_LAM))
-                       mthca_DISABLE_LAM(mdev, &status);
-       } else
-               mthca_SYS_DIS(mdev, &status);
-}
+#define MTHCA_FW_VER(major, minor, subminor) \
+       (((u64) (major) << 32) | ((u64) (minor) << 16) | (u64) (subminor))
+
+static struct {
+       u64 latest_fw;
+       u32 flags;
+} mthca_hca_table[] = {
+       [TAVOR]        = { .latest_fw = MTHCA_FW_VER(3, 4, 0),
+                          .flags     = 0 },
+       [ARBEL_COMPAT] = { .latest_fw = MTHCA_FW_VER(4, 7, 400),
+                          .flags     = MTHCA_FLAG_PCIE },
+       [ARBEL_NATIVE] = { .latest_fw = MTHCA_FW_VER(5, 1, 0),
+                          .flags     = MTHCA_FLAG_MEMFREE |
+                                       MTHCA_FLAG_PCIE },
+       [SINAI]        = { .latest_fw = MTHCA_FW_VER(1, 0, 800),
+                          .flags     = MTHCA_FLAG_MEMFREE |
+                                       MTHCA_FLAG_PCIE    |
+                                       MTHCA_FLAG_SINAI_OPT }
+};
 
 static int __devinit mthca_init_one(struct pci_dev *pdev,
                                    const struct pci_device_id *id)
@@ -830,7 +984,6 @@ static int __devinit mthca_init_one(struct pci_dev *pdev,
        static int mthca_version_printed = 0;
        int ddr_hidden = 0;
        int err;
-       unsigned long mthca_base;
        struct mthca_dev *mdev;
 
        if (!mthca_version_printed) {
@@ -838,8 +991,14 @@ static int __devinit mthca_init_one(struct pci_dev *pdev,
                ++mthca_version_printed;
        }
 
-       printk(KERN_INFO PFX "Initializing %s (%s)\n",
-              pci_pretty_name(pdev), pci_name(pdev));
+       printk(KERN_INFO PFX "Initializing %s\n",
+              pci_name(pdev));
+
+       if (id->driver_data >= ARRAY_SIZE(mthca_hca_table)) {
+               printk(KERN_ERR PFX "%s has invalid driver data %lx\n",
+                      pci_name(pdev), id->driver_data);
+               return -ENODEV;
+       }
 
        err = pci_enable_device(pdev);
        if (err) {
@@ -854,13 +1013,12 @@ static int __devinit mthca_init_one(struct pci_dev *pdev,
         */
        if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM) ||
            pci_resource_len(pdev, 0) != 1 << 20) {
-               dev_err(&pdev->dev, "Missing DCS, aborting.");
+               dev_err(&pdev->dev, "Missing DCS, aborting.\n");
                err = -ENODEV;
                goto err_disable_pdev;
        }
-       if (!(pci_resource_flags(pdev, 2) & IORESOURCE_MEM) ||
-           pci_resource_len(pdev, 2) != 1 << 23) {
-               dev_err(&pdev->dev, "Missing UAR, aborting.");
+       if (!(pci_resource_flags(pdev, 2) & IORESOURCE_MEM)) {
+               dev_err(&pdev->dev, "Missing UAR, aborting.\n");
                err = -ENODEV;
                goto err_disable_pdev;
        }
@@ -905,9 +1063,9 @@ static int __devinit mthca_init_one(struct pci_dev *pdev,
                goto err_free_res;
        }
 
-       mdev->pdev     = pdev;
-       mdev->hca_type = id->driver_data;
+       mdev->pdev = pdev;
 
+       mdev->mthca_flags = mthca_hca_table[id->driver_data].flags;
        if (ddr_hidden)
                mdev->mthca_flags |= MTHCA_FLAG_DDR_HIDDEN;
 
@@ -928,53 +1086,28 @@ static int __devinit mthca_init_one(struct pci_dev *pdev,
            !pci_enable_msi(pdev))
                mdev->mthca_flags |= MTHCA_FLAG_MSI;
 
-       sema_init(&mdev->cmd.hcr_sem, 1);
-       sema_init(&mdev->cmd.poll_sem, 1);
-       mdev->cmd.use_events = 0;
-
-       mthca_base = pci_resource_start(pdev, 0);
-       mdev->hcr = ioremap(mthca_base + MTHCA_HCR_BASE, MTHCA_HCR_SIZE);
-       if (!mdev->hcr) {
-               mthca_err(mdev, "Couldn't map command register, "
-                         "aborting.\n");
-               err = -ENOMEM;
+       if (mthca_cmd_init(mdev)) {
+               mthca_err(mdev, "Failed to init command interface, aborting.\n");
                goto err_free_dev;
        }
 
-       mdev->clr_base = ioremap(mthca_base + MTHCA_CLR_INT_BASE,
-                                MTHCA_CLR_INT_SIZE);
-       if (!mdev->clr_base) {
-               mthca_err(mdev, "Couldn't map interrupt clear register, "
-                         "aborting.\n");
-               err = -ENOMEM;
-               goto err_iounmap;
-       }
-
-       mdev->ecr_base = ioremap(mthca_base + MTHCA_ECR_BASE,
-                                MTHCA_ECR_SIZE + MTHCA_ECR_CLR_SIZE);
-       if (!mdev->ecr_base) {
-               mthca_err(mdev, "Couldn't map ecr register, "
-                         "aborting.\n");
-               err = -ENOMEM;
-               goto err_iounmap_clr;
-       }
-
-       mthca_base = pci_resource_start(pdev, 2);
-       mdev->kar = ioremap(mthca_base + PAGE_SIZE * MTHCA_KAR_PAGE, PAGE_SIZE);
-       if (!mdev->kar) {
-               mthca_err(mdev, "Couldn't map kernel access region, "
-                         "aborting.\n");
-               err = -ENOMEM;
-               goto err_iounmap_ecr;
-       }
-
        err = mthca_tune_pci(mdev);
        if (err)
-               goto err_iounmap_kar;
+               goto err_cmd;
 
        err = mthca_init_hca(mdev);
        if (err)
-               goto err_iounmap_kar;
+               goto err_cmd;
+
+       if (mdev->fw_ver < mthca_hca_table[id->driver_data].latest_fw) {
+               mthca_warn(mdev, "HCA FW version %d.%d.%d is old (%d.%d.%d is current).\n",
+                          (int) (mdev->fw_ver >> 32), (int) (mdev->fw_ver >> 16) & 0xffff,
+                          (int) (mdev->fw_ver & 0xffff),
+                          (int) (mthca_hca_table[id->driver_data].latest_fw >> 32),
+                          (int) (mthca_hca_table[id->driver_data].latest_fw >> 16) & 0xffff,
+                          (int) (mthca_hca_table[id->driver_data].latest_fw & 0xffff));
+               mthca_warn(mdev, "If you have problems, try updating your HCA FW.\n");
+       }
 
        err = mthca_setup_hca(mdev);
        if (err)
@@ -999,6 +1132,7 @@ err_cleanup:
        mthca_cleanup_mcg_table(mdev);
        mthca_cleanup_av_table(mdev);
        mthca_cleanup_qp_table(mdev);
+       mthca_cleanup_srq_table(mdev);
        mthca_cleanup_cq_table(mdev);
        mthca_cmd_use_polling(mdev);
        mthca_cleanup_eq_table(mdev);
@@ -1007,21 +1141,13 @@ err_cleanup:
 
        mthca_cleanup_mr_table(mdev);
        mthca_cleanup_pd_table(mdev);
+       mthca_cleanup_uar_table(mdev);
 
 err_close:
        mthca_close_hca(mdev);
 
-err_iounmap_kar:
-       iounmap(mdev->kar);
-
-err_iounmap_ecr:
-       iounmap(mdev->ecr_base);
-
-err_iounmap_clr:
-       iounmap(mdev->clr_base);
-
-err_iounmap:
-       iounmap(mdev->hcr);
+err_cmd:
+       mthca_cmd_cleanup(mdev);
 
 err_free_dev:
        if (mdev->mthca_flags & MTHCA_FLAG_MSI_X)
@@ -1056,6 +1182,7 @@ static void __devexit mthca_remove_one(struct pci_dev *pdev)
                mthca_cleanup_mcg_table(mdev);
                mthca_cleanup_av_table(mdev);
                mthca_cleanup_qp_table(mdev);
+               mthca_cleanup_srq_table(mdev);
                mthca_cleanup_cq_table(mdev);
                mthca_cmd_use_polling(mdev);
                mthca_cleanup_eq_table(mdev);
@@ -1065,11 +1192,11 @@ static void __devexit mthca_remove_one(struct pci_dev *pdev)
                mthca_cleanup_mr_table(mdev);
                mthca_cleanup_pd_table(mdev);
 
+               iounmap(mdev->kar);
+               mthca_uar_free(mdev, &mdev->driver_uar);
+               mthca_cleanup_uar_table(mdev);
                mthca_close_hca(mdev);
-
-               iounmap(mdev->hcr);
-               iounmap(mdev->ecr_base);
-               iounmap(mdev->clr_base);
+               mthca_cmd_cleanup(mdev);
 
                if (mdev->mthca_flags & MTHCA_FLAG_MSI_X)
                        pci_disable_msix(pdev);
@@ -1097,13 +1224,21 @@ static struct pci_device_id mthca_pci_table[] = {
          .driver_data = ARBEL_NATIVE },
        { PCI_DEVICE(PCI_VENDOR_ID_TOPSPIN, PCI_DEVICE_ID_MELLANOX_ARBEL),
          .driver_data = ARBEL_NATIVE },
+       { PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_SINAI),
+         .driver_data = SINAI },
+       { PCI_DEVICE(PCI_VENDOR_ID_TOPSPIN, PCI_DEVICE_ID_MELLANOX_SINAI),
+         .driver_data = SINAI },
+       { PCI_DEVICE(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_SINAI_OLD),
+         .driver_data = SINAI },
+       { PCI_DEVICE(PCI_VENDOR_ID_TOPSPIN, PCI_DEVICE_ID_MELLANOX_SINAI_OLD),
+         .driver_data = SINAI },
        { 0, }
 };
 
 MODULE_DEVICE_TABLE(pci, mthca_pci_table);
 
 static struct pci_driver mthca_driver = {
-       .name           = "ib_mthca",
+       .name           = DRV_NAME,
        .id_table       = mthca_pci_table,
        .probe          = mthca_init_one,
        .remove         = __devexit_p(mthca_remove_one)