From: Christoph Hellwig Date: Wed, 5 Jun 2019 19:08:26 +0000 (+0200) Subject: mtip32xx: also set max_segment_size in the device X-Git-Tag: v5.15~6199^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bb6f59af309c69643b6b07d9372c01a1cc0792e7;p=platform%2Fkernel%2Flinux-starfive.git 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 Signed-off-by: Jens Axboe --- diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c index bacfdac..a14b09a 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. */