Commit d622f847 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Christoph Hellwig
Browse files

nvme-apple: don't limit DMA segement size 



NVMe uses PRPs for data transfers and has no specific limit for a single
DMA segement.  Limiting the size will cause problems because the block
layer assumes PRP-ish devices using a virt boundary mask don't have a
segment limit.  And while this is true, we also really need to tell the
DMA mapping layer about it, otherwise dma-debug will trip over it.

Fixes: 5bd2927a ("nvme-apple: Add initial Apple SoC NVMe driver")
Suggested-by: default avatarSven Peter <sven@svenpeter.dev>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
[hch: rewrote the commit message based on the PCIe commit]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarEric Curtin <ecurtin@redhat.com>
Reviewed-by: default avatarSven Peter <sven@svenpeter.dev>
parent ac9b57d4

drivers/nvme/host/apple.c

+2 −0
Original line number Diff line number Diff line
@@ -1039,6 +1039,8 @@ static void apple_nvme_reset_work(struct work_struct *work) 
					 dma_max_mapping_size(anv->dev) >> 9);

	anv->ctrl.max_segments = NVME_MAX_SEGS;



	dma_set_max_seg_size(anv->dev, 0xffffffff);



	/*

	 * Enable NVMMU and linear submission queues.

	 * While we could keep those disabled and pretend this is slightly