aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/remoteproc
diff options
context:
space:
mode:
authorSjur Brændeland <sjur.brandeland@stericsson.com>2012-09-18 14:32:45 -0400
committerOhad Ben-Cohen <ohad@wizery.com>2012-09-18 14:55:52 -0400
commit099a3f33c82b5153a4422eb92c648098b3f7c086 (patch)
treeceeb12f2321595dd465aac47873ab2497463a8b8 /drivers/remoteproc
parent2e37abb89a2ef13c524b0728bb9893f996a10b6b (diff)
remtoteproc: maintain max notifyid
Some of the rproc drivers (STE modem specifically) needs to know the range of the notification IDs used for notifying the device. Maintain a variable in struct rproc holding the largest allocated notification id, so low-level rproc drivers could access it. Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com> [ohad: rebase, slightly edit commit log] Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Diffstat (limited to 'drivers/remoteproc')
-rw-r--r--drivers/remoteproc/remoteproc_core.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 29fc8236cac9..b6c622982f8c 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -228,6 +228,9 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i)
228 return ret; 228 return ret;
229 } 229 }
230 230
231 /* Store largest notifyid */
232 rproc->max_notifyid = max(rproc->max_notifyid, notifyid);
233
231 dev_dbg(dev, "vring%d: va %p dma %x size %x idr %d\n", i, va, 234 dev_dbg(dev, "vring%d: va %p dma %x size %x idr %d\n", i, va,
232 dma, size, notifyid); 235 dma, size, notifyid);
233 236
@@ -269,13 +272,25 @@ rproc_parse_vring(struct rproc_vdev *rvdev, struct fw_rsc_vdev *rsc, int i)
269 return 0; 272 return 0;
270} 273}
271 274
275static int rproc_max_notifyid(int id, void *p, void *data)
276{
277 int *maxid = data;
278 *maxid = max(*maxid, id);
279 return 0;
280}
281
272void rproc_free_vring(struct rproc_vring *rvring) 282void rproc_free_vring(struct rproc_vring *rvring)
273{ 283{
274 int size = PAGE_ALIGN(vring_size(rvring->len, rvring->align)); 284 int size = PAGE_ALIGN(vring_size(rvring->len, rvring->align));
275 struct rproc *rproc = rvring->rvdev->rproc; 285 struct rproc *rproc = rvring->rvdev->rproc;
286 int maxid = 0;
276 287
277 dma_free_coherent(rproc->dev.parent, size, rvring->va, rvring->dma); 288 dma_free_coherent(rproc->dev.parent, size, rvring->va, rvring->dma);
278 idr_remove(&rproc->notifyids, rvring->notifyid); 289 idr_remove(&rproc->notifyids, rvring->notifyid);
290
291 /* Find the largest remaining notifyid */
292 idr_for_each(&rproc->notifyids, rproc_max_notifyid, &maxid);
293 rproc->max_notifyid = maxid;
279} 294}
280 295
281/** 296/**