diff options
| author | Rishabh Bhatnagar <risbhat@amazon.com> | 2022-09-20 22:19:32 +0300 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2022-09-27 10:22:07 +0300 |
| commit | 61ce339f19fabbc3e51237148a7ef6f2270e44fa (patch) | |
| tree | 9136672fdcde792e8f69d412a7929f595e32a535 /drivers/nvme/host | |
| parent | f46ef9e87c9e8941b7acee45611c7c6a322592bb (diff) | |
| download | linux-61ce339f19fabbc3e51237148a7ef6f2270e44fa.tar.xz | |
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: Rishabh Bhatnagar <risbhat@amazon.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme/host')
| -rw-r--r-- | drivers/nvme/host/pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 70b1922c8953..e4230f2c98e8 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -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); |