1 files changed, 8 insertions, 2 deletions

diff --git a/arch/xtensa/kernel/pci-dma.c b/arch/xtensa/kernel/pci-dma.c
index a83d60e92908..5c8a67fc3aa1 100644
--- a/arch/xtensa/kernel/pci-dma.c
+++ b/arch/xtensa/kernel/pci-dma.c
@@ -116,6 +116,10 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
 
         *handle = phys_to_dma(dev, page_to_phys(page));
 
+        if (attrs & DMA_ATTR_NO_KERNEL_MAPPING) {
+                return page;
+        }
+
 #ifdef CONFIG_MMU
         if (PageHighMem(page)) {
                 void *p;
@@ -147,8 +151,10 @@ void arch_dma_free(struct device *dev, size_t size, void *vaddr,
         unsigned long addr = (unsigned long)vaddr;
         struct page *page;
 
-        if (addr >= XCHAL_KSEG_BYPASS_VADDR &&
-            addr - XCHAL_KSEG_BYPASS_VADDR < XCHAL_KSEG_SIZE) {
+        if (attrs & DMA_ATTR_NO_KERNEL_MAPPING) {
+                page = vaddr;
+        } else if (addr >= XCHAL_KSEG_BYPASS_VADDR &&
+                   addr - XCHAL_KSEG_BYPASS_VADDR < XCHAL_KSEG_SIZE) {
                 addr += XCHAL_KSEG_CACHED_VADDR - XCHAL_KSEG_BYPASS_VADDR;
                 page = virt_to_page(addr);
         } else {