From: Christoph Hellwig <hch@lst.de>
Date: Thu, 30 Nov 2017 15:32:51 +0000 (-0800)
Subject: dma-mapping: take dma_pfn_offset into account in dma_max_pfn
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a41ef1e455a9796be8cb986f0616f52453ac8e4b;p=linux.git

dma-mapping: take dma_pfn_offset into account in dma_max_pfn

This makes sure the generic version can be used with architectures /
devices that have a DMA offset in the direct mapping.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
---

diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 81ed9b2d84dcc..d84951865be72 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -692,7 +692,7 @@ static inline int dma_set_seg_boundary(struct device *dev, unsigned long mask)
 #ifndef dma_max_pfn
 static inline unsigned long dma_max_pfn(struct device *dev)
 {
-	return *dev->dma_mask >> PAGE_SHIFT;
+	return (*dev->dma_mask >> PAGE_SHIFT) + dev->dma_pfn_offset;
 }
 #endif