mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-08 22:23:18 +00:00
dma-coherent: remove the DMA_MEMORY_INCLUDES_CHILDREN flag
This flag was never implemented or used. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Robin Murphy <robin.murphy@arm.com>
This commit is contained in:
parent
7232888366
commit
b32dbc1e0b
@ -600,10 +600,6 @@ flags can be ORed together and are:
|
||||
|
||||
One or both of these flags must be present.
|
||||
|
||||
- DMA_MEMORY_INCLUDES_CHILDREN - make the declared memory be allocated by
|
||||
dma_alloc_coherent of any child devices of this one (for memory residing
|
||||
on a bridge).
|
||||
|
||||
- DMA_MEMORY_EXCLUSIVE - only allocate memory from the declared regions.
|
||||
Do not allow dma_alloc_coherent() to fall back to system memory when
|
||||
it's out of memory in the declared region.
|
||||
|
@ -109,8 +109,6 @@ static int dma_assign_coherent_memory(struct device *dev,
|
||||
return -EBUSY;
|
||||
|
||||
dev->dma_mem = mem;
|
||||
/* FIXME: this routine just ignores DMA_MEMORY_INCLUDES_CHILDREN */
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -451,9 +451,6 @@ static struct port_buffer *alloc_buf(struct virtqueue *vq, size_t buf_size,
|
||||
* device is created by remoteproc, the DMA memory is
|
||||
* associated with the grandparent device:
|
||||
* vdev => rproc => platform-dev.
|
||||
* The code here would have been less quirky if
|
||||
* DMA_MEMORY_INCLUDES_CHILDREN had been supported
|
||||
* in dma-coherent.c
|
||||
*/
|
||||
if (!vq->vdev->dev.parent || !vq->vdev->dev.parent->parent)
|
||||
goto free_buf;
|
||||
|
@ -696,8 +696,7 @@ static inline int dma_get_cache_alignment(void)
|
||||
/* flags for the coherent memory api */
|
||||
#define DMA_MEMORY_MAP 0x01
|
||||
#define DMA_MEMORY_IO 0x02
|
||||
#define DMA_MEMORY_INCLUDES_CHILDREN 0x04
|
||||
#define DMA_MEMORY_EXCLUSIVE 0x08
|
||||
#define DMA_MEMORY_EXCLUSIVE 0x04
|
||||
|
||||
#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT
|
||||
int dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
|
||||
|
Loading…
Reference in New Issue
Block a user