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

Commit c59435a6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Ralf Baechle
Browse files

MIPS: Consolidate coherent and non-coherent dma_alloc code 



Besides eliminating lots of duplication this also allows allocations with
the DMA_ATTR_NON_CONSISTENT to use the CMA allocator.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/17181/


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

arch/mips/mm/dma-default.c

+3 −39
Original line number Diff line number Diff line
@@ -127,23 +127,6 @@ static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp) 
	return gfp | dma_flag;

}



static void *mips_dma_alloc_noncoherent(struct device *dev, size_t size,

	dma_addr_t * dma_handle, gfp_t gfp)

{

	void *ret;



	gfp = massage_gfp_flags(dev, gfp);



	ret = (void *) __get_free_pages(gfp, get_order(size));



	if (ret != NULL) {

		memset(ret, 0, size);

		*dma_handle = plat_map_dma_mem(dev, ret, size);

	}



	return ret;

}



static void *mips_dma_alloc_coherent(struct device *dev, size_t size,

	dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs)

{
@@ -151,13 +134,6 @@ static void *mips_dma_alloc_coherent(struct device *dev, size_t size, 
	struct page *page = NULL;

	unsigned int count = PAGE_ALIGN(size) >> PAGE_SHIFT;



	/*

	 * XXX: seems like the coherent and non-coherent implementations could

	 * be consolidated.

	 */

	if (attrs & DMA_ATTR_NON_CONSISTENT)

		return mips_dma_alloc_noncoherent(dev, size, dma_handle, gfp);



	gfp = massage_gfp_flags(dev, gfp);



	if (IS_ENABLED(CONFIG_DMA_CMA) && gfpflags_allow_blocking(gfp))
@@ -172,7 +148,8 @@ static void *mips_dma_alloc_coherent(struct device *dev, size_t size, 
	ret = page_address(page);

	memset(ret, 0, size);

	*dma_handle = plat_map_dma_mem(dev, ret, size);

	if (!plat_device_is_coherent(dev)) {

	if (!(attrs & DMA_ATTR_NON_CONSISTENT) &&

	    !plat_device_is_coherent(dev)) {

		dma_cache_wback_inv((unsigned long) ret, size);

		ret = UNCAC_ADDR(ret);

	}
@@ -180,14 +157,6 @@ static void *mips_dma_alloc_coherent(struct device *dev, size_t size, 
	return ret;

}





static void mips_dma_free_noncoherent(struct device *dev, size_t size,

		void *vaddr, dma_addr_t dma_handle)

{

	plat_unmap_dma_mem(dev, dma_handle, size, DMA_BIDIRECTIONAL);

	free_pages((unsigned long) vaddr, get_order(size));

}



static void mips_dma_free_coherent(struct device *dev, size_t size, void *vaddr,

	dma_addr_t dma_handle, unsigned long attrs)

{
@@ -195,14 +164,9 @@ static void mips_dma_free_coherent(struct device *dev, size_t size, void *vaddr, 
	unsigned int count = PAGE_ALIGN(size) >> PAGE_SHIFT;

	struct page *page = NULL;



	if (attrs & DMA_ATTR_NON_CONSISTENT) {

		mips_dma_free_noncoherent(dev, size, vaddr, dma_handle);

		return;

	}



	plat_unmap_dma_mem(dev, dma_handle, size, DMA_BIDIRECTIONAL);



	if (!plat_device_is_coherent(dev))

	if (!(attrs & DMA_ATTR_NON_CONSISTENT) && !plat_device_is_coherent(dev))

		addr = CAC_ADDR(addr);



	page = virt_to_page((void *) addr);