diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-09-19 10:01:26 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-09-19 10:11:12 +0200 |
| commit | 46ecd129d563f491197719981883b417eb7e6084 (patch) | |
| tree | 3287a47990c4c87c52e3450045eeefc5c840e2f3 /drivers/net/macb.c | |
| parent | ceb644e37ce6b5b649ad377eec06f763cb98fded (diff) | |
| download | barebox-46ecd129d563f491197719981883b417eb7e6084.tar.gz barebox-46ecd129d563f491197719981883b417eb7e6084.tar.xz | |
net: macb: Allocate own receive buffer
Use a driver private buffer as network receive buffer rather than the
globally allocated ones which will be removed soon.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Link: https://lore.barebox.org/20220919080133.877651-3-s.hauer@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/macb.c')
| -rw-r--r-- | drivers/net/macb.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 511846122a..5dbca1553e 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -64,6 +64,7 @@ struct macb_device { void *rx_buffer; void *tx_buffer; + void *rx_packet_buf; struct macb_dma_desc *rx_ring; struct macb_dma_desc *tx_ring; struct macb_dma_desc *gem_q1_descs; @@ -230,16 +231,15 @@ static int macb_recv(struct eth_device *edev) taillen = length - headlen; dma_sync_single_for_cpu((unsigned long)buffer, headlen, DMA_FROM_DEVICE); - memcpy((void *)NetRxPackets[0], buffer, headlen); + memcpy(macb->rx_packet_buf, buffer, headlen); dma_sync_single_for_cpu((unsigned long)macb->rx_buffer, taillen, DMA_FROM_DEVICE); - memcpy((void *)NetRxPackets[0] + headlen, - macb->rx_buffer, taillen); + memcpy(macb->rx_packet_buf + headlen, macb->rx_buffer, taillen); dma_sync_single_for_device((unsigned long)buffer, headlen, DMA_FROM_DEVICE); dma_sync_single_for_device((unsigned long)macb->rx_buffer, taillen, DMA_FROM_DEVICE); - net_receive(edev, NetRxPackets[0], length); + net_receive(edev, macb->rx_packet_buf, length); } else { dma_sync_single_for_cpu((unsigned long)buffer, length, DMA_FROM_DEVICE); @@ -898,6 +898,8 @@ static int macb_probe(struct device_d *dev) macb->gem_q1_descs = dma_alloc_coherent(GEM_Q1_DESC_BYTES, DMA_ADDRESS_BROKEN); + macb->rx_packet_buf = xmalloc(PKTSIZE); + macb_reset_hw(macb); ncfgr = macb_mdc_clk_div(macb); ncfgr |= MACB_BIT(PAE); /* PAuse Enable */ @@ -921,6 +923,8 @@ static void macb_remove(struct device_d *dev) struct macb_device *macb = dev->priv; macb_halt(&macb->netdev); + + free(macb->rx_packet_buf); } static const struct macb_config fu540_c000_config = { |