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

Commit 2118d0c5 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

dma-debug: x86 architecture bindings 



Impact: make use of DMA-API debugging code in x86

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent ac26c18b

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ config X86 
	select HAVE_GENERIC_DMA_COHERENT if X86_32

	select HAVE_EFFICIENT_UNALIGNED_ACCESS

	select USER_STACKTRACE_SUPPORT

	select HAVE_DMA_API_DEBUG



config ARCH_DEFCONFIG

	string

arch/x86/include/asm/dma-mapping.h

+39 −6
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */



#include <linux/scatterlist.h>

#include <linux/dma-debug.h>

#include <linux/dma-attrs.h>

#include <asm/io.h>

#include <asm/swiotlb.h>
@@ -56,11 +57,16 @@ dma_map_single(struct device *hwdev, void *ptr, size_t size, 
	       enum dma_data_direction dir)

{

	struct dma_map_ops *ops = get_dma_ops(hwdev);

	dma_addr_t addr;



	BUG_ON(!valid_dma_direction(dir));

	return ops->map_page(hwdev, virt_to_page(ptr),

	addr = ops->map_page(hwdev, virt_to_page(ptr),

			     (unsigned long)ptr & ~PAGE_MASK, size,

			     dir, NULL);

	debug_dma_map_page(hwdev, virt_to_page(ptr),

			   (unsigned long)ptr & ~PAGE_MASK, size,

			   dir, addr, true);

	return addr;

}



static inline void
@@ -72,6 +78,7 @@ dma_unmap_single(struct device *dev, dma_addr_t addr, size_t size, 
	BUG_ON(!valid_dma_direction(dir));

	if (ops->unmap_page)

		ops->unmap_page(dev, addr, size, dir, NULL);

	debug_dma_unmap_page(dev, addr, size, dir, true);

}



static inline int
@@ -79,9 +86,13 @@ dma_map_sg(struct device *hwdev, struct scatterlist *sg, 
	   int nents, enum dma_data_direction dir)

{

	struct dma_map_ops *ops = get_dma_ops(hwdev);

	int ents;



	BUG_ON(!valid_dma_direction(dir));

	return ops->map_sg(hwdev, sg, nents, dir, NULL);

	ents = ops->map_sg(hwdev, sg, nents, dir, NULL);

	debug_dma_map_sg(hwdev, sg, nents, ents, dir);



	return ents;

}



static inline void
@@ -91,6 +102,7 @@ dma_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nents, 
	struct dma_map_ops *ops = get_dma_ops(hwdev);



	BUG_ON(!valid_dma_direction(dir));

	debug_dma_unmap_sg(hwdev, sg, nents, dir);

	if (ops->unmap_sg)

