Skip to content

Commit

Permalink
remoteproc: qcom_q6v5_mss: Replace ioremap with memremap
Browse files Browse the repository at this point in the history
[ Upstream commit 04ff5d1 ]

Fix the sparse warnings reported by the kernel test bot by replacing
ioremap calls with memremap.

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Sibi Sankar <sibis@codeaurora.org>
Link: https://lore.kernel.org/r/1604473422-29639-1-git-send-email-sibis@codeaurora.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Sibi Sankar authored and gregkh committed May 19, 2021
1 parent 2d6d5b4 commit 2ec6506
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/remoteproc/qcom_q6v5_mss.c
Expand Up @@ -1182,7 +1182,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc)
goto release_firmware;
}

ptr = ioremap_wc(qproc->mpss_phys + offset, phdr->p_memsz);
ptr = memremap(qproc->mpss_phys + offset, phdr->p_memsz, MEMREMAP_WC);
if (!ptr) {
dev_err(qproc->dev,
"unable to map memory region: %pa+%zx-%x\n",
Expand All @@ -1197,7 +1197,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc)
"failed to load segment %d from truncated file %s\n",
i, fw_name);
ret = -EINVAL;
iounmap(ptr);
memunmap(ptr);
goto release_firmware;
}

Expand All @@ -1209,7 +1209,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc)
ptr, phdr->p_filesz);
if (ret) {
dev_err(qproc->dev, "failed to load %s\n", fw_name);
iounmap(ptr);
memunmap(ptr);
goto release_firmware;
}

Expand All @@ -1220,7 +1220,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc)
memset(ptr + phdr->p_filesz, 0,
phdr->p_memsz - phdr->p_filesz);
}
iounmap(ptr);
memunmap(ptr);
size += phdr->p_memsz;

code_length = readl(qproc->rmb_base + RMB_PMI_CODE_LENGTH_REG);
Expand Down Expand Up @@ -1287,11 +1287,11 @@ static void qcom_q6v5_dump_segment(struct rproc *rproc,
}

if (!ret)
ptr = ioremap_wc(qproc->mpss_phys + offset + cp_offset, size);
ptr = memremap(qproc->mpss_phys + offset + cp_offset, size, MEMREMAP_WC);

if (ptr) {
memcpy(dest, ptr, size);
iounmap(ptr);
memunmap(ptr);
} else {
memset(dest, 0xff, size);
}
Expand Down

0 comments on commit 2ec6506

Please sign in to comment.