Commit 61ce339f authored by Rishabh Bhatnagar's avatar Rishabh Bhatnagar Committed by Christoph Hellwig
Browse files

nvme-pci: set min_align_mask before calculating max_hw_sectors 



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: default avatarRishabh Bhatnagar <risbhat@amazon.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent f46ef9e8

drivers/nvme/host/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -2831,6 +2831,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.
@@ -2843,7 +2845,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);