Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfe0fb0f authored by Shuah Khan's avatar Shuah Khan Committed by Joerg Roedel
Browse files

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: default avatarShuah Khan <shuah.khan@hp.com>
Reported-by: default avatarMark Salter <msalter@redhat.com>
Signed-off-by: default avatarJoerg Roedel <joro@8bytes.org>
parent 8d7f62e6

lib/dma-debug.c

+7 −22
Original line number Diff line number Diff line
@@ -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 */

#ifndef DMA_ERROR_CODE

#define DMA_ERROR_CODE 0

#endif

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))

		return;



	if (unlikely(has_mapping_error(dev, dma_addr)))

	if (dma_mapping_error(dev, dma_addr))

		return;



	entry = dma_entry_alloc();