Skip to content

Commit

Permalink
dma-coherent: remove the DMA_MEMORY_INCLUDES_CHILDREN flag
Browse files Browse the repository at this point in the history
This flag was never implemented or used.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
  • Loading branch information
Christoph Hellwig committed Sep 1, 2017
1 parent 7232888 commit b32dbc1
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 11 deletions.
4 changes: 0 additions & 4 deletions Documentation/DMA-API.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions drivers/base/dma-coherent.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
3 changes: 0 additions & 3 deletions drivers/char/virtio_console.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions include/linux/dma-mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit b32dbc1

Please sign in to comment.