Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-31 23:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

remoteproc: add release ops in rproc_mem_entry struct

Browse Source 
Memory entry could be allocated in different ways (ioremap,
dma_alloc_coherent, internal RAM allocator...).
This patch introduces a release ops in rproc_mem_entry structure
to associate dedicated release mechanism to each memory entry descriptor
in order to keep remoteproc core generic.

Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Loic Pallardy 2018-07-27 15:14:38 +02:00 committed by Bjorn Andersson
parent eb30596eae
commit f2e74abfaa
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/remoteproc/remoteproc_core.c
View File

@ -599,6 +599,24 @@ out:
return ret; return ret;
} }
/**
* rproc_release_carveout() - release acquired carveout
* @rproc: rproc handle
* @mem: the memory entry to release
*
* This function releases specified memory entry @mem allocated via
* dma_alloc_coherent() function by @rproc.
*/
static int rproc_release_carveout(struct rproc *rproc,
struct rproc_mem_entry *mem)
{
struct device *dev = &rproc->dev;
/* clean up carveout allocations */
dma_free_coherent(dev->parent, mem->len, mem->va, mem->dma);
return 0;
}
/** /**
* rproc_handle_carveout() - handle phys contig memory allocation requests * rproc_handle_carveout() - handle phys contig memory allocation requests
* @rproc: rproc handle * @rproc: rproc handle
@ -733,6 +751,7 @@ static int rproc_handle_carveout(struct rproc *rproc,
carveout->len = rsc->len; carveout->len = rsc->len;
carveout->dma = dma; carveout->dma = dma;
carveout->da = rsc->da; carveout->da = rsc->da;
carveout->release = rproc_release_carveout;
list_add_tail(&carveout->node, &rproc->carveouts); list_add_tail(&carveout->node, &rproc->carveouts);
@ -920,8 +939,8 @@ static void rproc_resource_cleanup(struct rproc *rproc)
/* clean up carveout allocations */ /* clean up carveout allocations */
list_for_each_entry_safe(entry, tmp, &rproc->carveouts, node) { list_for_each_entry_safe(entry, tmp, &rproc->carveouts, node) {
dma_free_coherent(dev->parent, entry->len, entry->va, if (entry->release)
entry->dma); entry->release(rproc, entry);
list_del(&entry->node); list_del(&entry->node);
kfree(entry); kfree(entry);
} }

5
include/linux/remoteproc.h
View File

@ -305,12 +305,15 @@ struct fw_rsc_vdev {
struct fw_rsc_vdev_vring vring[0]; struct fw_rsc_vdev_vring vring[0];
} __packed; } __packed;
struct rproc;
/** /**
* struct rproc_mem_entry - memory entry descriptor * struct rproc_mem_entry - memory entry descriptor
* @va: virtual address * @va: virtual address
* @dma: dma address * @dma: dma address
* @len: length, in bytes * @len: length, in bytes
* @da: device address * @da: device address
* @release: release associated memory
* @priv: associated data * @priv: associated data
* @node: list node * @node: list node
*/ */
@ -321,9 +324,9 @@ struct rproc_mem_entry {
u32 da; u32 da;
void *priv; void *priv;
struct list_head node; struct list_head node;
int (*release)(struct rproc *rproc, struct rproc_mem_entry *mem);
}; };
struct rproc;
struct firmware; struct firmware;
/** /**