IB/mthca: Optimize large messages on Sinai HCAs

Sinai (one-port PCI Express) HCAs get improved throughput for messages
bigger than 80 KB in DDR mode if memory keys are formatted in a
specific way.  The enhancement only works if the memory key table is
smaller than 2^24 entries.  For larger tables, the enhancement is off
and a warning is printed (to avoid silent performance loss).

Signed-off-by: Eli Cohen <eli@mellanox.co.il>
Signed-off-by: Michael Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

1 files changed, 13 insertions, 10 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
index 9c849d27b06e..d94837fbf162 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -935,13 +935,19 @@ enum {
 
 static struct {
         u64 latest_fw;
-        int is_memfree;
-        int is_pcie;
+        u32 flags;
 } mthca_hca_table[] = {
-        [TAVOR]        = { .latest_fw = MTHCA_FW_VER(3, 3, 3), .is_memfree = 0, .is_pcie = 0 },
-        [ARBEL_COMPAT] = { .latest_fw = MTHCA_FW_VER(4, 7, 0), .is_memfree = 0, .is_pcie = 1 },
-        [ARBEL_NATIVE] = { .latest_fw = MTHCA_FW_VER(5, 1, 0), .is_memfree = 1, .is_pcie = 1 },
-        [SINAI]        = { .latest_fw = MTHCA_FW_VER(1, 0, 1), .is_memfree = 1, .is_pcie = 1 }
+        [TAVOR]        = { .latest_fw = MTHCA_FW_VER(3, 3, 3),
+                           .flags     = 0 },
+        [ARBEL_COMPAT] = { .latest_fw = MTHCA_FW_VER(4, 7, 0),
+                           .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, 1),
+                           .flags     = MTHCA_FLAG_MEMFREE |
+                                        MTHCA_FLAG_PCIE    |
+                                        MTHCA_FLAG_SINAI_OPT }
 };
 
 static int __devinit mthca_init_one(struct pci_dev *pdev,
@@ -1031,12 +1037,9 @@ static int __devinit mthca_init_one(struct pci_dev *pdev,
 
         mdev->pdev = pdev;
 
+        mdev->mthca_flags = mthca_hca_table[id->driver_data].flags;
         if (ddr_hidden)
                 mdev->mthca_flags |= MTHCA_FLAG_DDR_HIDDEN;
-        if (mthca_hca_table[id->driver_data].is_memfree)
-                mdev->mthca_flags |= MTHCA_FLAG_MEMFREE;
-        if (mthca_hca_table[id->driver_data].is_pcie)
-                mdev->mthca_flags |= MTHCA_FLAG_PCIE;
 
         /*
          * Now reset the HCA before we touch the PCI capabilities or