4 files changed, 65 insertions, 61 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
index acc95892713..6966f943f44 100644
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
@@ -290,6 +290,12 @@ static int mthca_cmd_post(struct mthca_dev *dev,
                 err = mthca_cmd_post_hcr(dev, in_param, out_param, in_modifier,
                                          op_modifier, op, token, event);
 
+        /*
+         * Make sure that our HCR writes don't get mixed in with
+         * writes from another CPU starting a FW command.
+         */
+        mmiowb();
+
         mutex_unlock(&dev->cmd.hcr_mutex);
         return err;
 }
diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h
index 9bae3cc6060..15aa32eb78b 100644
--- a/drivers/infiniband/hw/mthca/mthca_dev.h
+++ b/drivers/infiniband/hw/mthca/mthca_dev.h
@@ -83,7 +83,7 @@ enum {
         MTHCA_QP_CONTEXT_SIZE = 0x200,
         MTHCA_RDB_ENTRY_SIZE  =  0x20,
         MTHCA_AV_SIZE         =  0x20,
-        MTHCA_MGM_ENTRY_SIZE  =  0x40,
+        MTHCA_MGM_ENTRY_SIZE  = 0x100,
 
         /* Arbel FW gives us these, but we need them for Tavor */
         MTHCA_MPT_ENTRY_SIZE  =  0x40,
diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
index 76fed7545c5..60de6f93869 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -61,7 +61,7 @@ MODULE_PARM_DESC(debug_level, "Enable debug tracing if > 0");
 
 #ifdef CONFIG_PCI_MSI
 
-static int msi_x = 0;
+static int msi_x = 1;
 module_param(msi_x, int, 0444);
 MODULE_PARM_DESC(msi_x, "attempt to use MSI-X if nonzero");
 
@@ -137,40 +137,23 @@ static const char mthca_version[] __devinitdata =
 
 static int 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) {
-                if (pci_read_config_word(mdev->pdev, cap + PCI_X_CMD, &val)) {
-                        mthca_err(mdev, "Couldn't read PCI-X command register, "
-                                  "aborting.\n");
-                        return -ENODEV;
-                }
-                val = (val & ~PCI_X_CMD_MAX_READ) | (3 << 2);
-                if (pci_write_config_word(mdev->pdev, cap + PCI_X_CMD, val)) {
-                        mthca_err(mdev, "Couldn't write PCI-X command register, "
-                                  "aborting.\n");
+        if (pci_find_capability(mdev->pdev, PCI_CAP_ID_PCIX)) {
+                if (pcix_set_mmrbc(mdev->pdev, pcix_get_max_mmrbc(mdev->pdev))) {
+                        mthca_err(mdev, "Couldn't set PCI-X max read count, "
+                                "aborting.\n");
                         return -ENODEV;
                 }
         } 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);
-        if (cap) {
-                if (pci_read_config_word(mdev->pdev, cap + PCI_EXP_DEVCTL, &val)) {
-                        mthca_err(mdev, "Couldn't read PCI Express device control "
-                                  "register, aborting.\n");
-                        return -ENODEV;
-                }
-                val = (val & ~PCI_EXP_DEVCTL_READRQ) | (5 << 12);
-                if (pci_write_config_word(mdev->pdev, cap + PCI_EXP_DEVCTL, val)) {
-                        mthca_err(mdev, "Couldn't write PCI Express device control "
-                                  "register, aborting.\n");
+        if (pci_find_capability(mdev->pdev, PCI_CAP_ID_EXP)) {
+                if (pcie_set_readrq(mdev->pdev, 4096)) {
+                        mthca_err(mdev, "Couldn't write PCI Express read request, "
+                                "aborting.\n");
                         return -ENODEV;
                 }
         } else if (mdev->mthca_flags & MTHCA_FLAG_PCIE)
@@ -833,14 +816,19 @@ static int mthca_setup_hca(struct mthca_dev *dev)
 
         err = mthca_NOP(dev, &status);
         if (err || status) {
-                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
+                if (dev->mthca_flags & (MTHCA_FLAG_MSI | 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");
+                } else {
+                        mthca_err(dev, "NOP command failed to generate interrupt "
+                                  "(IRQ %d), aborting.\n",
+                                  dev->pdev->irq);
                         mthca_err(dev, "BIOS or ACPI interrupt routing problem?\n");
+                }
 
                 goto err_cmd_poll;
         }
@@ -1115,24 +1103,6 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type)
                 goto err_free_dev;
         }
 
-        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;
-        }
-
         if (mthca_cmd_init(mdev)) {
                 mthca_err(mdev, "Failed to init command interface, aborting.\n");
                 goto err_free_dev;
@@ -1156,7 +1126,35 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type)
                 mthca_warn(mdev, "If you have problems, try updating your HCA FW.\n");
         }
 
+        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 (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);
+
+                err = mthca_setup_hca(mdev);
+        }
+
         if (err)
                 goto err_close;
 
@@ -1192,17 +1190,17 @@ err_cleanup:
         mthca_cleanup_uar_table(mdev);
 
 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);
 
 err_cmd:
         mthca_cmd_cleanup(mdev);
 
 err_free_dev:
-        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);
 
 err_free_res:
diff --git a/drivers/infiniband/hw/mthca/mthca_srq.c b/drivers/infiniband/hw/mthca/mthca_srq.c
index 88d219e730a..3f58c11a62b 100644
--- a/drivers/infiniband/hw/mthca/mthca_srq.c
+++ b/drivers/infiniband/hw/mthca/mthca_srq.c
@@ -509,7 +509,7 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
         for (nreq = 0; wr; wr = wr->next) {
                 ind = srq->first_free;
 
-                if (ind < 0) {
+                if (unlikely(ind < 0)) {
                         mthca_err(dev, "SRQ %06x full\n", srq->srqn);
                         err = -ENOMEM;
                         *bad_wr = wr;
@@ -519,7 +519,7 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
                 wqe       = get_wqe(srq, ind);
                 next_ind  = *wqe_to_link(wqe);
 
-                if (next_ind < 0) {
+                if (unlikely(next_ind < 0)) {
                         mthca_err(dev, "SRQ %06x full\n", srq->srqn);
                         err = -ENOMEM;
                         *bad_wr = wr;
@@ -623,7 +623,7 @@ int mthca_arbel_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
         for (nreq = 0; wr; ++nreq, wr = wr->next) {
                 ind = srq->first_free;
 
-                if (ind < 0) {
+                if (unlikely(ind < 0)) {
                         mthca_err(dev, "SRQ %06x full\n", srq->srqn);
                         err = -ENOMEM;
                         *bad_wr = wr;
@@ -633,7 +633,7 @@ int mthca_arbel_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
                 wqe       = get_wqe(srq, ind);
                 next_ind  = *wqe_to_link(wqe);
 
-                if (next_ind < 0) {
+                if (unlikely(next_ind < 0)) {
                         mthca_err(dev, "SRQ %06x full\n", srq->srqn);
                         err = -ENOMEM;
                         *bad_wr = wr;