AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

tee: optee: sync with new naming of interrupts

Browse Source 
In the latest changes of optee_os, the interrupts' names are
changed to "native" and "foreign" interrupts.

Signed-off-by: David Wang <david.wang@arm.com>
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
This commit is contained in:
David Wang 2017-02-16 16:43:44 +08:00 committed by Jens Wiklander
parent 059cf566e1
commit 39e6519a3f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/tee/optee/optee_smc.h
View File

@ -298,7 +298,7 @@ struct optee_smc_disable_shm_cache_result {
OPTEE_SMC_FAST_CALL_VAL(OPTEE_SMC_FUNCID_ENABLE_SHM_CACHE) OPTEE_SMC_FAST_CALL_VAL(OPTEE_SMC_FUNCID_ENABLE_SHM_CACHE)
/* /*
* Resume from RPC (for example after processing an IRQ) * Resume from RPC (for example after processing a foreign interrupt)
* *
* Call register usage: * Call register usage:
* a0 SMC Function ID, OPTEE_SMC_CALL_RETURN_FROM_RPC * a0 SMC Function ID, OPTEE_SMC_CALL_RETURN_FROM_RPC
@ -383,19 +383,19 @@ struct optee_smc_disable_shm_cache_result {
OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_FREE) OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_FREE)
/* /*
* Deliver an IRQ in normal world. * Deliver foreign interrupt to normal world.
* *
* "Call" register usage: * "Call" register usage:
* a0 OPTEE_SMC_RETURN_RPC_IRQ * a0 OPTEE_SMC_RETURN_RPC_FOREIGN_INTR
* a1-7 Resume information, must be preserved * a1-7 Resume information, must be preserved
* *
* "Return" register usage: * "Return" register usage:
* a0 SMC Function ID, OPTEE_SMC_CALL_RETURN_FROM_RPC. * a0 SMC Function ID, OPTEE_SMC_CALL_RETURN_FROM_RPC.
* a1-7 Preserved * a1-7 Preserved
*/ */
#define OPTEE_SMC_RPC_FUNC_IRQ 4 #define OPTEE_SMC_RPC_FUNC_FOREIGN_INTR 4
#define OPTEE_SMC_RETURN_RPC_IRQ \ #define OPTEE_SMC_RETURN_RPC_FOREIGN_INTR \
OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_IRQ) OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_FOREIGN_INTR)
/* /*
* Do an RPC request. The supplied struct optee_msg_arg tells which * Do an RPC request. The supplied struct optee_msg_arg tells which

8
drivers/tee/optee/rpc.c
View File

@ -371,11 +371,11 @@ void optee_handle_rpc(struct tee_context *ctx, struct optee_rpc_param *param)
shm = reg_pair_to_ptr(param->a1, param->a2); shm = reg_pair_to_ptr(param->a1, param->a2);
tee_shm_free(shm); tee_shm_free(shm);
break; break;
case OPTEE_SMC_RPC_FUNC_IRQ: case OPTEE_SMC_RPC_FUNC_FOREIGN_INTR:
/* /*
* An IRQ was raised while secure world was executing, * A foreign interrupt was raised while secure world was
* since all IRQs are handled in Linux a dummy RPC is * executing, since they are handled in Linux a dummy RPC is
* performed to let Linux take the IRQ through the normal * performed to let Linux take the interrupt through the normal
* vector. * vector.
*/ */
break; break;