nvme-pci: set min_align_mask
commit: 3d2d861eb03e8ee96dc430a54361c900cbe28afd
The PRP addressing scheme requires all PRP entries except for the
first one to have a zero offset into the NVMe controller pages (which
can be different from the Linux PAGE_SIZE). Use the min_align_mask
device parameter to ensure that swiotlb does not change the address
of the buffer modulo the device page size to ensure that the PRPs
won't be malformed.
BUG=b/205968222
TEST=presubmit
RELEASE_NOTE=None
SOURCE=UPSTREAM(2fa0387fa2d00924aca0a5fa4c48eb6a4b3f8731)
cos-patch: lts-refresh
Signed-off-by: Jianxiong Gao <jxgao@google.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Jianxiong Gao <jxgao@google.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: Ie143450eda4eab2b39396a4ba8e78bf2730ccd2d
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index af516c3..0d425e1 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2630,6 +2630,7 @@
* Don't limit the IOMMU merged segment size.
*/
dma_set_max_seg_size(dev->dev, 0xffffffff);
+ dma_set_min_align_mask(dev->dev, dev->ctrl.page_size - 1);
mutex_unlock(&dev->shutdown_lock);
