Commit 76bb7c49 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Marek Szyprowski
Browse files

dma-mapping: rename trace_dma_*map_page to trace_dma_*map_phys 



As a preparation for following map_page -> map_phys API conversion,
let's rename trace_dma_*map_page() to be trace_dma_*map_phys().

Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/c0c02d7d8bd4a148072d283353ba227516a76682.1757423202.git.leonro@nvidia.com
parent e9e81d86

include/trace/events/dma.h

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ DEFINE_EVENT(dma_map, name, \ 
		 size_t size, enum dma_data_direction dir, unsigned long attrs), \

	TP_ARGS(dev, phys_addr, dma_addr, size, dir, attrs))



DEFINE_MAP_EVENT(dma_map_page);

DEFINE_MAP_EVENT(dma_map_phys);

DEFINE_MAP_EVENT(dma_map_resource);



DECLARE_EVENT_CLASS(dma_unmap,
@@ -110,7 +110,7 @@ DEFINE_EVENT(dma_unmap, name, \ 
		 enum dma_data_direction dir, unsigned long attrs), \

	TP_ARGS(dev, addr, size, dir, attrs))



DEFINE_UNMAP_EVENT(dma_unmap_page);

DEFINE_UNMAP_EVENT(dma_unmap_phys);

DEFINE_UNMAP_EVENT(dma_unmap_resource);



DECLARE_EVENT_CLASS(dma_alloc_class,

kernel/dma/mapping.c

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ dma_addr_t dma_map_page_attrs(struct device *dev, struct page *page, 
	else

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

	kmsan_handle_dma(page, offset, size, dir);

	trace_dma_map_page(dev, phys, addr, size, dir, attrs);

	trace_dma_map_phys(dev, phys, addr, size, dir, attrs);

	debug_dma_map_phys(dev, phys, size, dir, addr, attrs);



	return addr;
@@ -193,7 +193,7 @@ void dma_unmap_page_attrs(struct device *dev, dma_addr_t addr, size_t size, 
		iommu_dma_unmap_page(dev, addr, size, dir, attrs);

	else

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

	trace_dma_unmap_page(dev, addr, size, dir, attrs);

	trace_dma_unmap_phys(dev, addr, size, dir, attrs);

	debug_dma_unmap_phys(dev, addr, size, dir);

}

EXPORT_SYMBOL(dma_unmap_page_attrs);