diff options
author | Tom Rini <trini@konsulko.com> | 2019-04-27 10:42:36 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-04-27 10:42:36 -0400 |
commit | 6b8e57338f3c5b65fa5b883fa3f87124f11a9e19 (patch) | |
tree | 222892e528eed7e9785a444e765014fa320bba2b /drivers/net | |
parent | 07b68b7843ad1fa15d63dcd26b5ca5a053fcc27f (diff) | |
parent | fc1fe01b08cedd77a194bb82fa81af4fe1e39031 (diff) |
Merge branch '2019-04-27-master-imports'
- Various vexpress, taurus, da850evm, lpc32xx, brxre1 fixes/updates
- btrfs fixes
- Add AM65x HS EVM
- Other small fixes
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/lpc32xx_eth.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/lpc32xx_eth.c b/drivers/net/lpc32xx_eth.c index 2d15fc8db20..ec5184edf88 100644 --- a/drivers/net/lpc32xx_eth.c +++ b/drivers/net/lpc32xx_eth.c @@ -373,7 +373,8 @@ static int lpc32xx_eth_send(struct eth_device *dev, void *dataptr, int datasize) tx_index = readl(®s->txproduceindex); /* set up transmit packet */ - writel((u32)dataptr, &bufs->tx_desc[tx_index].packet); + memcpy((void *)&bufs->tx_buf[tx_index * PKTSIZE_ALIGN], + (void *)dataptr, datasize); writel(TX_CTRL_LAST | ((datasize - 1) & TX_CTRL_TXSIZE), &bufs->tx_desc[tx_index].control); writel(0, &bufs->tx_stat[tx_index].statusinfo); @@ -508,6 +509,11 @@ static int lpc32xx_eth_init(struct eth_device *dev) writel((u32)(&bufs->rx_stat), ®s->rxstatus); writel(RX_BUF_COUNT-1, ®s->rxdescriptornumber); + /* set up transmit buffers */ + for (index = 0; index < TX_BUF_COUNT; index++) + bufs->tx_desc[index].packet = + (u32)(bufs->tx_buf + index * PKTSIZE_ALIGN); + /* Enable broadcast and matching address packets */ writel(RXFILTERCTRL_ACCEPTBROADCAST | RXFILTERCTRL_ACCEPTPERFECT, ®s->rxfilterctrl); |