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

Commit 843aef49 authored by David Daney's avatar David Daney Committed by Ralf Baechle
Browse files

MIPS: Adjust the dma-common.c platform hooks. 



We add a dev parameter to plat_unmap_dma_mem(), and hooks for
plat_dma_supported() and plat_extra_sync_for_device() which should be
nop changes for all existing targets.

Signed-off-by: default avatarDavid Daney <ddaney@caviumnetworks.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent ec454d8c

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

+25 −1
Original line number Diff line number Diff line
@@ -28,10 +28,34 @@ static inline unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr) 
	return dma_addr;

}



static inline void plat_unmap_dma_mem(dma_addr_t dma_addr)

static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr)

{

}



static inline int plat_dma_supported(struct device *dev, u64 mask)

{

	/*

	 * we fall back to GFP_DMA when the mask isn't all 1s,

	 * so we can't guarantee allocations that must be

	 * within a tighter range than GFP_DMA..

	 */

	if (mask < DMA_BIT_MASK(24))

		return 0;



	return 1;

}



static inline void plat_extra_sync_for_device(struct device *dev)

{

	return;

}



static inline int plat_dma_mapping_error(struct device *dev,

					 dma_addr_t dma_addr)

{

	return 0;

}



static inline int plat_device_is_coherent(struct device *dev)

{

#ifdef CONFIG_DMA_COHERENT

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

+25 −1
Original line number Diff line number Diff line
@@ -38,10 +38,34 @@ static unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr) 
	return dma_addr & ~(0xffUL << 56);

}



static inline void plat_unmap_dma_mem(dma_addr_t dma_addr)

static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr)

{

}



static inline int plat_dma_supported(struct device *dev, u64 mask)

{

	/*

	 * we fall back to GFP_DMA when the mask isn't all 1s,

	 * so we can't guarantee allocations that must be

	 * within a tighter range than GFP_DMA..

	 */

	if (mask < DMA_BIT_MASK(24))

		return 0;



	return 1;

}



static inline void plat_extra_sync_for_device(struct device *dev)

{

	return;

}



static inline int plat_dma_mapping_error(struct device *dev,

					 dma_addr_t dma_addr)

{

	return 0;

}



static inline int plat_device_is_coherent(struct device *dev)

{

	return 1;		/* IP27 non-cohernet mode is unsupported */

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

+25 −1
Original line number Diff line number Diff line
@@ -60,10 +60,34 @@ static unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr) 
	return addr;

}



static inline void plat_unmap_dma_mem(dma_addr_t dma_addr)

static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr)

{

}



static inline int plat_dma_supported(struct device *dev, u64 mask)

{

	/*

	 * we fall back to GFP_DMA when the mask isn't all 1s,

	 * so we can't guarantee allocations that must be

	 * within a tighter range than GFP_DMA..

	 */

	if (mask < DMA_BIT_MASK(24))

		return 0;



	return 1;

}



static inline void plat_extra_sync_for_device(struct device *dev)

{

	return;

}



static inline int plat_dma_mapping_error(struct device *dev,

					 dma_addr_t dma_addr)

{

	return 0;

}



static inline int plat_device_is_coherent(struct device *dev)

{

	return 0;		/* IP32 is non-cohernet */

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

+25 −1
Original line number Diff line number Diff line
@@ -27,11 +27,35 @@ static unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr) 
	return vdma_log2phys(dma_addr);

}



static void plat_unmap_dma_mem(dma_addr_t dma_addr)

static void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr)

{

	vdma_free(dma_addr);

}



static inline int plat_dma_supported(struct device *dev, u64 mask)

{

	/*

	 * we fall back to GFP_DMA when the mask isn't all 1s,

	 * so we can't guarantee allocations that must be

	 * within a tighter range than GFP_DMA..

	 */

	if (mask < DMA_BIT_MASK(24))

		return 0;



	return 1;

}



static inline void plat_extra_sync_for_device(struct device *dev)

{

	return;

}



static inline int plat_dma_mapping_error(struct device *dev,

					 dma_addr_t dma_addr)

{

	return 0;

}



static inline int plat_device_is_coherent(struct device *dev)

{

	return 0;

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

+25 −1
Original line number Diff line number Diff line
@@ -30,10 +30,34 @@ static inline unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr) 
	return dma_addr & 0x7fffffff;

}



static inline void plat_unmap_dma_mem(dma_addr_t dma_addr)

static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr)

{

}



static inline int plat_dma_supported(struct device *dev, u64 mask)

{

	/*

	 * we fall back to GFP_DMA when the mask isn't all 1s,

	 * so we can't guarantee allocations that must be

	 * within a tighter range than GFP_DMA..

	 */

	if (mask < DMA_BIT_MASK(24))

		return 0;



	return 1;

}



static inline void plat_extra_sync_for_device(struct device *dev)

{

	return;

}



static inline int plat_dma_mapping_error(struct device *dev,

					 dma_addr_t dma_addr)

{

	return 0;

}



static inline int plat_device_is_coherent(struct device *dev)

{

	return 0;