From c772ac7e750c55c25ccba8c754eaa626cdfa9e44 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sat, 5 Mar 2011 22:46:29 +0100 Subject: [PATCH] carl9170 firmware: rework parts of dma_put & dma_reclaim Not that it would fix anything. Signed-off-by: Christian Lamparter --- carlfw/src/dma.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/carlfw/src/dma.c b/carlfw/src/dma.c index 92a8a68..de9c8b9 100644 --- a/carlfw/src/dma.c +++ b/carlfw/src/dma.c @@ -165,11 +165,13 @@ void dma_init_descriptors(void) */ void dma_reclaim(struct dma_queue *q, struct dma_desc *desc) { - struct dma_desc *tmpDesc; + struct dma_desc *tmpDesc, *last; struct dma_desc tdesc; /* 1. Set OWN bit to HW for all TDs to be added, clear ctrl and size */ tmpDesc = desc; + last = desc->lastAddr; + while (1) { tmpDesc->status = AR9170_OWN_BITS_HW; tmpDesc->ctrl = 0; @@ -178,24 +180,28 @@ void dma_reclaim(struct dma_queue *q, struct dma_desc *desc) /* TODO : Exception handle */ - if (desc->lastAddr == tmpDesc) + tmpDesc->lastAddr = tmpDesc; + + if (tmpDesc == last) break; - tmpDesc->lastAddr = desc->lastAddr; tmpDesc = tmpDesc->nextAddr; } /* 2. Next address of Last TD to be added = first TD */ - desc->lastAddr->nextAddr = desc; + tmpDesc->nextAddr = desc; + + /* Link first TD to self */ + desc->lastAddr = q->terminator; /* 3. Copy first TD to be added to TTD */ copy_dma_desc(&tdesc, desc); - /* 4. set first TD OWN bit to SW */ - desc->status = AR9170_OWN_BITS_SW; + /* 4. Initialize new terminator */ + clear_descriptor(desc); /* 5. Copy TTD to last TD */ - tdesc.status &= (~AR9170_OWN_BITS); + tdesc.status = 0; copy_dma_desc((void *)q->terminator, (void *)&tdesc); q->terminator->status |= AR9170_OWN_BITS_HW; @@ -241,14 +247,8 @@ void dma_put(struct dma_queue *q, struct dma_desc *desc) /* 3. Copy first TD to be added to TTD */ copy_dma_desc(&tdesc, desc); - /* 4. set first TD OWN bit to SW */ - desc->status = AR9170_OWN_BITS_SW; - desc->ctrl = 0; - desc->totalLen = 0; - desc->dataSize = 0; - desc->lastAddr = desc; - desc->nextAddr = desc; - desc->dataAddr = NULL; + /* 4. Initialize new terminator */ + clear_descriptor(desc); /* 5. Copy TTD to last TD */ tdesc.status &= (~AR9170_OWN_BITS); -- 2.31.1