From: David Rientjes <rientjes@google.com>
Date: Thu, 11 Jun 2020 19:20:32 +0000 (-0700)
Subject: dma-direct: add missing set_memory_decrypted() for coherent mapping
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1a2b3357e860d890f8045367b179c7e7e802cd71;p=linux.git

dma-direct: add missing set_memory_decrypted() for coherent mapping

When a coherent mapping is created in dma_direct_alloc_pages(), it needs
to be decrypted if the device requires unencrypted DMA before returning.

Fixes: 3acac065508f ("dma-mapping: merge the generic remapping helpers into dma-direct")
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 2f69bfdbe3154..93f578a8e613b 100644
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -195,6 +195,12 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size,
 				__builtin_return_address(0));
 		if (!ret)
 			goto out_free_pages;
+		if (force_dma_unencrypted(dev)) {
+			err = set_memory_decrypted((unsigned long)ret,
+						   1 << get_order(size));
+			if (err)
+				goto out_free_pages;
+		}
 		memset(ret, 0, size);
 		goto done;
 	}