Thread (53 messages) 53 messages, 4 authors, 2018-01-12

Re: [PATCH 09/33] dma-mapping: take dma_pfn_offset into account in dma_max_pfn

From: Robin Murphy <robin.murphy@arm.com>
Date: 2018-01-10 11:08:06
Also in: linux-alpha, linux-arch, linux-arm-kernel, linux-iommu, linux-m68k, linux-mips, linux-s390, linux-sh, lkml, sparclinux

On 10/01/18 08:00, Christoph Hellwig wrote:
This makes sure the generic version can be used with architectures /
devices that have a DMA offset in the direct mapping.
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
quoted hunk ↗ jump to hunk
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
  include/linux/dma-mapping.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 81ed9b2d84dc..d84951865be7 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
  
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help