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

Commit f2e74abf authored by Loic Pallardy's avatar Loic Pallardy Committed by Bjorn Andersson
Browse files

remoteproc: add release ops in rproc_mem_entry struct 



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: default avatarLoic Pallardy <loic.pallardy@st.com>
Acked-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent eb30596e

drivers/remoteproc/remoteproc_core.c

+21 −2
Original line number Diff line number Diff line
@@ -599,6 +599,24 @@ static int rproc_handle_devmem(struct rproc *rproc, struct fw_rsc_devmem *rsc, 
	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: rproc handle
@@ -733,6 +751,7 @@ static int rproc_handle_carveout(struct rproc *rproc, 
	carveout->len = rsc->len;

	carveout->dma = dma;

	carveout->da = rsc->da;

	carveout->release = rproc_release_carveout;



	list_add_tail(&carveout->node, &rproc->carveouts);
@@ -920,8 +939,8 @@ static void rproc_resource_cleanup(struct rproc *rproc) 


	/* clean up carveout allocations */

	list_for_each_entry_safe(entry, tmp, &rproc->carveouts, node) {

		dma_free_coherent(dev->parent, entry->len, entry->va,

				  entry->dma);

		if (entry->release)

			entry->release(rproc, entry);

		list_del(&entry->node);

		kfree(entry);

	}

include/linux/remoteproc.h

+4 −1
Original line number Diff line number Diff line
@@ -305,12 +305,15 @@ struct fw_rsc_vdev { 
	struct fw_rsc_vdev_vring vring[0];

} __packed;



struct rproc;



/**

 * struct rproc_mem_entry - memory entry descriptor

 * @va:	virtual address

 * @dma: dma address

 * @len: length, in bytes

 * @da: device address

 * @release: release associated memory

 * @priv: associated data

 * @node: list node

 */
@@ -321,9 +324,9 @@ struct rproc_mem_entry { 
	u32 da;

	void *priv;

	struct list_head node;

	int (*release)(struct rproc *rproc, struct rproc_mem_entry *mem);

};



struct rproc;

struct firmware;



/**