diff options
| author | Vikram Mulukutla <markivx@codeaurora.org> | 2014-08-22 19:26:33 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 10:57:18 -0700 |
| commit | daf2901cea5f219e0fe4bc9c804dae030a987c28 (patch) | |
| tree | 03dd5295e07154fdf362f8a60d773958416a9fe7 | |
| parent | 286a95d6e4c7cc099a39fd708437fa3197f6435d (diff) | |
scsi: ufs-msm: Add support for the new scm_call2 API
The scm library has added support for a new secure world
interface that is more aligned to the ARMv8 SMC calling
convention. Use the new API while maintaining backward
compatibility.
Change-Id: I19b523edb7a849f50916dbbd426c92cc4c459799
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
| -rw-r--r-- | drivers/scsi/ufs/ufs-msm.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/scsi/ufs/ufs-msm.c b/drivers/scsi/ufs/ufs-msm.c index 512926587e81..6e3eb8f44c64 100644 --- a/drivers/scsi/ufs/ufs-msm.c +++ b/drivers/scsi/ufs/ufs-msm.c @@ -1138,7 +1138,7 @@ static int ufs_msm_update_sec_cfg(struct ufs_hba *hba, bool restore_sec_cfg) struct msm_scm_cmd_buf { unsigned int device_id; unsigned int spare; - } cbuf; + } cbuf = {0}; #define RESTORE_SEC_CFG_CMD 0x2 #define UFS_TZ_DEV_ID 19 @@ -1167,11 +1167,7 @@ static int ufs_msm_update_sec_cfg(struct ufs_hba *hba, bool restore_sec_cfg) * out of power collapse. */ cbuf.device_id = UFS_TZ_DEV_ID; - ret = scm_call(SCM_SVC_MP, - RESTORE_SEC_CFG_CMD, - &cbuf, sizeof(cbuf), - &scm_ret, sizeof(scm_ret)); - + ret = scm_restore_sec_cfg(cbuf.device_id, cbuf.spare, &scm_ret); if (ret || scm_ret) { dev_err(hba->dev, "%s: failed, ret %d scm_ret %d\n", __func__, ret, scm_ret); |