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

Commit 15b28bbc authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-debug: move initialization to common code 



Most mainstream architectures are using 65536 entries, so lets stick to
that.  If someone is really desperate to override it that can still be
done through <asm/dma-mapping.h>, but I'd rather see a really good
rationale for that.

dma_debug_init is now called as a core_initcall, which for many
architectures means much earlier, and provides dma-debug functionality
earlier in the boot process.  This should be safe as it only relies
on the memory allocator already being available.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
parent 325ef185

arch/arm/mm/dma-mapping-nommu.c

+0 −9
Original line number Diff line number Diff line
@@ -241,12 +241,3 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, 
void arch_teardown_dma_ops(struct device *dev)

{

}
 


#define PREALLOC_DMA_DEBUG_ENTRIES	4096



static int __init dma_debug_do_init(void)

{

	dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);

	return 0;

}

core_initcall(dma_debug_do_init);

arch/arm/mm/dma-mapping.c

+0 −9
Original line number Diff line number Diff line
@@ -1165,15 +1165,6 @@ int arm_dma_supported(struct device *dev, u64 mask) 
	return __dma_supported(dev, mask, false);

}



#define PREALLOC_DMA_DEBUG_ENTRIES	4096



static int __init dma_debug_do_init(void)

{

	dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);

	return 0;

}

core_initcall(dma_debug_do_init);



#ifdef CONFIG_ARM_DMA_USE_IOMMU



static int __dma_info_to_prot(enum dma_data_direction dir, unsigned long attrs)

arch/arm64/mm/dma-mapping.c

+0 −10
Original line number Diff line number Diff line
@@ -508,16 +508,6 @@ static int __init arm64_dma_init(void) 
}

arch_initcall(arm64_dma_init);



#define PREALLOC_DMA_DEBUG_ENTRIES	4096



static int __init dma_debug_do_init(void)

{

	dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);

	return 0;

}

fs_initcall(dma_debug_do_init);





#ifdef CONFIG_IOMMU_DMA

#include <linux/dma-iommu.h>

#include <linux/platform_device.h>

arch/c6x/kernel/dma.c

+0 −11
Original line number Diff line number Diff line
@@ -136,14 +136,3 @@ const struct dma_map_ops c6x_dma_ops = { 
	.sync_sg_for_cpu	= c6x_dma_sync_sg_for_cpu,

};

EXPORT_SYMBOL(c6x_dma_ops);
 


/* Number of entries preallocated for DMA-API debugging */

#define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)



static int __init dma_init(void)

{

	dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);



	return 0;

}

fs_initcall(dma_init);

arch/ia64/kernel/dma-mapping.c

+0 −10
Original line number Diff line number Diff line
@@ -9,16 +9,6 @@ int iommu_detected __read_mostly; 
const struct dma_map_ops *dma_ops;

EXPORT_SYMBOL(dma_ops);



#define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)



static int __init dma_init(void)

{

	dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);



	return 0;

}

fs_initcall(dma_init);



const struct dma_map_ops *dma_get_ops(struct device *dev)

{

	return dma_ops;