OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Qualcomm Fixes for 4.17-rc7 

* Fix crash in qcom_scm_call_atomic1()
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJbB4fKAAoJEFKiBbHx2RXVi2oQAOtUfCXwOJLeHuyqmKHfns9Q
 x1CxBLiYTqtrVB2YUGQwYahS8p7kAgNnyMMS3wj4C3LKjxbp3PXrP1FQ2GwRpOFC
 nSWgK/edkL6SYi6Kp2Fz9C7dtcYNeak0NMag5lM1snudYjMQb2o+4+Lk/c1w6GUK
 1EuKKtj9dFUygyXQsSdu4pnT3krDUYBRRp4Xd1chXkQin0A5+3RAtK8Cn+ednMUA
 MrasaWNPKQklvF/2IWrS3v09zgspQujGqVZMMm+PFDoEPj99jIeSf6YB8XEkq8eW
 3vFWxErnHDKiQsskMuqD1w4psDQpUZobKjWSQUgp230jTBWz9eZNlQQGQ8vHsstw
 1Xdv+NHQGZsg8LAL3vXENYfIV81vUJ1lW4Nqm5P/dJg0miByCzPkujSkhIqyafdz
 u4ka68NI1TG3mnSExE7aKmnFgUkpaaq6SDqlWh5V0FRAHHhtxFM3vIXBAuKePOZ6
 4qeGZeSxxbCCMOffN4m3DjiLP6PFn1V3rMVcZjvn3fVWIlCvGXSr1JEKa0FM5NcP
 bkIq1X+W9RAW8PnTRlzt+ns8+/lvmebXG/Cys5X63wkun/IENw1XaYUGfYo8KUS/
 iiB4r89TTif8MlgGI6IXgMic0yKMU8bHl/pcQbE003Pop79ElyhMuGOOCvi5enYS
 Rv+voIZP1ZNY4/SMuu5g
 =ow3B
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2018-05-25 15:00:26 -07:00
parent f2c56aac95 5ec3444c83
commit 0ec46ab642
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/firmware/qcom_scm-32.c
View File

@ -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;