| Message ID | 20140430193155.5663.86148.stgit@manet.1015granger.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 4/30/2014 3:31 PM, Chuck Lever wrote: > Clean up. Remove HCA-specific clutter in xprtrdma, which is > supposed to be device-independent. > > Signed-off-by: Chuck Lever <chuck.lever@oracle.com> > --- > > net/sunrpc/xprtrdma/verbs.c | 14 -------------- > 1 files changed, 0 insertions(+), 14 deletions(-) > > diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c > index 54edf2a..515dfc1 100644 > --- a/net/sunrpc/xprtrdma/verbs.c > +++ b/net/sunrpc/xprtrdma/verbs.c > @@ -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); 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. -- Hal > - } > -} > - > ep->rep_connected = 0; > > rc = rdma_connect(ia->ri_id, &ep->rep_remote_cma); > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 54edf2a..515dfc1 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -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);
Clean up. Remove HCA-specific clutter in xprtrdma, which is supposed to be device-independent. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> --- net/sunrpc/xprtrdma/verbs.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html