Skip to content

Commit ed7fc3c

Browse files
rleonmszyprow
authored andcommitted
dma-mapping: prepare dma_map_ops to conversion to physical address
Add new .map_phys() and .unmap_phys() callbacks to dma_map_ops as a preparation to replace .map_page() and .unmap_page() respectively. Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Leon Romanovsky <leonro@nvidia.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Link: https://lore.kernel.org/r/20251015-remove-map-page-v5-1-3bbfe3a25cdf@kernel.org
1 parent f74ee32 commit ed7fc3c

3 files changed

Lines changed: 21 additions & 2 deletions

File tree

include/linux/dma-map-ops.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@ struct dma_map_ops {
3737
void (*unmap_page)(struct device *dev, dma_addr_t dma_handle,
3838
size_t size, enum dma_data_direction dir,
3939
unsigned long attrs);
40+
41+
dma_addr_t (*map_phys)(struct device *dev, phys_addr_t phys,
42+
size_t size, enum dma_data_direction dir,
43+
unsigned long attrs);
44+
void (*unmap_phys)(struct device *dev, dma_addr_t dma_handle,
45+
size_t size, enum dma_data_direction dir,
46+
unsigned long attrs);
4047
/*
4148
* map_sg should return a negative error code on error. See
4249
* dma_map_sgtable() for a list of appropriate error codes

kernel/dma/mapping.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ dma_addr_t dma_map_phys(struct device *dev, phys_addr_t phys, size_t size,
169169
addr = dma_direct_map_phys(dev, phys, size, dir, attrs);
170170
else if (use_dma_iommu(dev))
171171
addr = iommu_dma_map_phys(dev, phys, size, dir, attrs);
172+
else if (ops->map_phys)
173+
addr = ops->map_phys(dev, phys, size, dir, attrs);
172174
else if (is_mmio) {
173175
if (!ops->map_resource)
174176
return DMA_MAPPING_ERROR;
@@ -223,6 +225,8 @@ void dma_unmap_phys(struct device *dev, dma_addr_t addr, size_t size,
223225
dma_direct_unmap_phys(dev, addr, size, dir, attrs);
224226
else if (use_dma_iommu(dev))
225227
iommu_dma_unmap_phys(dev, addr, size, dir, attrs);
228+
else if (ops->unmap_phys)
229+
ops->unmap_phys(dev, addr, size, dir, attrs);
226230
else if (is_mmio) {
227231
if (ops->unmap_resource)
228232
ops->unmap_resource(dev, addr, size, dir, attrs);

kernel/dma/ops_helpers.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,21 @@ struct page *dma_common_alloc_pages(struct device *dev, size_t size,
6464
{
6565
const struct dma_map_ops *ops = get_dma_ops(dev);
6666
struct page *page;
67+
phys_addr_t phys;
6768

6869
page = dma_alloc_contiguous(dev, size, gfp);
6970
if (!page)
7071
page = alloc_pages_node(dev_to_node(dev), gfp, get_order(size));
7172
if (!page)
7273
return NULL;
7374

75+
phys = page_to_phys(page);
7476
if (use_dma_iommu(dev))
75-
*dma_handle = iommu_dma_map_phys(dev, page_to_phys(page), size,
76-
dir, DMA_ATTR_SKIP_CPU_SYNC);
77+
*dma_handle = iommu_dma_map_phys(dev, phys, size, dir,
78+
DMA_ATTR_SKIP_CPU_SYNC);
79+
else if (ops->map_phys)
80+
*dma_handle = ops->map_phys(dev, phys, size, dir,
81+
DMA_ATTR_SKIP_CPU_SYNC);
7782
else
7883
*dma_handle = ops->map_page(dev, page, 0, size, dir,
7984
DMA_ATTR_SKIP_CPU_SYNC);
@@ -94,6 +99,9 @@ void dma_common_free_pages(struct device *dev, size_t size, struct page *page,
9499
if (use_dma_iommu(dev))
95100
iommu_dma_unmap_phys(dev, dma_handle, size, dir,
96101
DMA_ATTR_SKIP_CPU_SYNC);
102+
else if (ops->unmap_phys)
103+
ops->unmap_phys(dev, dma_handle, size, dir,
104+
DMA_ATTR_SKIP_CPU_SYNC);
97105
else if (ops->unmap_page)
98106
ops->unmap_page(dev, dma_handle, size, dir,
99107
DMA_ATTR_SKIP_CPU_SYNC);

0 commit comments

Comments
 (0)