diff options
| author | Bryan Buckley <bryan.buckley@ti.com> | 2012-05-21 15:31:21 -0500 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-10-01 12:58:55 +0200 |
| commit | 73f089529fbc4215605cec1c834f705ea4aedac2 (patch) | |
| tree | 4e197e13dd1dff110c5dc078dc3fa11d5eaed1f0 | |
| parent | 657a59748be8f83e0093fc58c3f9e3f319e77254 (diff) | |
| download | kernel_samsung_tuna-73f089529fbc4215605cec1c834f705ea4aedac2.zip kernel_samsung_tuna-73f089529fbc4215605cec1c834f705ea4aedac2.tar.gz kernel_samsung_tuna-73f089529fbc4215605cec1c834f705ea4aedac2.tar.bz2 | |
SMC: Update UUID to match generic, common secure playback driver
Remove WVDRM prepends as this UUID is now generic.
Change-Id: I8b890d3f8227523635a394c9b02d409d597def8c
Signed-off-by: Bryan Buckley <bryan.buckley@ti.com>
| -rw-r--r-- | security/smc/rproc_drm.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/security/smc/rproc_drm.c b/security/smc/rproc_drm.c index b86b0b8..5ffeb8f 100644 --- a/security/smc/rproc_drm.c +++ b/security/smc/rproc_drm.c @@ -22,13 +22,13 @@ #include "tee_client_api.h" #include "tf_defs.h" -/* 7B1DD682-1077-4939-9755-B6192C5CC5FD */ -#define WVDRM_UUID {0x7B1DD682, 0x1077, 0x4939, \ - {0x97, 0x55, 0xB6, 0x19, 0x2C, 0x5C, 0xC5, 0xFD} } +/*C2537CC3-36F0-48D9-820E-559601478029*/ +#define COMMON_SECURE_DRIVER_UUID {0xC2537CC3, 0x36F0, 0x48D9, \ + {0x82, 0x0E, 0x55, 0x96, 0x01, 0x47, 0x80, 0x29} } -#define WVDRM_ENTER_SECURE_PLAYBACK 0x00003000 +#define ENTER_SECURE_PLAYBACK 0x00003000 -#define WVDRM_EXIT_SECURE_PLAYBACK 0x00003001 +#define EXIT_SECURE_PLAYBACK 0x00003001 enum rproc_drm_s_state { RPROC_DRM_SECURE_LEAVE, @@ -40,7 +40,7 @@ static enum rproc_drm_s_state s_state; static TEEC_Result rproc_drm_initialize(TEEC_Context *teec_context, TEEC_Session *teec_session) { - static const TEEC_UUID drm_uuid = WVDRM_UUID; + static const TEEC_UUID drm_uuid = COMMON_SECURE_DRIVER_UUID; static u32 drm_gid = 1019; TEEC_Result result; @@ -79,8 +79,8 @@ static TEEC_Result _rproc_drm_invoke_secure_service(bool enable) operation.paramTypes = TEEC_PARAM_TYPES(TEEC_NONE, TEEC_NONE, TEEC_NONE, TEEC_NONE); - command = (enable ? WVDRM_ENTER_SECURE_PLAYBACK : - WVDRM_EXIT_SECURE_PLAYBACK); + command = (enable ? ENTER_SECURE_PLAYBACK : + EXIT_SECURE_PLAYBACK); result = TEEC_InvokeCommand(&teec_session, command, &operation, NULL); rproc_drm_finalize(&teec_context, &teec_session); out: |