Commit 40df0a91 authored by Peng Fan's avatar Peng Fan Committed by Bjorn Andersson
Browse files

remoteproc: add is_iomem to da_to_va 



Introduce an extra parameter is_iomem to da_to_va, then the caller
could take the memory as normal memory or io mapped memory.

Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarPeng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/1615029865-23312-5-git-send-email-peng.fan@oss.nxp.com


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 2cfc056e

drivers/remoteproc/imx_rproc.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static int imx_rproc_da_to_sys(struct imx_rproc *priv, u64 da, 
	return -ENOENT;

}



static void *imx_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len)

static void *imx_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem)

{

	struct imx_rproc *priv = rproc->priv;

	void *va = NULL;

drivers/remoteproc/ingenic_rproc.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static void ingenic_rproc_kick(struct rproc *rproc, int vqid) 
	writel(vqid, vpu->aux_base + REG_CORE_MSG);

}



static void *ingenic_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len)

static void *ingenic_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem)

{

	struct vpu *vpu = rproc->priv;

	void __iomem *va = NULL;

drivers/remoteproc/keystone_remoteproc.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static void keystone_rproc_kick(struct rproc *rproc, int vqid) 
 * can be used either by the remoteproc core for loading (when using kernel

 * remoteproc loader), or by any rpmsg bus drivers.

 */

static void *keystone_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len)

static void *keystone_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem)

{

	struct keystone_rproc *ksproc = rproc->priv;

	void __iomem *va = NULL;

drivers/remoteproc/mtk_scp.c

+3 −3
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static int scp_elf_load_segments(struct rproc *rproc, const struct firmware *fw) 
		}



		/* grab the kernel address for this device address */

		ptr = (void __iomem *)rproc_da_to_va(rproc, da, memsz);

		ptr = (void __iomem *)rproc_da_to_va(rproc, da, memsz, NULL);

		if (!ptr) {

			dev_err(dev, "bad phdr da 0x%x mem 0x%x\n", da, memsz);

			ret = -EINVAL;
@@ -509,7 +509,7 @@ static void *mt8192_scp_da_to_va(struct mtk_scp *scp, u64 da, size_t len) 
	return NULL;

}



static void *scp_da_to_va(struct rproc *rproc, u64 da, size_t len)

static void *scp_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem)

{

	struct mtk_scp *scp = (struct mtk_scp *)rproc->priv;
@@ -627,7 +627,7 @@ void *scp_mapping_dm_addr(struct mtk_scp *scp, u32 mem_addr) 
{

	void *ptr;



	ptr = scp_da_to_va(scp->rproc, mem_addr, 0);

	ptr = scp_da_to_va(scp->rproc, mem_addr, 0, NULL);

	if (!ptr)

		return ERR_PTR(-EINVAL);

drivers/remoteproc/omap_remoteproc.c

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ static int omap_rproc_stop(struct rproc *rproc) 
 * Return: translated virtual address in kernel memory space on success,

 *         or NULL on failure.

 */

static void *omap_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len)

static void *omap_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem)

{

	struct omap_rproc *oproc = rproc->priv;

	int i;