nvme-pci: set min_align_mask before calculating max_hw_sectors

commit 61ce339f19fabbc3e51237148a7ef6f2270e44fa upstream.

If swiotlb is force enabled dma_max_mapping_size ends up calling
swiotlb_max_mapping_size which takes into account the min align mask for
the device.  Set the min align mask for nvme driver before calling
dma_max_mapping_size while calculating max hw sectors.

Signed-off-by: Rishabh Bhatnagar <risbhat@amazon.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 67d3335e9cc84abf48e7adb70edbcb0dbf69d676..57cc2bb5b1a2bba18215507f3668f6a8d0800985 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2834,6 +2834,8 @@ static void nvme_reset_work(struct work_struct *work)
                nvme_start_admin_queue(&dev->ctrl);
        }
 
+       dma_set_min_align_mask(dev->dev, NVME_CTRL_PAGE_SIZE - 1);
+
        /*
         * Limit the max command size to prevent iod->sg allocations going
         * over a single page.
@@ -2846,7 +2848,6 @@ static void nvme_reset_work(struct work_struct *work)
         * Don't limit the IOMMU merged segment size.
         */
        dma_set_max_seg_size(dev->dev, 0xffffffff);
-       dma_set_min_align_mask(dev->dev, NVME_CTRL_PAGE_SIZE - 1);
 
        mutex_unlock(&dev->shutdown_lock);