summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorChristoph Hellwig2019-06-05 21:08:26 +0200
committerJens Axboe2019-06-05 21:18:39 +0200
commitbb6f59af309c69643b6b07d9372c01a1cc0792e7 (patch)
tree750b45e9125ddc0ed2690625797769ff593c0fca /drivers/block
parentrsxx: don't call dma_set_max_seg_size (diff)
downloadkernel-qcow2-linux-bb6f59af309c69643b6b07d9372c01a1cc0792e7.tar.gz
kernel-qcow2-linux-bb6f59af309c69643b6b07d9372c01a1cc0792e7.tar.xz
kernel-qcow2-linux-bb6f59af309c69643b6b07d9372c01a1cc0792e7.zip
mtip32xx: also set max_segment_size in the device
If we only set the max_segment_size on the queue an IOMMU merge might create bigger segments again, so limit the IOMMU merges as well. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/mtip32xx/mtip32xx.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index bacfdac7161c..a14b09ab3a41 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -3676,6 +3676,7 @@ skip_create_disk:
blk_queue_physical_block_size(dd->queue, 4096);
blk_queue_max_hw_sectors(dd->queue, 0xffff);
blk_queue_max_segment_size(dd->queue, 0x400000);
+ dma_set_max_seg_size(&dd->pdev->dev, 0x400000);
blk_queue_io_min(dd->queue, 4096);
/* Set the capacity of the device in 512 byte sectors. */