[PATCH 2/2] remoteproc: elf_loader: Use memset_io instead of memset.
From: Pi-Hsun Shih
Date: Mon Jan 21 2019 - 02:34:25 EST
Use memset_io and memcpy_toio instead of memset and memcpy in
rproc_elf_load_segments, since the target ptr may be device memory.
Signed-off-by: Pi-Hsun Shih <pihsun@xxxxxxxxxxxx>
---
This fix issue while trying to load ELF firmware based on
https://lore.kernel.org/patchwork/patch/1033804/, that the memset(...,
0) would use "dc zva" instruction on aarch64, which cause kernel crash
since the target is device memory.
---
drivers/remoteproc/remoteproc_elf_loader.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_elf_loader.c b/drivers/remoteproc/remoteproc_elf_loader.c
index b17d72ec8603bc..17f1815757dc54 100644
--- a/drivers/remoteproc/remoteproc_elf_loader.c
+++ b/drivers/remoteproc/remoteproc_elf_loader.c
@@ -159,7 +159,7 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw)
u32 memsz = phdr->p_memsz;
u32 filesz = phdr->p_filesz;
u32 offset = phdr->p_offset;
- void *ptr;
+ void __iomem *ptr;
if (phdr->p_type != PT_LOAD)
continue;
@@ -191,7 +191,7 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw)
/* put the segment where the remote processor expects it */
if (phdr->p_filesz)
- memcpy(ptr, elf_data + phdr->p_offset, filesz);
+ memcpy_toio(ptr, elf_data + phdr->p_offset, filesz);
/*
* Zero out remaining memory for this segment.
@@ -201,7 +201,7 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw)
* this.
*/
if (memsz > filesz)
- memset(ptr + filesz, 0, memsz - filesz);
+ memset_io(ptr + filesz, 0, memsz - filesz);
}
return ret;
--
2.20.1.321.g9e740568ce-goog