diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2019-02-06 17:22:01 -0800 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-11 08:47:46 +0100 |
| commit | de354c54dd9647303a071d989ad79a495024e4bf (patch) | |
| tree | a3414b452e4d68e37de2b26532c6c476de2579d4 /drivers/net/e1000 | |
| parent | ba03d043f1548b93d365cdabe93851db30b7274a (diff) | |
| download | barebox-de354c54dd9647303a071d989ad79a495024e4bf.tar.gz barebox-de354c54dd9647303a071d989ad79a495024e4bf.tar.xz | |
net/e1000: Don't use coherent memory for Rx buffer
In order to avoid issues on AArch64, convert the driver to use regular
memory and add appropriate DMA sync calls. Drop needless (uchar *)
cast while at it.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/e1000')
| -rw-r--r-- | drivers/net/e1000/e1000.h | 1 | ||||
| -rw-r--r-- | drivers/net/e1000/main.c | 18 |
2 files changed, 15 insertions, 4 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index 0a9e107c07..52ad3d4cdb 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h @@ -2182,6 +2182,7 @@ struct e1000_hw { struct e1000_tx_desc *tx_base; struct e1000_rx_desc *rx_base; unsigned char *packet; + dma_addr_t packet_dma; int tx_tail; int rx_tail, rx_last; diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c index 0ef8fd6231..7358763f9d 100644 --- a/drivers/net/e1000/main.c +++ b/drivers/net/e1000/main.c @@ -3215,7 +3215,7 @@ static void fill_rx(struct e1000_hw *hw) for (i = 0; i < 4; i++) *bla++ = 0; - rd->buffer_addr = cpu_to_le64((unsigned long)hw->packet); + rd->buffer_addr = cpu_to_le64(hw->packet_dma); e1000_write_reg(hw, E1000_RDT, hw->rx_tail); } @@ -3406,9 +3406,11 @@ static int e1000_poll(struct eth_device *edev) len = le32_to_cpu(rd->length); - dma_sync_single_for_cpu((unsigned long)hw->packet, len, DMA_FROM_DEVICE); + dma_sync_single_for_cpu(hw->packet_dma, len, DMA_FROM_DEVICE); - net_receive(edev, (uchar *)hw->packet, len); + net_receive(edev, hw->packet, len); + + dma_sync_single_for_device(hw->packet_dma, len, DMA_FROM_DEVICE); fill_rx(hw); return 1; } @@ -3561,7 +3563,6 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *id) hw->tx_base = dma_alloc_coherent(16 * sizeof(*hw->tx_base), DMA_ADDRESS_BROKEN); hw->rx_base = dma_alloc_coherent(16 * sizeof(*hw->rx_base), DMA_ADDRESS_BROKEN); - hw->packet = dma_alloc_coherent(4096, DMA_ADDRESS_BROKEN); edev = &hw->edev; @@ -3570,6 +3571,15 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *id) pdev->dev.priv = hw; edev->priv = hw; + hw->packet = dma_alloc(PAGE_SIZE); + if (!hw->packet) + return -ENOMEM; + + hw->packet_dma = dma_map_single(hw->dev, hw->packet, PAGE_SIZE, + DMA_FROM_DEVICE); + if (dma_mapping_error(hw->dev, hw->packet_dma)) + return -EFAULT; + hw->hw_addr = pci_iomap(pdev, 0); /* MAC and Phy settings */ |