2 files changed, 76 insertions, 0 deletions

diff --git a/include/linux/dma-debug.h b/include/linux/dma-debug.h
index 345d5387a30d..65f73526ba2c 100644
--- a/include/linux/dma-debug.h
+++ b/include/linux/dma-debug.h
@@ -28,12 +28,35 @@ struct device;
 
 extern void dma_debug_init(u32 num_entries);
 
+extern void debug_dma_map_page(struct device *dev, struct page *page,
+                               size_t offset, size_t size,
+                               int direction, dma_addr_t dma_addr,
+                               bool map_single);
+
+extern void debug_dma_unmap_page(struct device *dev, dma_addr_t addr,
+                                 size_t size, int direction, bool map_single);
+
+
 #else /* CONFIG_DMA_API_DEBUG */
 
 static inline void dma_debug_init(u32 num_entries)
 {
 }
 
+static inline void debug_dma_map_page(struct device *dev, struct page *page,
+                                      size_t offset, size_t size,
+                                      int direction, dma_addr_t dma_addr,
+                                      bool map_single)
+{
+}
+
+static inline void debug_dma_unmap_page(struct device *dev, dma_addr_t addr,
+                                        size_t size, int direction,
+                                        bool map_single)
+{
+}
+
+
 #endif /* CONFIG_DMA_API_DEBUG */
 
 #endif /* __DMA_DEBUG_H */
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index d0cb47a4211e..a2ed2b769685 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -566,3 +566,56 @@ out:
 
 }
 
+void debug_dma_map_page(struct device *dev, struct page *page, size_t offset,
+                        size_t size, int direction, dma_addr_t dma_addr,
+                        bool map_single)
+{
+        struct dma_debug_entry *entry;
+
+        if (unlikely(global_disable))
+                return;
+
+        if (unlikely(dma_mapping_error(dev, dma_addr)))
+                return;
+
+        entry = dma_entry_alloc();
+        if (!entry)
+                return;
+
+        entry->dev       = dev;
+        entry->type      = dma_debug_page;
+        entry->paddr     = page_to_phys(page) + offset;
+        entry->dev_addr  = dma_addr;
+        entry->size      = size;
+        entry->direction = direction;
+
+        if (map_single) {
+                entry->type = dma_debug_single;
+                check_for_stack(dev, page_address(page) + offset);
+        }
+
+        add_dma_entry(entry);
+}
+EXPORT_SYMBOL(debug_dma_map_page);
+
+void debug_dma_unmap_page(struct device *dev, dma_addr_t addr,
+                          size_t size, int direction, bool map_single)
+{
+        struct dma_debug_entry ref = {
+                .type           = dma_debug_page,
+                .dev            = dev,
+                .dev_addr       = addr,
+                .size           = size,
+                .direction      = direction,
+        };
+
+        if (unlikely(global_disable))
+                return;
+
+        if (map_single)
+                ref.type = dma_debug_single;
+
+        check_unmap(&ref);
+}
+EXPORT_SYMBOL(debug_dma_unmap_page);
+