X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=carlfw%2Fsrc%2Fdma.c;h=de9c8b91b71489e0ff115b966a0d237005574fe6;hb=bf38ae52cd2ec91f5abeadc00c4e17fc647c2bc0;hp=73b10966fd14d367ac856135e4b4137293449c89;hpb=12d3f1ba6ba522cd1ef11483d813fe2c2e64f04b;p=carl9170fw.git

diff --git a/carlfw/src/dma.c b/carlfw/src/dma.c
index 73b1096..de9c8b9 100644
--- a/carlfw/src/dma.c
+++ b/carlfw/src/dma.c
@@ -78,6 +78,7 @@ void dma_init_descriptors(void)
 	fw.pta.down_queue.head = fw.pta.down_queue.terminator = &dma_mem.terminator[i++];
 	for (j = 0; j < __AR9170_NUM_TX_QUEUES; j++)
 		fw.wlan.tx_queue[j].head = fw.wlan.tx_queue[j].terminator = &dma_mem.terminator[i++];
+	fw.wlan.tx_retry.head = fw.wlan.tx_retry.terminator = &dma_mem.terminator[i++];
 	fw.wlan.rx_queue.head = fw.wlan.rx_queue.terminator = &dma_mem.terminator[i++];
 	fw.usb.int_desc = &dma_mem.terminator[i++];
 
@@ -96,13 +97,6 @@ void dma_init_descriptors(void)
 	fw.wlan.ba_desc = &dma_mem.terminator[i++];
 #endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
 
-#ifdef CONFIG_CARL9170FW_DELAYED_TX
-	fw.wlan.tx_retry.head = fw.wlan.tx_retry.terminator = &dma_mem.terminator[i++];
-
-	for (j = 0; j < __AR9170_NUM_TX_QUEUES; j++)
-		fw.wlan.tx_delay[j].head = fw.wlan.tx_delay[j].terminator = &dma_mem.terminator[i++];
-#endif /* CONFIG_CARL9170FW_DELAYED_TX */
-
 	BUILD_BUG_ON(AR9170_TERMINATOR_NUMBER != j);
 
 	DBG("Blocks:%d [tx:%d, rx:%d] Terminators:%d/%d\n",
@@ -171,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;
@@ -184,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;
 
@@ -247,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);