xprtrdma: Remove Tavor MTU setting
authorChuck Lever <chuck.lever@oracle.com>
Wed, 28 May 2014 14:34:16 +0000 (10:34 -0400)
committerAnna Schumaker <Anna.Schumaker@Netapp.com>
Wed, 4 Jun 2014 12:56:48 +0000 (08:56 -0400)
Clean up.  Remove HCA-specific clutter in xprtrdma, which is
supposed to be device-independent.

Hal Rosenstock <hal@dev.mellanox.co.il> observes:
> Note that there is OpenSM option (enable_quirks) to return 1K MTU
> in SA PathRecord responses for Tavor so that can be used for this.
> The default setting for enable_quirks is FALSE so that would need
> changing.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
net/sunrpc/xprtrdma/verbs.c

index 54edf2ac48a1d685447a7ae3ee512a42cc73e263..515dfc14b7317f062ec23e71eb061996099ccb08 100644 (file)
@@ -48,7 +48,6 @@
  */
 
 #include <linux/interrupt.h>
-#include <linux/pci.h> /* for Tavor hack below */
 #include <linux/slab.h>
 #include <asm/bitops.h>
 
@@ -920,19 +919,6 @@ retry:
                }
        }
 
-/* XXX Tavor device performs badly with 2K MTU! */
-if (strnicmp(ia->ri_id->device->dma_device->bus->name, "pci", 3) == 0) {
-       struct pci_dev *pcid = to_pci_dev(ia->ri_id->device->dma_device);
-       if (pcid->device == PCI_DEVICE_ID_MELLANOX_TAVOR &&
-           (pcid->vendor == PCI_VENDOR_ID_MELLANOX ||
-            pcid->vendor == PCI_VENDOR_ID_TOPSPIN)) {
-               struct ib_qp_attr attr = {
-                       .path_mtu = IB_MTU_1024
-               };
-               rc = ib_modify_qp(ia->ri_id->qp, &attr, IB_QP_PATH_MTU);
-       }
-}
-
        ep->rep_connected = 0;
 
        rc = rdma_connect(ia->ri_id, &ep->rep_remote_cma);