Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7d16434 authored by David Wang's avatar David Wang Committed by Victor Chong
Browse files

BACKPORT: tee: optee: sync with new naming of interrupts 



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

Change-Id: I813558914d5abcd58ebb1a33c7de8f7c25858968
Signed-off-by: default avatarDavid Wang <david.wang@arm.com>
Signed-off-by: default avatarJerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
(cherry picked from commit 39e6519a3f135b143dee4d4fb5ac0438e75454e2)
Signed-off-by: default avatarVictor Chong <victor.chong@linaro.org>
parent 310eb168

drivers/tee/optee/optee_smc.h

+6 −6
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ struct optee_smc_disable_shm_cache_result { 
	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:

 * 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)



/*

 * Deliver an IRQ in normal world.

 * Deliver foreign interrupt to normal world.

 *

 * "Call" register usage:

 * a0	OPTEE_SMC_RETURN_RPC_IRQ

 * a0	OPTEE_SMC_RETURN_RPC_FOREIGN_INTR

 * a1-7	Resume information, must be preserved

 *

 * "Return" register usage:

 * a0	SMC Function ID, OPTEE_SMC_CALL_RETURN_FROM_RPC.

 * a1-7	Preserved

 */

#define OPTEE_SMC_RPC_FUNC_IRQ		4

#define OPTEE_SMC_RETURN_RPC_IRQ \

	OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_IRQ)

#define OPTEE_SMC_RPC_FUNC_FOREIGN_INTR		4

#define OPTEE_SMC_RETURN_RPC_FOREIGN_INTR \

	OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_FOREIGN_INTR)



/*

 * Do an RPC request. The supplied struct optee_msg_arg tells which

drivers/tee/optee/rpc.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

		tee_shm_free(shm);

		break;

	case OPTEE_SMC_RPC_FUNC_IRQ:

	case OPTEE_SMC_RPC_FUNC_FOREIGN_INTR:

		/*

		 * An IRQ was raised while secure world was executing,

		 * since all IRQs are handled in Linux a dummy RPC is

		 * performed to let Linux take the IRQ through the normal

		 * A foreign interrupt was raised while secure world was

		 * executing, since they are handled in Linux a dummy RPC is

		 * performed to let Linux take the interrupt through the normal

		 * vector.

		 */

		break;