diff options
author | Olof Johansson <olof@lixom.net> | 2018-05-25 15:00:26 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2018-05-25 15:00:26 -0700 |
commit | 0ec46ab6425dfd4592989ca53fb6d8492e5d15dd (patch) | |
tree | eb0769c933882890c29b97a5fee3e151f1d3bbdc | |
parent | f2c56aac9573c1bcb54d5c06f4a0d0f23532aad1 (diff) | |
parent | 5ec3444c8346c922316f4effafa8afc17defda0e (diff) | |
download | linux-0ec46ab6425dfd4592989ca53fb6d8492e5d15dd.tar.gz linux-0ec46ab6425dfd4592989ca53fb6d8492e5d15dd.tar.bz2 linux-0ec46ab6425dfd4592989ca53fb6d8492e5d15dd.zip |
Merge tag 'qcom-fixes-for-4.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into fixes
Qualcomm Fixes for 4.17-rc7
* Fix crash in qcom_scm_call_atomic1()
* tag 'qcom-fixes-for-4.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
firmware: qcom: scm: Fix crash in qcom_scm_call_atomic1()
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | drivers/firmware/qcom_scm-32.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/firmware/qcom_scm-32.c b/drivers/firmware/qcom_scm-32.c index dfbd894d5bb7..4e24e591ae74 100644 --- a/drivers/firmware/qcom_scm-32.c +++ b/drivers/firmware/qcom_scm-32.c @@ -147,7 +147,7 @@ static u32 smc(u32 cmd_addr) "smc #0 @ switch to secure world\n" : "=r" (r0) : "r" (r0), "r" (r1), "r" (r2) - : "r3"); + : "r3", "r12"); } while (r0 == QCOM_SCM_INTERRUPTED); return r0; @@ -263,7 +263,7 @@ static s32 qcom_scm_call_atomic1(u32 svc, u32 cmd, u32 arg1) "smc #0 @ switch to secure world\n" : "=r" (r0) : "r" (r0), "r" (r1), "r" (r2) - : "r3"); + : "r3", "r12"); return r0; } @@ -298,7 +298,7 @@ static s32 qcom_scm_call_atomic2(u32 svc, u32 cmd, u32 arg1, u32 arg2) "smc #0 @ switch to secure world\n" : "=r" (r0) : "r" (r0), "r" (r1), "r" (r2), "r" (r3) - ); + : "r12"); return r0; } @@ -328,7 +328,7 @@ u32 qcom_scm_get_version(void) "smc #0 @ switch to secure world\n" : "=r" (r0), "=r" (r1) : "r" (r0), "r" (r1) - : "r2", "r3"); + : "r2", "r3", "r12"); } while (r0 == QCOM_SCM_INTERRUPTED); version = r1; |