lkml.org 
[lkml]   [2018]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.17 026/101] net: mvneta: fix the Rx desc DMA address in the Rx path
    Date
    4.17-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Antoine Tenart <antoine.tenart@bootlin.com>

    [ Upstream commit 271f7ff5aa5a73488b7a9d8b84b5205fb5b2f7cc ]

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/marvell/mvneta.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- 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_
    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)) {

    \
     
     \ /
      Last update: 2018-07-20 14:51    [W:2.427 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site