Commit 3b13f1fe authored Aug 17, 2016 by Sebastian Ott Committed by Martin Schwidefsky Sep 22, 2016

s390/pci_dma: remove dma address range check



We calculate dma addresses using an iommu bitmap. Since commit
69eea95c ("s390/pci_dma: fix DMA table corruption with > 4 TB main memory")
we've made sure that addresses created using that bitmap are below
the maximum reported by firmware. Thus the additional check for
that address to be within range can be removed.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

parent bb2b7ffb

arch/s390/pci/pci_dma.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -305,12 +305,7 @@ static dma_addr_t s390_dma_map_pages(struct device dev, struct page page,

		/* Use rounded up size */
		size = nr_pages * PAGE_SIZE;

		dma_addr = zdev->start_dma + iommu_page_index * PAGE_SIZE;
		if (dma_addr + size > zdev->end_dma) {
		ret = -ERANGE;
		goto out_free;
		}

		if (direction == DMA_NONE \|\| direction == DMA_TO_DEVICE)
		flags \|= ZPCI_TABLE_PROTECTED;

Admin message