diff options
| author | Antoine Tenart <antoine.tenart@bootlin.com> | 2018-06-22 10:15:39 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-23 10:40:15 +0900 |
| commit | 271f7ff5aa5a73488b7a9d8b84b5205fb5b2f7cc (patch) | |
| tree | b47073e4ee3a9342de9357252d169cfea7b8cd96 /drivers/net | |
| parent | 805f16a5f12fd68e10841013ccfaceb2f4d7066a (diff) | |
| download | linux-271f7ff5aa5a73488b7a9d8b84b5205fb5b2f7cc.tar.gz linux-271f7ff5aa5a73488b7a9d8b84b5205fb5b2f7cc.tar.bz2 linux-271f7ff5aa5a73488b7a9d8b84b5205fb5b2f7cc.zip | |
net: mvneta: fix the Rx desc DMA address in the Rx path
When using s/w buffer management, buffers are allocated and DMA mapped.
When doing so on an arm64 platform, an offset correction is applied on
the DMA address, before storing it in an Rx descriptor. The issue is
this DMA address is then used later in the Rx path without removing the
offset correction. Thus the DMA address is wrong, which can led to
various issues.
This patch fixes this by removing the offset correction from the DMA
address retrieved from the Rx descriptor before using it in the Rx path.
Fixes: 8d5047cf9ca2 ("net: mvneta: Convert to be 64 bits compatible")
Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvneta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 17a904cc6a5e..0ad2f3f7da85 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -1932,7 +1932,7 @@ static int mvneta_rx_swbm(struct mvneta_port *pp, int rx_todo, rx_bytes = rx_desc->data_size - (ETH_FCS_LEN + MVNETA_MH_SIZE); index = rx_desc - rxq->descs; data = rxq->buf_virt_addr[index]; - phys_addr = rx_desc->buf_phys_addr; + phys_addr = rx_desc->buf_phys_addr - pp->rx_offset_correction; if (!mvneta_rxq_desc_is_first_last(rx_status) || (rx_status & MVNETA_RXD_ERR_SUMMARY)) { |