diff options
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2020-07-15 22:48:17 -0700 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2020-07-16 21:30:35 -0700 |
| commit | 90ec257c380ebdcebf332b698f3e809cd1157202 (patch) | |
| tree | f66e5aed4ec249a1bbeb845230925a4089bf3423 /drivers/remoteproc/qcom_pil_info.c | |
| parent | 5b435ca38b2ce785b60b4d3c230f0a21121d6728 (diff) | |
| download | lwn-90ec257c380ebdcebf332b698f3e809cd1157202.tar.gz lwn-90ec257c380ebdcebf332b698f3e809cd1157202.zip | |
remoteproc: qcom: pil-info: Fix shift overflow
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")
Tested-by: Nathan Chancellor <natechancellor@gmail.com> # build
Reported-by: Lee Jones <lee.jones@linaro.org>
Reported-by: Nathan Chancellor <natechancellor@gmail.com>
Link: https://lore.kernel.org/r/20200716054817.157608-1-bjorn.andersson@linaro.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/remoteproc/qcom_pil_info.c')
| -rw-r--r-- | drivers/remoteproc/qcom_pil_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ found_unused: 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); |