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 348/388] ntb_tool: pass correct struct device to dma_alloc_coherent
    Date
    From: Sanjay R Mehta <sanju.mehta@amd.com>

    [ Upstream commit 433efe720674efd9fdbcef78be75793393cf05db ]

    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: 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_tool.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/ntb/test/ntb_tool.c b/drivers/ntb/test/ntb_tool.c
    index 69da758fe64c..9eaeb221d980 100644
    --- a/drivers/ntb/test/ntb_tool.c
    +++ b/drivers/ntb/test/ntb_tool.c
    @@ -590,7 +590,7 @@ static int tool_setup_mw(struct tool_ctx *tc, int pidx, int widx,
    inmw->size = min_t(resource_size_t, req_size, size);
    inmw->size = round_up(inmw->size, addr_align);
    inmw->size = round_up(inmw->size, size_align);
    - inmw->mm_base = dma_alloc_coherent(&tc->ntb->dev, inmw->size,
    + inmw->mm_base = dma_alloc_coherent(&tc->ntb->pdev->dev, inmw->size,
    &inmw->dma_base, GFP_KERNEL);
    if (!inmw->mm_base)
    return -ENOMEM;
    @@ -612,7 +612,7 @@ static int tool_setup_mw(struct tool_ctx *tc, int pidx, int widx,
    return 0;

    err_free_dma:
    - dma_free_coherent(&tc->ntb->dev, inmw->size, inmw->mm_base,
    + dma_free_coherent(&tc->ntb->pdev->dev, inmw->size, inmw->mm_base,
    inmw->dma_base);
    inmw->mm_base = NULL;
    inmw->dma_base = 0;
    @@ -629,7 +629,7 @@ static void tool_free_mw(struct tool_ctx *tc, int pidx, int widx)

    if (inmw->mm_base != NULL) {
    ntb_mw_clear_trans(tc->ntb, pidx, widx);
    - dma_free_coherent(&tc->ntb->dev, inmw->size,
    + dma_free_coherent(&tc->ntb->pdev->dev, inmw->size,
    inmw->mm_base, inmw->dma_base);
    }

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-18 04:31    [W:4.069 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site