X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=carlfw%2Fsrc%2Fdma.c;h=c33608cc4814e251fa7a1bcf3b22a14fb0df6dd6;hp=dc4d2785ac4175fd1ca93cda5c29eba89ba59d63;hb=af915846d44d23adc02c7ded807282d607b46faa;hpb=fce55bd78997d0363c1029d90e62eb1de8a5ba6d diff --git a/carlfw/src/dma.c b/carlfw/src/dma.c index dc4d278..c33608c 100644 --- a/carlfw/src/dma.c +++ b/carlfw/src/dma.c @@ -6,7 +6,7 @@ * Copyright (c) 2000-2005 ZyDAS Technology Corporation * Copyright (c) 2007-2009 Atheros Communications, Inc. * Copyright 2009 Johannes Berg - * Copyright 2009, 2010 Christian Lamparter + * Copyright 2009-2011 Christian Lamparter * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -78,23 +78,23 @@ 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++]; + fw.wlan.fw_desc = &dma_mem.terminator[i++]; #ifdef CONFIG_CARL9170FW_CAB_QUEUE - fw.wlan.cab_queue.head = fw.wlan.cab_queue.terminator = &dma_mem.terminator[i++]; + /* GCC bug ? */ +# if (CARL9170_INTF_NUM != 2) + for (j = 0; j < CARL9170_INTF_NUM; j++) + fw.wlan.cab_queue[j].head = fw.wlan.cab_queue[j].terminator = &dma_mem.terminator[i++]; +#else + fw.wlan.cab_queue[0].head = fw.wlan.cab_queue[0].terminator = &dma_mem.terminator[i++]; + fw.wlan.cab_queue[1].head = fw.wlan.cab_queue[1].terminator = &dma_mem.terminator[i++]; +#endif #endif /* CONFIG_CARL9170FW_CAB_QUEUE */ -#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ - 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", AR9170_BLOCK_NUMBER, AR9170_TX_BLOCK_NUMBER, @@ -120,14 +120,8 @@ void dma_init_descriptors(void) set_wlan_txq_dma_addr(i, (uint32_t) fw.wlan.tx_queue[i].head); set(AR9170_MAC_REG_DMA_RXQ_ADDR, (uint32_t) fw.wlan.rx_queue.head); - - fw.usb.int_desc->status = AR9170_OWN_BITS_SW; - fw.usb.int_desc->ctrl = (AR9170_CTRL_LS_BIT | AR9170_CTRL_FS_BIT); fw.usb.int_desc->dataSize = AR9170_BLOCK_SIZE; - fw.usb.int_desc->totalLen = 0; - fw.usb.int_desc->lastAddr = fw.usb.int_desc; fw.usb.int_desc->dataAddr = (void *) &dma_mem.reserved.rsp; - fw.usb.int_desc->nextAddr = (void *) 0; memset(DESC_PAYLOAD(fw.usb.int_desc), 0xff, AR9170_INT_MAGIC_HEADER_SIZE); @@ -137,21 +131,8 @@ void dma_init_descriptors(void) /* rsp is now available for use */ fw.usb.int_desc_available = 1; -#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ - fw.wlan.ba_desc->status = AR9170_OWN_BITS_SW; - fw.wlan.ba_desc->ctrl = (AR9170_CTRL_LS_BIT | AR9170_CTRL_FS_BIT); - fw.wlan.ba_desc->dataSize = fw.wlan.ba_desc->totalLen = - sizeof(struct carl9170_tx_superdesc) + - sizeof(struct ar9170_tx_hwdesc) + - sizeof(struct ieee80211_ba) + FCS_LEN; - fw.wlan.ba_desc->lastAddr = fw.wlan.ba_desc; - fw.wlan.ba_desc->nextAddr = fw.wlan.ba_desc; - fw.wlan.ba_desc->dataAddr = (void *) &dma_mem.reserved.ba; - - memset(DESC_PAYLOAD(fw.wlan.ba_desc), 0, 128); - - fw.wlan.ba_desc_available = 1; -#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */ + memset(DESC_PAYLOAD(fw.wlan.fw_desc), 0, 128); + fw.wlan.fw_desc_available = 1; } /* @@ -162,11 +143,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; @@ -175,24 +158,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; @@ -238,14 +225,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);