diff options
| author | Loic Pallardy <loic.pallardy@st.com> | 2018-07-27 15:14:36 +0200 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2018-10-09 22:38:37 -0700 |
| commit | 3bc8140b157c973f3746cc72d31b3fe0fa7a4117 (patch) | |
| tree | 0e815c024a8e63b894e8347bed7f2a5366b02232 /drivers/remoteproc | |
| parent | bbcda30271752bb7490f2e2aef5411dbcae69116 (diff) | |
| download | linux-stable-3bc8140b157c973f3746cc72d31b3fe0fa7a4117.tar.gz linux-stable-3bc8140b157c973f3746cc72d31b3fe0fa7a4117.tar.bz2 linux-stable-3bc8140b157c973f3746cc72d31b3fe0fa7a4117.zip | |
remoteproc: configure IOMMU only if device address requested
If there is no IOMMU associate to remote processor device,
remoteproc_core won't be able to satisfy device address requested
in firmware resource table.
Return an error as configuration won't be coherent.
Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/remoteproc')
| -rw-r--r-- | drivers/remoteproc/remoteproc_core.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index aa6206706fe3..8ca752cbcfe9 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -657,7 +657,15 @@ static int rproc_handle_carveout(struct rproc *rproc, * to use the iommu-based DMA API: we expect 'dma' to contain the * physical address in this case. */ - if (rproc->domain) { + + if (rsc->da != FW_RSC_ADDR_ANY && !rproc->domain) { + dev_err(dev->parent, + "Bad carveout rsc configuration\n"); + ret = -ENOMEM; + goto dma_free; + } + + if (rsc->da != FW_RSC_ADDR_ANY && rproc->domain) { mapping = kzalloc(sizeof(*mapping), GFP_KERNEL); if (!mapping) { ret = -ENOMEM; |