		ops->unmap_sg(hwdev, sg, nents, dir, NULL);

}
@@ -104,6 +116,7 @@ dma_sync_single_for_cpu(struct device *hwdev, dma_addr_t dma_handle, 
	BUG_ON(!valid_dma_direction(dir));

	if (ops->sync_single_for_cpu)

		ops->sync_single_for_cpu(hwdev, dma_handle, size, dir);

	debug_dma_sync_single_for_cpu(hwdev, dma_handle, size, dir);

	flush_write_buffers();

}
@@ -116,6 +129,7 @@ dma_sync_single_for_device(struct device *hwdev, dma_addr_t dma_handle, 
	BUG_ON(!valid_dma_direction(dir));

	if (ops->sync_single_for_device)

		ops->sync_single_for_device(hwdev, dma_handle, size, dir);

	debug_dma_sync_single_for_device(hwdev, dma_handle, size, dir);

	flush_write_buffers();

}
@@ -130,6 +144,8 @@ dma_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dma_handle, 
	if (ops->sync_single_range_for_cpu)

		ops->sync_single_range_for_cpu(hwdev, dma_handle, offset,

					       size, dir);

	debug_dma_sync_single_range_for_cpu(hwdev, dma_handle,

					    offset, size, dir);

	flush_write_buffers();

}
@@ -144,6 +160,8 @@ dma_sync_single_range_for_device(struct device *hwdev, dma_addr_t dma_handle, 
	if (ops->sync_single_range_for_device)

		ops->sync_single_range_for_device(hwdev, dma_handle,

						  offset, size, dir);

	debug_dma_sync_single_range_for_device(hwdev, dma_handle,

					       offset, size, dir);

	flush_write_buffers();

}
@@ -156,6 +174,7 @@ dma_sync_sg_for_cpu(struct device *hwdev, struct scatterlist *sg, 
	BUG_ON(!valid_dma_direction(dir));

	if (ops->sync_sg_for_cpu)

		ops->sync_sg_for_cpu(hwdev, sg, nelems, dir);

	debug_dma_sync_sg_for_cpu(hwdev, sg, nelems, dir);

	flush_write_buffers();

}
@@ -168,6 +187,7 @@ dma_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg, 
	BUG_ON(!valid_dma_direction(dir));

	if (ops->sync_sg_for_device)

		ops->sync_sg_for_device(hwdev, sg, nelems, dir);

	debug_dma_sync_sg_for_device(hwdev, sg, nelems, dir);



	flush_write_buffers();

}
@@ -177,15 +197,24 @@ static inline dma_addr_t dma_map_page(struct device *dev, struct page *page, 
				      enum dma_data_direction dir)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	dma_addr_t addr;



	BUG_ON(!valid_dma_direction(dir));

	return ops->map_page(dev, page, offset, size, dir, NULL);

	addr = ops->map_page(dev, page, offset, size, dir, NULL);

	debug_dma_map_page(dev, page, offset, size, dir, addr, false);



	return addr;

}



static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,

				  size_t size, enum dma_data_direction dir)

{

	dma_unmap_single(dev, addr, size, dir);

	struct dma_map_ops *ops = get_dma_ops(dev);



	BUG_ON(!valid_dma_direction(dir));

	if (ops->unmap_page)

		ops->unmap_page(dev, addr, size, dir, NULL);

	debug_dma_unmap_page(dev, addr, size, dir, false);

}



static inline void
@@ -250,8 +279,11 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, 
	if (!ops->alloc_coherent)

		return NULL;



	return ops->alloc_coherent(dev, size, dma_handle,

	memory = ops->alloc_coherent(dev, size, dma_handle,

				     dma_alloc_coherent_gfp_flags(dev, gfp));

	debug_dma_alloc_coherent(dev, size, *dma_handle, memory);



	return memory;

}



static inline void dma_free_coherent(struct device *dev, size_t size,
@@ -264,6 +296,7 @@ static inline void dma_free_coherent(struct device *dev, size_t size, 
	if (dma_release_from_coherent(dev, get_order(size), vaddr))

		return;



	debug_dma_free_coherent(dev, size, vaddr, bus);

	if (ops->free_coherent)

		ops->free_coherent(dev, size, vaddr, bus);

}

arch/x86/kernel/pci-dma.c

+6 −0
Original line number Diff line number Diff line 
#include <linux/dma-mapping.h>

#include <linux/dma-debug.h>

#include <linux/dmar.h>

#include <linux/bootmem.h>

#include <linux/pci.h>
@@ -44,6 +45,9 @@ struct device x86_dma_fallback_dev = { 
};

EXPORT_SYMBOL(x86_dma_fallback_dev);



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

#define PREALLOC_DMA_DEBUG_ENTRIES       32768



int dma_set_mask(struct device *dev, u64 mask)

{

	if (!dev->dma_mask || !dma_supported(dev, mask))
@@ -265,6 +269,8 @@ EXPORT_SYMBOL(dma_supported); 


static int __init pci_iommu_init(void)

{

	dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);



	calgary_iommu_init();



	intel_iommu_init();