From 1c44fc936d05fef3259354da1574c536ed1691c7 Mon Sep 17 00:00:00 2001 From: Jassi Brar Date: Tue, 31 Mar 2015 10:16:46 +0530 Subject: [PATCH 1/2] dma: pl330: change busy marker for threads Instead of a boolean flag to mark a thread busy, use the owner of the thread as the marker. For free/available threads, the owner is NULL. This will be useful in finding which channel owns a given thread. Signed-off-by: Jassi Brar --- drivers/dma/pl330.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 0e1f567..d1f777e 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -369,8 +369,7 @@ struct _pl330_tbd { struct pl330_thread { u8 id; int ev; - /* If the channel is not yet acquired by any client */ - bool free; + struct dma_pl330_chan *pch; /* Parent DMAC */ struct pl330_dmac *dmac; /* Only two at a time */ @@ -1648,7 +1647,8 @@ static bool _chan_ns(const struct pl330_dmac *pl330, int i) /* Upon success, returns IdentityToken for the * allocated channel, NULL otherwise. */ -static struct pl330_thread *pl330_request_channel(struct pl330_dmac *pl330) +static struct pl330_thread *pl330_request_channel(struct pl330_dmac *pl330, + struct dma_pl330_chan *pch) { struct pl330_thread *thrd = NULL; unsigned long flags; @@ -1663,11 +1663,11 @@ static struct pl330_thread *pl330_request_channel(struct pl330_dmac *pl330) for (i = 0; i < chans; i++) { thrd = &pl330->channels[i]; - if ((thrd->free) && (!_manager_ns(thrd) || + if (!thrd->pch && (!_manager_ns(thrd) || _chan_ns(pl330, i))) { thrd->ev = _alloc_event(thrd); if (thrd->ev >= 0) { - thrd->free = false; + thrd->pch = pch; thrd->lstenq = 1; thrd->req[0].desc = NULL; thrd->req[1].desc = NULL; @@ -1699,7 +1699,7 @@ static void pl330_release_channel(struct pl330_thread *thrd) struct pl330_dmac *pl330; unsigned long flags; - if (!thrd || thrd->free) + if (!thrd || !thrd->pch) return; _stop(thrd); @@ -1711,7 +1711,7 @@ static void pl330_release_channel(struct pl330_thread *thrd) spin_lock_irqsave(&pl330->lock, flags); _free_event(thrd, thrd->ev); - thrd->free = true; + thrd->pch = NULL; spin_unlock_irqrestore(&pl330->lock, flags); } @@ -1797,14 +1797,14 @@ static int dmac_alloc_threads(struct pl330_dmac *pl330) thrd->id = i; thrd->dmac = pl330; _reset_thread(thrd); - thrd->free = true; + thrd->pch = NULL; } /* MANAGER is indexed at the end */ thrd = &pl330->channels[chans]; thrd->id = chans; thrd->dmac = pl330; - thrd->free = false; + thrd->pch = NULL; pl330->manager = thrd; return 0; @@ -2082,7 +2082,7 @@ static int pl330_alloc_chan_resources(struct dma_chan *chan) dma_cookie_init(chan); pch->cyclic = false; - pch->thread = pl330_request_channel(pl330); + pch->thread = pl330_request_channel(pl330, pch); if (!pch->thread) { spin_unlock_irqrestore(&pch->lock, flags); return -ENOMEM; -- 1.9.1