| From d8f74e90a011669cfba3ec9802cb9f6d5d802315 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 4 Nov 2020 12:33:41 +0530 |
| Subject: remoteproc: qcom_q6v5_mss: Replace ioremap with memremap |
| |
| From: Sibi Sankar <sibis@codeaurora.org> |
| |
| [ Upstream commit 04ff5d19cf6e2f9dbdf137c0c6eb44934d46a99c ] |
| |
| 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> |
| --- |
| drivers/remoteproc/qcom_q6v5_mss.c | 12 ++++++------ |
| 1 file changed, 6 insertions(+), 6 deletions(-) |
| |
| diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c |
| index ba6f7551242d..126a9706449a 100644 |
| --- a/drivers/remoteproc/qcom_q6v5_mss.c |
| +++ b/drivers/remoteproc/qcom_q6v5_mss.c |
| @@ -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", |
| @@ -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; |
| } |
| |
| @@ -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; |
| } |
| |
| @@ -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); |
| @@ -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); |
| } |
| -- |
| 2.30.2 |
| |