Commit 48cb5b68 authored by Tzung-Bi Shih's avatar Tzung-Bi Shih Committed by Bjorn Andersson
Browse files

remoteproc/mediatek: skip if filesz is 0 



The main purpose of the loop is to load the memory to the SCP SRAM.
If filesz is 0, can go to next program header directly.

We don't need to try to validate the FW binary for those filesz==0
segments.

Reviewed-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarTzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20201116084413.3312631-3-tzungbi@google.com


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

drivers/remoteproc/mtk_scp.c

+6 −6
Original line number Diff line number Diff line
@@ -234,12 +234,14 @@ static int scp_elf_load_segments(struct rproc *rproc, const struct firmware *fw) 
		u32 offset = phdr->p_offset;

		void __iomem *ptr;



		if (phdr->p_type != PT_LOAD)

			continue;



		dev_dbg(dev, "phdr: type %d da 0x%x memsz 0x%x filesz 0x%x\n",

			phdr->p_type, da, memsz, filesz);



		if (phdr->p_type != PT_LOAD)

			continue;

		if (!filesz)

			continue;



		if (filesz > memsz) {

			dev_err(dev, "bad phdr filesz 0x%x memsz 0x%x\n",

				filesz, memsz);
@@ -263,9 +265,7 @@ static int scp_elf_load_segments(struct rproc *rproc, const struct firmware *fw) 
		}



		/* put the segment where the remote processor expects it */

		if (phdr->p_filesz)

			scp_memcpy_aligned(ptr, elf_data + phdr->p_offset,

					   filesz);

		scp_memcpy_aligned(ptr, elf_data + phdr->p_offset, filesz);

	}



	return ret;