summaryrefslogtreecommitdiffstats
path: root/drivers/remoteproc
diff options
context:
space:
mode:
authorLoic Pallardy <loic.pallardy@st.com>2018-07-27 15:14:37 +0200
committerBjorn Andersson <bjorn.andersson@linaro.org>2018-10-09 22:39:03 -0700
commiteb30596eae947ce9072507a3ca112a9dd4601d85 (patch)
tree6dfa0fce0677db8abd70675a566c624521988cb8 /drivers/remoteproc
parent3bc8140b157c973f3746cc72d31b3fe0fa7a4117 (diff)
downloadlinux-eb30596eae947ce9072507a3ca112a9dd4601d85.tar.gz
linux-eb30596eae947ce9072507a3ca112a9dd4601d85.tar.bz2
linux-eb30596eae947ce9072507a3ca112a9dd4601d85.zip
remoteproc: add rproc_va_to_pa function
This new function translates CPU virtual address in CPU physical one according to virtual address location. Signed-off-by: Loic Pallardy <loic.pallardy@st.com> Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/remoteproc')
-rw-r--r--drivers/remoteproc/remoteproc_core.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 8ca752cbcfe9..ebadaad070a5 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -140,6 +140,22 @@ static void rproc_disable_iommu(struct rproc *rproc)
iommu_domain_free(domain);
}
+static phys_addr_t rproc_va_to_pa(void *cpu_addr)
+{
+ /*
+ * Return physical address according to virtual address location
+ * - in vmalloc: if region ioremapped or defined as dma_alloc_coherent
+ * - in kernel: if region allocated in generic dma memory pool
+ */
+ if (is_vmalloc_addr(cpu_addr)) {
+ return page_to_phys(vmalloc_to_page(cpu_addr)) +
+ offset_in_page(cpu_addr);
+ }
+
+ WARN_ON(!virt_addr_valid(cpu_addr));
+ return virt_to_phys(cpu_addr);
+}
+
/**
* rproc_da_to_va() - lookup the kernel virtual address for a remoteproc address
* @rproc: handle of a remote processor
@@ -711,7 +727,7 @@ static int rproc_handle_carveout(struct rproc *rproc,
* In this case, the device address and the physical address
* are the same.
*/
- rsc->pa = dma;
+ rsc->pa = (u32)rproc_va_to_pa(va);
carveout->va = va;
carveout->len = rsc->len;