path: root/lib/dma-debug.c
diff options
authorShuah Khan <shuah.khan@hp.com>2012-11-03 17:00:07 -0600
committerJoerg Roedel <joro@8bytes.org>2012-11-17 13:06:41 +0100
commitbfe0fb0f1a570ae72680d6d48655c98d1f4733f5 (patch)
tree8da2d888a5c38bcc4389e0fbd7cf9bf624ca59c2 /lib/dma-debug.c
parent8d7f62e6a7aa0bfd7163d3c4a5fb59280f6a6eb5 (diff)
dma-debug: fix to not have dependency on get_dma_ops() interface
dma-debug depends on get_dma_ops() interface. Several architectures do not define dma_ops and get_dma_ops(). When dma debug interfaces are used on an architecture (e.g: c6x) that doesn't define get_dmap_ops(), compilation fails. Changing dma-debug to call dma_mapping_error() instead of defining its own that calls get_dma_ops(), such that the internal use of dma_mapping_error() doesn't interfere with the debug_dma_mapping_error() interface's mapping error checks. Moving dma_mapping_error() checks in check_unmap() under the dma debug entry not found is sufficient to fix the problem. Reference: https://lkml.org/lkml/2012/10/26/367 Signed-off-by: Shuah Khan <shuah.khan@hp.com> Reported-by: Mark Salter <msalter@redhat.com> Signed-off-by: Joerg Roedel <joro@8bytes.org>
Diffstat (limited to 'lib/dma-debug.c')
1 files changed, 7 insertions, 22 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 59f4a1a8187d..5e396accd3d0 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -852,37 +852,22 @@ static __init int dma_debug_entries_cmdline(char *str)
__setup("dma_debug=", dma_debug_cmdline);
__setup("dma_debug_entries=", dma_debug_entries_cmdline);
-/* Calling dma_mapping_error() from dma-debug api will result in calling
- debug_dma_mapping_error() - need internal mapping error routine to
- avoid debug checks */
-#define DMA_ERROR_CODE 0
-static inline int has_mapping_error(struct device *dev, dma_addr_t dma_addr)
- const struct dma_map_ops *ops = get_dma_ops(dev);
- if (ops->mapping_error)
- return ops->mapping_error(dev, dma_addr);
- return (dma_addr == DMA_ERROR_CODE);
static void check_unmap(struct dma_debug_entry *ref)
struct dma_debug_entry *entry;
struct hash_bucket *bucket;
unsigned long flags;
- if (unlikely(has_mapping_error(ref->dev, ref->dev_addr))) {
- err_printk(ref->dev, NULL, "DMA-API: device driver tries "
- "to free an invalid DMA memory address\n");
- return;
- }
bucket = get_hash_bucket(ref, &flags);
entry = bucket_find_exact(bucket, ref);
if (!entry) {
+ if (dma_mapping_error(ref->dev, ref->dev_addr)) {
+ err_printk(ref->dev, NULL,
+ "DMA-API: device driver tries "
+ "to free an invalid DMA memory address\n");
+ return;
+ }
err_printk(ref->dev, NULL, "DMA-API: device driver tries "
"to free DMA memory it has not allocated "
"[device address=0x%016llx] [size=%llu bytes]\n",
@@ -1055,7 +1040,7 @@ void debug_dma_map_page(struct device *dev, struct page *page, size_t offset,
if (unlikely(global_disable))
- if (unlikely(has_mapping_error(dev, dma_addr)))
+ if (dma_mapping_error(dev, dma_addr))
entry = dma_entry_alloc();