mtip32xx: also set max_segment_size in the device
authorChristoph Hellwig <hch@lst.de>
Wed, 5 Jun 2019 19:08:26 +0000 (21:08 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 5 Jun 2019 19:18:39 +0000 (13:18 -0600)
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>
drivers/block/mtip32xx/mtip32xx.c

index bacfdac7161c6448c8a979c88be6fbdbd805e0f6..a14b09ab3a418d460ac840a4415a6d373c044f13 100644 (file)
@@ -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. */