* [PATCH] remoteproc: qcom: pil-info: Fix shift overflow
@ 2020-07-16 5:48 Bjorn Andersson
2020-07-17 2:13 ` Nathan Chancellor
2020-07-18 0:20 ` patchwork-bot+linux-remoteproc
0 siblings, 2 replies; 3+ messages in thread
From: Bjorn Andersson @ 2020-07-16 5:48 UTC (permalink / raw)
To: Bjorn Andersson, Ohad Ben-Cohen
Cc: linux-arm-msm, linux-remoteproc, linux-kernel, Lee Jones,
Nathan Chancellor
On platforms with 32-bit phys_addr_t the shift to get the upper word of
the base address of the memory region is invalid. Cast the base to 64
bit to resolv this.
Fixes: 549b67da660d ("remoteproc: qcom: Introduce helper to store pil info in IMEM")
Reported-by: Lee Jones <lee.jones@linaro.org>
Reported-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
drivers/remoteproc/qcom_pil_info.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/remoteproc/qcom_pil_info.c b/drivers/remoteproc/qcom_pil_info.c
index 0536e3904669..5521c4437ffa 100644
--- a/drivers/remoteproc/qcom_pil_info.c
+++ b/drivers/remoteproc/qcom_pil_info.c
@@ -108,7 +108,7 @@ int qcom_pil_info_store(const char *image, phys_addr_t base, size_t size)
found_existing:
/* Use two writel() as base is only aligned to 4 bytes on odd entries */
writel(base, entry + PIL_RELOC_NAME_LEN);
- writel(base >> 32, entry + PIL_RELOC_NAME_LEN + 4);
+ writel((u64)base >> 32, entry + PIL_RELOC_NAME_LEN + 4);
writel(size, entry + PIL_RELOC_NAME_LEN + sizeof(__le64));
mutex_unlock(&pil_reloc_lock);
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] remoteproc: qcom: pil-info: Fix shift overflow
2020-07-16 5:48 [PATCH] remoteproc: qcom: pil-info: Fix shift overflow Bjorn Andersson
@ 2020-07-17 2:13 ` Nathan Chancellor
2020-07-18 0:20 ` patchwork-bot+linux-remoteproc
1 sibling, 0 replies; 3+ messages in thread
From: Nathan Chancellor @ 2020-07-17 2:13 UTC (permalink / raw)
To: Bjorn Andersson
Cc: Ohad Ben-Cohen, linux-arm-msm, linux-remoteproc, linux-kernel, Lee Jones
On Wed, Jul 15, 2020 at 10:48:17PM -0700, Bjorn Andersson wrote:
> On platforms with 32-bit phys_addr_t the shift to get the upper word of
> the base address of the memory region is invalid. Cast the base to 64
> bit to resolv this.
>
> Fixes: 549b67da660d ("remoteproc: qcom: Introduce helper to store pil info in IMEM")
> Reported-by: Lee Jones <lee.jones@linaro.org>
> Reported-by: Nathan Chancellor <natechancellor@gmail.com>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Tested-by: Nathan Chancellor <natechancellor@gmail.com> # build
> ---
> drivers/remoteproc/qcom_pil_info.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/remoteproc/qcom_pil_info.c b/drivers/remoteproc/qcom_pil_info.c
> index 0536e3904669..5521c4437ffa 100644
> --- a/drivers/remoteproc/qcom_pil_info.c
> +++ b/drivers/remoteproc/qcom_pil_info.c
> @@ -108,7 +108,7 @@ int qcom_pil_info_store(const char *image, phys_addr_t base, size_t size)
> found_existing:
> /* Use two writel() as base is only aligned to 4 bytes on odd entries */
> writel(base, entry + PIL_RELOC_NAME_LEN);
> - writel(base >> 32, entry + PIL_RELOC_NAME_LEN + 4);
> + writel((u64)base >> 32, entry + PIL_RELOC_NAME_LEN + 4);
> writel(size, entry + PIL_RELOC_NAME_LEN + sizeof(__le64));
> mutex_unlock(&pil_reloc_lock);
>
> --
> 2.26.2
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] remoteproc: qcom: pil-info: Fix shift overflow
2020-07-16 5:48 [PATCH] remoteproc: qcom: pil-info: Fix shift overflow Bjorn Andersson
2020-07-17 2:13 ` Nathan Chancellor
@ 2020-07-18 0:20 ` patchwork-bot+linux-remoteproc
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+linux-remoteproc @ 2020-07-18 0:20 UTC (permalink / raw)
To: Bjorn Andersson; +Cc: linux-remoteproc
Hello:
This patch was applied to andersson/remoteproc.git (refs/heads/for-next).
On Wed, 15 Jul 2020 22:48:17 -0700 you wrote:
> On platforms with 32-bit phys_addr_t the shift to get the upper word of
> the base address of the memory region is invalid. Cast the base to 64
> bit to resolv this.
>
> Fixes: 549b67da660d ("remoteproc: qcom: Introduce helper to store pil info in IMEM")
> Reported-by: Lee Jones <lee.jones@linaro.org>
> Reported-by: Nathan Chancellor <natechancellor@gmail.com>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
>
> [...]
Here is a summary with links:
- remoteproc: qcom: pil-info: Fix shift overflow
https://git.kernel.org/andersson/remoteproc/c/90ec257c380ebdcebf332b698f3e809cd1157202
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/pwbot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-18 0:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-16 5:48 [PATCH] remoteproc: qcom: pil-info: Fix shift overflow Bjorn Andersson
2020-07-17 2:13 ` Nathan Chancellor
2020-07-18 0:20 ` patchwork-bot+linux-remoteproc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).