diff options
| author |   Bart Van Assche <bvanassche@acm.org> | 2019-10-25 15:58:30 -0700 |
|---|---|---|
| committer |   Jason Gunthorpe <jgg@mellanox.com> | 2019-10-28 14:52:04 -0300 |
| commit | c9121262d57b8a3be4f08073546436ba0128ca6a (patch) | |
| tree | 4d06c1748604eeaedfa1ea7e34ca21b1b770befc /drivers/infiniband/core/device.c | |
| parent | RDMA/siw: Increase DMA max_segment_size parameter (diff) | |
| download | linux-dev-c9121262d57b8a3be4f08073546436ba0128ca6a.tar.xz linux-dev-c9121262d57b8a3be4f08073546436ba0128ca6a.zip | |
RDMA/core: Set DMA parameters correctly
The dma_set_max_seg_size() call in setup_dma_device() does not have any
effect since device->dev.dma_parms is NULL. Fix this by initializing
device->dev.dma_parms first.
Link: https://lore.kernel.org/r/20191025225830.257535-5-bvanassche@acm.org
Fixes: d10bcf947a3e ("RDMA/umem: Combine contiguous PAGE_SIZE regions in SGEs")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/infiniband/core/device.c')
| -rw-r--r-- | drivers/infiniband/core/device.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index eb35b663a742..a93c23867fb5 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c @@ -1196,9 +1196,21 @@ static void setup_dma_device(struct ib_device *device) WARN_ON_ONCE(!parent); device->dma_device = parent; } - /* Setup default max segment size for all IB devices */ - dma_set_max_seg_size(device->dma_device, SZ_2G); + if (!device->dev.dma_parms) { + if (parent) { + /* + * The caller did not provide DMA parameters, so + * 'parent' probably represents a PCI device. The PCI + * core sets the maximum segment size to 64 + * KB. Increase this parameter to 2 GB. + */ + device->dev.dma_parms = parent->dma_parms; + dma_set_max_seg_size(device->dma_device, SZ_2G); + } else { + WARN_ON_ONCE(true); + } + } } /* |