diff options
Diffstat (limited to 'security/tlk_driver')
-rw-r--r-- | security/tlk_driver/ote_comms.c | 4 | ||||
-rw-r--r-- | security/tlk_driver/ote_device.c | 8 | ||||
-rw-r--r-- | security/tlk_driver/ote_protocol.h | 2 | ||||
-rw-r--r-- | security/tlk_driver/ote_types.h | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/security/tlk_driver/ote_comms.c b/security/tlk_driver/ote_comms.c index 693650c0d566..40a3ec723ce8 100644 --- a/security/tlk_driver/ote_comms.c +++ b/security/tlk_driver/ote_comms.c @@ -291,7 +291,7 @@ void te_open_session(struct te_opensession *cmd, ret = te_setup_temp_buffers(request, context); if (ret != OTE_SUCCESS) { pr_err("te_setup_temp_buffers failed err (0x%x)\n", ret); - SET_RESULT(request, ret, OTE_ERROR_ORIGIN_API); + SET_RESULT(request, ret, OTE_RESULT_ORIGIN_API); return; } @@ -338,7 +338,7 @@ void te_launch_operation(struct te_launchop *cmd, ret = te_setup_temp_buffers(request, context); if (ret != OTE_SUCCESS) { pr_err("te_setup_temp_buffers failed err (0x%x)\n", ret); - SET_RESULT(request, ret, OTE_ERROR_ORIGIN_API); + SET_RESULT(request, ret, OTE_RESULT_ORIGIN_API); return; } diff --git a/security/tlk_driver/ote_device.c b/security/tlk_driver/ote_device.c index 5c5447b89a51..f9b0e5647efd 100644 --- a/security/tlk_driver/ote_device.c +++ b/security/tlk_driver/ote_device.c @@ -32,7 +32,7 @@ #include "ote_protocol.h" -#define SET_ANSWER(a, r, ro) { a.result = r; a.return_origin = ro; } +#define SET_ANSWER(a, r, ro) { a.result = r; a.result_origin = ro; } #define CREATE_TRACE_POINTS #include <trace/events/nvsecurity.h> @@ -293,7 +293,7 @@ static long te_handle_trustedapp_ioctl(struct file *file, if (!cmd_desc || (operation->list_count && !params)) { SET_ANSWER(answer, OTE_ERROR_OUT_OF_MEMORY, - OTE_ERROR_ORIGIN_COMMS); + OTE_RESULT_ORIGIN_COMMS); pr_err("failed to get cmd_desc/params\n"); goto error; } @@ -322,7 +322,7 @@ static long te_handle_trustedapp_ioctl(struct file *file, if (!cmd_desc) { SET_ANSWER(answer, OTE_ERROR_OUT_OF_MEMORY, - OTE_ERROR_ORIGIN_COMMS); + OTE_RESULT_ORIGIN_COMMS); pr_err("failed to get cmd_desc\n"); goto error; } @@ -344,7 +344,7 @@ static long te_handle_trustedapp_ioctl(struct file *file, if (!cmd_desc || (operation->list_count && !params)) { SET_ANSWER(answer, OTE_ERROR_OUT_OF_MEMORY, - OTE_ERROR_ORIGIN_COMMS); + OTE_RESULT_ORIGIN_COMMS); pr_err("failed to get cmd_desc/params\n"); goto error; } diff --git a/security/tlk_driver/ote_protocol.h b/security/tlk_driver/ote_protocol.h index 531406e8b3fb..b471a1812549 100644 --- a/security/tlk_driver/ote_protocol.h +++ b/security/tlk_driver/ote_protocol.h @@ -167,7 +167,7 @@ struct te_request { struct te_answer { uint32_t result; uint32_t session_id; - uint32_t return_origin; + uint32_t result_origin; }; void te_open_session(struct te_opensession *cmd, diff --git a/security/tlk_driver/ote_types.h b/security/tlk_driver/ote_types.h index ef82d4ffec9d..593400f7a03a 100644 --- a/security/tlk_driver/ote_types.h +++ b/security/tlk_driver/ote_types.h @@ -67,13 +67,13 @@ enum { */ enum { /* Originated from OTE Client API */ - OTE_ERROR_ORIGIN_API = 1, + OTE_RESULT_ORIGIN_API = 1, /* Originated from Underlying Communication Stack */ - OTE_ERROR_ORIGIN_COMMS = 2, + OTE_RESULT_ORIGIN_COMMS = 2, /* Originated from Common OTE Code */ - OTE_ERROR_ORIGIN_KERNEL = 3, + OTE_RESULT_ORIGIN_KERNEL = 3, /* Originated from Trusted APP Code */ - OTE_ERROR_ORIGIN_TRUSTED_APP = 4, + OTE_RESULT_ORIGIN_TRUSTED_APP = 4, }; #endif |