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

Commit 4954a9a2 authored by Jayachandran C's avatar Jayachandran C Committed by Ralf Baechle
Browse files

MIPS: Support SWIOTLB in default dma operations 



Provide a default implementation of phys_to_dma and dma_to_phys in
mach-generic/dma_coherence.h.

If CONFIG_NEED_SG_DMA_LENGTH is defined, the dma_length field in
struct scatterlist is used. Set this up in mips_dma_map_sg so that
the default mips DMA ops can be used when SWIOTLB is enabled.

Signed-off-by: default avatarJayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5409/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 0cecddec

arch/mips/include/asm/mach-generic/dma-coherence.h

+12 −0
Original line number Diff line number Diff line
@@ -66,4 +66,16 @@ static inline int plat_device_is_coherent(struct device *dev) 
#endif

}



#ifdef CONFIG_SWIOTLB

static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)

{

	return paddr;

}



static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)

{

	return daddr;

}

#endif



#endif /* __ASM_MACH_GENERIC_DMA_COHERENCE_H */

arch/mips/mm/dma-default.c

+3 −0
Original line number Diff line number Diff line
@@ -246,6 +246,9 @@ static int mips_dma_map_sg(struct device *dev, struct scatterlist *sg, 
		if (!plat_device_is_coherent(dev))

			__dma_sync(sg_page(sg), sg->offset, sg->length,

				   direction);

#ifdef CONFIG_NEED_SG_DMA_LENGTH

		sg->dma_length = sg->length;

#endif

		sg->dma_address = plat_map_dma_mem_page(dev, sg_page(sg)) +

				  sg->offset;

	}