From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 20 Jul 2019 19:09:52 +0000 (-0700)
Subject: Merge tag 'dma-mapping-5.3-1' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v5.15~5859
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac60602a6d8f6830dee89f4b87ee005f62eb7171;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'dma-mapping-5.3-1' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fixes from Christoph Hellwig:
 "Fix various regressions:

   - force unencrypted dma-coherent buffers if encryption bit can't fit
     into the dma coherent mask (Tom Lendacky)

   - avoid limiting request size if swiotlb is not used (me)

   - fix swiotlb handling in dma_direct_sync_sg_for_cpu/device (Fugang
     Duan)"

* tag 'dma-mapping-5.3-1' of git://git.infradead.org/users/hch/dma-mapping:
  dma-direct: correct the physical addr in dma_direct_sync_sg_for_cpu/device
  dma-direct: only limit the mapping size if swiotlb could be used
  dma-mapping: add a dma_addressing_limited helper
  dma-direct: Force unencrypted DMA under SME for certain DMA masks
---

ac60602a6d8f6830dee89f4b87ee005f62eb7171