ntb_perf: pass correct struct device to dma_alloc_coherent

[ 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>

diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c
index 80508da3c8b5cbe9f6f7aaf3ba9a043da1b10a84..2ee41b988c5dded7b684479ee03e39f4711c8a90 100644 (file)
--- a/drivers/ntb/test/ntb_perf.c
+++ b/drivers/ntb/test/ntb_perf.c
@@ -559,7 +559,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;
 }
@@ -588,8 +588,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);
@@ -1512,4 +1513,3 @@ static void __exit perf_exit(void)
        destroy_workqueue(perf_wq);
 }
 module_exit(perf_exit);
-