|
@@ -599,6 +599,24 @@ out:
|
|
|
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);
|
|
|
}
|