OSDN Git Service

remoteproc: Fix the wrong default value of is_iomem
authorDong Aisheng <aisheng.dong@nxp.com>
Fri, 10 Sep 2021 09:06:17 +0000 (17:06 +0800)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Mon, 27 Sep 2021 23:37:04 +0000 (18:37 -0500)
Currently the is_iomem is a random value in the stack which may
be default to true even on those platforms that not use iomem to
store firmware.

Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Fixes: 40df0a91b2a5 ("remoteproc: add is_iomem to da_to_va")
Reviewed-and-tested-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20210910090621.3073540-3-peng.fan@oss.nxp.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
drivers/remoteproc/remoteproc_coredump.c
drivers/remoteproc/remoteproc_elf_loader.c

index aee657c..c892f43 100644 (file)
@@ -152,8 +152,8 @@ static void rproc_copy_segment(struct rproc *rproc, void *dest,
                               struct rproc_dump_segment *segment,
                               size_t offset, size_t size)
 {
+       bool is_iomem = false;
        void *ptr;
-       bool is_iomem;
 
        if (segment->dump) {
                segment->dump(rproc, segment, dest, offset, size);
index 44e7f93..d635d19 100644 (file)
@@ -178,8 +178,8 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw)
                u64 filesz = elf_phdr_get_p_filesz(class, phdr);
                u64 offset = elf_phdr_get_p_offset(class, phdr);
                u32 type = elf_phdr_get_p_type(class, phdr);
+               bool is_iomem = false;
                void *ptr;
-               bool is_iomem;
 
                if (type != PT_LOAD)
                        continue;