From db8e036eef5967120dfb65222a185f1c460fe0ea Mon Sep 17 00:00:00 2001 From: Chris Lew Date: Wed, 8 Jun 2022 13:52:40 -0700 Subject: [PATCH] FROMLIST: remoteproc: core: Add helper to remove carveouts To mirror the exported rproc_add_carveout(), add a rproc_del_carveout() so carveout lifetime can be managed more accurately. Bug: 235577039 Link: https://lore.kernel.org/lkml/1654888985-3846-2-git-send-email-quic_clew@quicinc.com/ Change-Id: Ia562829f26a007aef3101f2e51f87b30b43addf7 Signed-off-by: Chris Lew --- drivers/remoteproc/remoteproc_core.c | 20 ++++++++++++++++++++ include/linux/remoteproc.h | 1 + 2 files changed, 21 insertions(+) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 47990192cbcd..a69f656fc650 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1007,6 +1007,26 @@ void rproc_add_carveout(struct rproc *rproc, struct rproc_mem_entry *mem) } EXPORT_SYMBOL(rproc_add_carveout); +/** + * rproc_del_carveout() - remove an allocated carveout region + * @rproc: rproc handle + * @mem: memory entry to register + * + * This function removes specified memory entry in @rproc carveouts list. + */ +void rproc_del_carveout(struct rproc *rproc, struct rproc_mem_entry *mem) +{ + struct rproc_mem_entry *entry, *tmp; + + list_for_each_entry_safe(entry, tmp, &rproc->carveouts, node) { + if (entry == mem) { + list_del(&mem->node); + return; + } + } +} +EXPORT_SYMBOL(rproc_del_carveout); + /** * rproc_mem_entry_init() - allocate and initialize rproc_mem_entry struct * @dev: pointer on device struct diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index 5dad097900ac..521fbf3a203e 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -656,6 +656,7 @@ struct rproc *devm_rproc_alloc(struct device *dev, const char *name, int devm_rproc_add(struct device *dev, struct rproc *rproc); void rproc_add_carveout(struct rproc *rproc, struct rproc_mem_entry *mem); +void rproc_del_carveout(struct rproc *rproc, struct rproc_mem_entry *mem); struct rproc_mem_entry * rproc_mem_entry_init(struct device *dev,