lkml.org 
[lkml]   [2020]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 347/388] ntb_perf: pass correct struct device to dma_alloc_coherent
    Date
    From: Sanjay R Mehta <sanju.mehta@amd.com>

    [ Upstream commit 98f4e140264eeb52f22ff05be6b6dd48237255ac ]

    Currently, ntb->dev is passed to dma_alloc_coherent
    and dma_free_coherent calls. The returned dma_addr_t
    is the CPU physical address. This works fine as long
    as IOMMU is disabled. But when IOMMU is enabled, we
    need to make sure that IOVA is returned for dma_addr_t.
    So the correct way to achieve this is by changing the
    first parameter of dma_alloc_coherent() as ntb->pdev->dev
    instead.

    Fixes: 5648e56d03fa ("NTB: ntb_perf: Add full multi-port NTB API support")
    Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
    Signed-off-by: Sanjay R Mehta <sanju.mehta@amd.com>
    Signed-off-by: Arindam Nath <arindam.nath@amd.com>
    Signed-off-by: Jon Mason <jdmason@kudzu.us>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/ntb/test/ntb_perf.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c
    index 972f6d984f6d..1c93b9f5c73b 100644
    --- a/drivers/ntb/test/ntb_perf.c
    +++ b/drivers/ntb/test/ntb_perf.c
    @@ -557,7 +557,7 @@ static void perf_free_inbuf(struct perf_peer *peer)
    return;

    (void)ntb_mw_clear_trans(peer->perf->ntb, peer->pidx, peer->gidx);
    - dma_free_coherent(&peer->perf->ntb->dev, peer->inbuf_size,
    + dma_free_coherent(&peer->perf->ntb->pdev->dev, peer->inbuf_size,
    peer->inbuf, peer->inbuf_xlat);
    peer->inbuf = NULL;
    }
    @@ -586,8 +586,9 @@ static int perf_setup_inbuf(struct perf_peer *peer)

    perf_free_inbuf(peer);

    - peer->inbuf = dma_alloc_coherent(&perf->ntb->dev, peer->inbuf_size,
    - &peer->inbuf_xlat, GFP_KERNEL);
    + peer->inbuf = dma_alloc_coherent(&perf->ntb->pdev->dev,
    + peer->inbuf_size, &peer->inbuf_xlat,
    + GFP_KERNEL);
    if (!peer->inbuf) {
    dev_err(&perf->ntb->dev, "Failed to alloc inbuf of %pa\n",
    &peer->inbuf_size);
    @@ -1554,4 +1555,3 @@ static void __exit perf_exit(void)
    destroy_workqueue(perf_wq);
    }
    module_exit(perf_exit);
    -
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-18 04:31    [W:9.247 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site