Skip to content

Commit

Permalink
dma-direct: take dma-ranges/offsets into account in resource mapping
Browse files Browse the repository at this point in the history
A basic device-specific linear memory mapping was introduced back in
commit ("dma: Take into account dma_pfn_offset") as a single-valued offset
preserved in the device.dma_pfn_offset field, which was initialized for
instance by means of the "dma-ranges" DT property. Afterwards the
functionality was extended to support more than one device-specific region
defined in the device.dma_range_map list of maps. But all of these
improvements concerned a single pointer, page or sg DMA-mapping methods,
while the system resource mapping function turned to miss the
corresponding modification. Thus the dma_direct_map_resource() method now
just casts the CPU physical address to the device DMA address with no
dma-ranges-based mapping taking into account, which is obviously wrong.
Let's fix it by using the phys_to_dma_direct() method to get the
device-specific bus address from the passed memory resource for the case
of the directly mapped DMA.

Fixes: 25f1e18 ("dma: Take into account dma_pfn_offset")
Signed-off-by: Serge Semin <[email protected]>
  • Loading branch information
Serge Semin via iommu authored and pelwell committed Feb 7, 2025
1 parent e51e737 commit e230e12
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kernel/dma/direct.c
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents,
dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr,
size_t size, enum dma_data_direction dir, unsigned long attrs)
{
dma_addr_t dma_addr = paddr;
dma_addr_t dma_addr = phys_to_dma_direct(dev, paddr);

if (unlikely(!dma_capable(dev, dma_addr, size, false))) {
dev_err_once(dev,
Expand Down

0 comments on commit e230e12

Please sign in to comment.