summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-08-06 14:33:23 +0300
committerChristoph Hellwig <hch@lst.de>2019-08-10 19:52:45 +0200
commitcf14be0b41c659ede89abef3f7ec0e98e6cfea5b (patch)
treeae57280bce6c3482f37a02b09fe5785a4006532b /kernel
parent451577f3e3a9bf1861218641dbbf98e214e77851 (diff)
downloadlinux-stable-cf14be0b41c659ede89abef3f7ec0e98e6cfea5b.tar.gz
linux-stable-cf14be0b41c659ede89abef3f7ec0e98e6cfea5b.tar.bz2
linux-stable-cf14be0b41c659ede89abef3f7ec0e98e6cfea5b.zip
dma-direct: fix DMA_ATTR_NO_KERNEL_MAPPING
The new DMA_ATTR_NO_KERNEL_MAPPING needs to actually assign a dma_addr to work. Also skip it if the architecture needs forced decryption handling, as that needs a kernel virtual address. Fixes: d98849aff879 (dma-direct: handle DMA_ATTR_NO_KERNEL_MAPPING in common code) Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/dma/direct.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 59bdceea3737..974e96a1de44 100644
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -130,10 +130,12 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size,
if (!page)
return NULL;
- if (attrs & DMA_ATTR_NO_KERNEL_MAPPING) {
+ if ((attrs & DMA_ATTR_NO_KERNEL_MAPPING) &&
+ !force_dma_unencrypted(dev)) {
/* remove any dirty cache lines on the kernel alias */
if (!PageHighMem(page))
arch_dma_prep_coherent(page, size);
+ *dma_handle = phys_to_dma(dev, page_to_phys(page));
/* return the page pointer as the opaque cookie */
return page;
}
@@ -178,7 +180,8 @@ void dma_direct_free_pages(struct device *dev, size_t size, void *cpu_addr,
{
unsigned int page_order = get_order(size);
- if (attrs & DMA_ATTR_NO_KERNEL_MAPPING) {
+ if ((attrs & DMA_ATTR_NO_KERNEL_MAPPING) &&
+ !force_dma_unencrypted(dev)) {
/* cpu_addr is a struct page cookie, not a kernel address */
__dma_direct_free_pages(dev, size, cpu_addr);
return;