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

Commit d25749af authored by Damian Hobson-Garcia's avatar Damian Hobson-Garcia Committed by Catalin Marinas
Browse files

arm64: Provide default implementation for dma_{alloc,free}_attrs 



Most architectures that define CONFIG_HAS_DMA, have implementations for
both dma_alloc_attrs() and dma_free_attrs().  All achitectures that do
not define CONFIG_HAS_DMA also have both of these definitions provided
by dma-mapping-broken.h.

Add default implementations for these functions on arm64.

Signed-off-by: default avatarDamian Hobson-Garcia <dhobsong@igel.co.jp>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent d683b96b

arch/arm64/include/asm/dma-mapping.h

+11 −6
Original line number Diff line number Diff line
@@ -81,8 +81,12 @@ static inline void dma_mark_clean(void *addr, size_t size) 
{

}



static inline void *dma_alloc_coherent(struct device *dev, size_t size,

				       dma_addr_t *dma_handle, gfp_t flags)

#define dma_alloc_coherent(d, s, h, f)	dma_alloc_attrs(d, s, h, f, NULL)

#define dma_free_coherent(d, s, h, f)	dma_free_attrs(d, s, h, f, NULL)



static inline void *dma_alloc_attrs(struct device *dev, size_t size,

				    dma_addr_t *dma_handle, gfp_t flags,

				    struct dma_attrs *attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	void *vaddr;
@@ -90,13 +94,14 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size, 
	if (dma_alloc_from_coherent(dev, size, dma_handle, &vaddr))

		return vaddr;



	vaddr = ops->alloc(dev, size, dma_handle, flags, NULL);

	vaddr = ops->alloc(dev, size, dma_handle, flags, attrs);

	debug_dma_alloc_coherent(dev, size, *dma_handle, vaddr);

	return vaddr;

}



static inline void dma_free_coherent(struct device *dev, size_t size,

				     void *vaddr, dma_addr_t dev_addr)

static inline void dma_free_attrs(struct device *dev, size_t size,

				  void *vaddr, dma_addr_t dev_addr,

				  struct dma_attrs *attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);
@@ -104,7 +109,7 @@ static inline void dma_free_coherent(struct device *dev, size_t size, 
		return;



	debug_dma_free_coherent(dev, size, vaddr, dev_addr);

	ops->free(dev, size, vaddr, dev_addr, NULL);

	ops->free(dev, size, vaddr, dev_addr, attrs);

}



/*