diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-03-13 16:39:40 +0100 |
|---|---|---|
| committer | Steffen Trumtrar <s.trumtrar@pengutronix.de> | 2013-03-25 10:24:29 +0100 |
| commit | 247f83e47d51b9015675681fd8ac5a5ff91a99c4 (patch) | |
| tree | e7fb2916b45074b147306b481430f13d7a866e9d | |
| parent | 97e5f8bd9b5a16eca62063ba0ff9969b82547cfe (diff) | |
| download | barebox-247f83e47d51b9015675681fd8ac5a5ff91a99c4.tar.gz barebox-247f83e47d51b9015675681fd8ac5a5ff91a99c4.tar.xz | |
macb: fix gem_recv circular buffer handling
as we use a full buffer no need to check the SOF
and reset the rx_tail
fix at the same time the gem detection so we can have the rx_buffer
allocated correctly according to the IP
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
| -rw-r--r-- | drivers/net/macb.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index dc6b50e50..14a068912 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -172,7 +172,6 @@ static void reclaim_rx_buffers(struct macb_device *macb, static int gem_recv(struct eth_device *edev) { struct macb_device *macb = edev->priv; - unsigned int rx_tail = macb->rx_tail; void *buffer; int length; u32 status; @@ -181,20 +180,20 @@ static int gem_recv(struct eth_device *edev) for (;;) { barrier(); - if (!(macb->rx_ring[rx_tail].addr & MACB_BIT(RX_USED))) + if (!(macb->rx_ring[macb->rx_tail].addr & MACB_BIT(RX_USED))) return -1; barrier(); - status = macb->rx_ring[rx_tail].ctrl; + status = macb->rx_ring[macb->rx_tail].ctrl; length = MACB_BFEXT(RX_FRMLEN, status); - if (status & MACB_BIT(RX_SOF)) { - buffer = macb->rx_buffer + macb->rx_buffer_size * macb->rx_tail; - net_receive(buffer, length); - macb->rx_ring[rx_tail].ctrl &= ~MACB_BIT(RX_USED); - barrier(); - } - rx_tail++; + buffer = macb->rx_buffer + macb->rx_buffer_size * macb->rx_tail; + net_receive(buffer, length); + macb->rx_ring[macb->rx_tail].addr &= ~MACB_BIT(RX_USED); + barrier(); + macb->rx_tail++; + if (macb->rx_tail >= macb->rx_ring_size) + macb->rx_tail = 0; } return 0; @@ -619,11 +618,6 @@ static int macb_probe(struct device_d *dev) macb->phy_flags = pdata->phy_flags; - macb_init_rx_buffer_size(macb, PKTSIZE); - macb->rx_buffer = dma_alloc_coherent(macb->rx_buffer_size * macb->rx_ring_size); - macb->rx_ring = dma_alloc_coherent(RX_RING_BYTES(macb)); - macb->tx_ring = dma_alloc_coherent(TX_RING_BYTES); - macb->regs = dev_request_mem_region(dev, 0); /* @@ -638,11 +632,17 @@ static int macb_probe(struct device_d *dev) clk_enable(macb->pclk); + macb->is_gem = read_is_gem(macb); + if (macb_is_gem(macb)) edev->recv = gem_recv; else edev->recv = macb_recv; - macb->is_gem = read_is_gem(macb); + + macb_init_rx_buffer_size(macb, PKTSIZE); + macb->rx_buffer = dma_alloc_coherent(macb->rx_buffer_size * macb->rx_ring_size); + macb->rx_ring = dma_alloc_coherent(RX_RING_BYTES(macb)); + macb->tx_ring = dma_alloc_coherent(TX_RING_BYTES); macb_reset_hw(macb); ncfgr = macb_mdc_clk_div(macb); |