RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge pull request #14877 from maribu/stm32-eth-fix

Browse Source 
cpu/stm32/periph/eth: Fix transmission bug
This commit is contained in:
Francisco 2020-09-16 14:30:44 +02:00 committed by GitHub
commit 6a826555cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cpu/stm32/periph/eth.c
View File

@ -91,6 +91,7 @@ mutex_t stm32_eth_tx_completed = MUTEX_INIT_LOCKED;
static edma_desc_t rx_desc[ETH_RX_DESCRIPTOR_COUNT]; static edma_desc_t rx_desc[ETH_RX_DESCRIPTOR_COUNT];
static edma_desc_t tx_desc[ETH_TX_DESCRIPTOR_COUNT]; static edma_desc_t tx_desc[ETH_TX_DESCRIPTOR_COUNT];
static edma_desc_t *rx_curr; static edma_desc_t *rx_curr;
static edma_desc_t *tx_curr;
/* RX Buffers */ /* RX Buffers */
static char rx_buffer[ETH_RX_DESCRIPTOR_COUNT][ETH_RX_BUFFER_SIZE]; static char rx_buffer[ETH_RX_DESCRIPTOR_COUNT][ETH_RX_BUFFER_SIZE];
@ -178,9 +179,10 @@ static void _init_buffer(void)
tx_desc[ETH_RX_DESCRIPTOR_COUNT - 1].desc_next = &tx_desc[0]; tx_desc[ETH_RX_DESCRIPTOR_COUNT - 1].desc_next = &tx_desc[0];
rx_curr = &rx_desc[0]; rx_curr = &rx_desc[0];
tx_curr = &tx_desc[0];
ETH->DMARDLAR = (uintptr_t)rx_curr; ETH->DMARDLAR = (uintptr_t)rx_curr;
ETH->DMATDLAR = (uintptr_t)&tx_desc[0]; ETH->DMATDLAR = (uintptr_t)tx_curr;
} }
static int stm32_eth_set(netdev_t *dev, netopt_t opt, static int stm32_eth_set(netdev_t *dev, netopt_t opt,
@ -343,8 +345,8 @@ static int stm32_eth_send(netdev_t *netdev, const struct iolist *iolist)
assert(iolist_count(iolist) <= ETH_TX_DESCRIPTOR_COUNT); assert(iolist_count(iolist) <= ETH_TX_DESCRIPTOR_COUNT);
for (unsigned i = 0; iolist; iolist = iolist->iol_next, i++) { for (unsigned i = 0; iolist; iolist = iolist->iol_next, i++) {
tx_desc[i].control = iolist->iol_len; tx_curr->control = iolist->iol_len;
tx_desc[i].buffer_addr = iolist->iol_base; tx_curr->buffer_addr = iolist->iol_base;
uint32_t status = TX_DESC_STAT_IC | TX_DESC_STAT_TCH | TX_DESC_STAT_CIC uint32_t status = TX_DESC_STAT_IC | TX_DESC_STAT_TCH | TX_DESC_STAT_CIC
| TX_DESC_STAT_OWN; | TX_DESC_STAT_OWN;
if (!i) { if (!i) {
@ -353,9 +355,10 @@ static int stm32_eth_send(netdev_t *netdev, const struct iolist *iolist)
} }
if (!iolist->iol_next) { if (!iolist->iol_next) {
/* last chunk */ /* last chunk */
status |= TX_DESC_STAT_LS | TX_DESC_STAT_TER; status |= TX_DESC_STAT_LS;
} }
tx_desc[i].status = status; tx_curr->status = status;
tx_curr = tx_curr->desc_next;
} }
/* start TX */ /* start TX */