diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2018-03-07 11:25:34 +0000 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2018-03-07 11:25:37 +0000 |
| commit | 5a20dffc01e9483dfe8d901d734dc40cd8a0d6c5 (patch) | |
| tree | b35070c2321ef0ef5a2e446484818cc88e1b4957 /drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | |
| parent | 5b3db0f8f1ad5ba2152d977ccd3825ea05e863a2 (diff) | |
| parent | c3f15def2ebe9cc255cf0e5cf32aa171f5b4326d (diff) | |
Merge tag 'upstream/17.11.1' into 17.11.x
Upstream version 17.11.1
Change-Id: Ic4947a43032110f3070932a25db1d80b7abf6705
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'drivers/bus/fslmc/portal/dpaa2_hw_pvt.h')
| -rw-r--r-- | drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h index c1b842f3..ece1a7d4 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h +++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h @@ -284,10 +284,10 @@ static void *dpaa2_mem_ptov(phys_addr_t paddr) int i; for (i = 0; i < RTE_MAX_MEMSEG && memseg[i].addr_64 != 0; i++) { - if (paddr >= memseg[i].phys_addr && - (char *)paddr < (char *)memseg[i].phys_addr + memseg[i].len) + if (paddr >= memseg[i].iova && + (char *)paddr < (char *)memseg[i].iova + memseg[i].len) return (void *)(memseg[i].addr_64 - + (paddr - memseg[i].phys_addr)); + + (paddr - memseg[i].iova)); } return NULL; } @@ -301,7 +301,7 @@ static phys_addr_t dpaa2_mem_vtop(uint64_t vaddr) for (i = 0; i < RTE_MAX_MEMSEG && memseg[i].addr_64 != 0; i++) { if (vaddr >= memseg[i].addr_64 && vaddr < memseg[i].addr_64 + memseg[i].len) - return memseg[i].phys_addr + return memseg[i].iova + (vaddr - memseg[i].addr_64); } return (phys_addr_t)(NULL); |