Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.

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>

authored by

David Wang and committed by
Jens Wiklander
39e6519a 059cf566

+10 -10
+6 -6
drivers/tee/optee/optee_smc.h
··· 298 298 OPTEE_SMC_FAST_CALL_VAL(OPTEE_SMC_FUNCID_ENABLE_SHM_CACHE) 299 299 300 300 /* 301 - * Resume from RPC (for example after processing an IRQ) 301 + * Resume from RPC (for example after processing a foreign interrupt) 302 302 * 303 303 * Call register usage: 304 304 * a0 SMC Function ID, OPTEE_SMC_CALL_RETURN_FROM_RPC ··· 383 383 OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_FREE) 384 384 385 385 /* 386 - * Deliver an IRQ in normal world. 386 + * Deliver foreign interrupt to normal world. 387 387 * 388 388 * "Call" register usage: 389 - * a0 OPTEE_SMC_RETURN_RPC_IRQ 389 + * a0 OPTEE_SMC_RETURN_RPC_FOREIGN_INTR 390 390 * a1-7 Resume information, must be preserved 391 391 * 392 392 * "Return" register usage: 393 393 * a0 SMC Function ID, OPTEE_SMC_CALL_RETURN_FROM_RPC. 394 394 * a1-7 Preserved 395 395 */ 396 - #define OPTEE_SMC_RPC_FUNC_IRQ 4 397 - #define OPTEE_SMC_RETURN_RPC_IRQ \ 398 - OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_IRQ) 396 + #define OPTEE_SMC_RPC_FUNC_FOREIGN_INTR 4 397 + #define OPTEE_SMC_RETURN_RPC_FOREIGN_INTR \ 398 + OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_FOREIGN_INTR) 399 399 400 400 /* 401 401 * Do an RPC request. The supplied struct optee_msg_arg tells which
+4 -4
drivers/tee/optee/rpc.c
··· 371 371 shm = reg_pair_to_ptr(param->a1, param->a2); 372 372 tee_shm_free(shm); 373 373 break; 374 - case OPTEE_SMC_RPC_FUNC_IRQ: 374 + case OPTEE_SMC_RPC_FUNC_FOREIGN_INTR: 375 375 /* 376 - * An IRQ was raised while secure world was executing, 377 - * since all IRQs are handled in Linux a dummy RPC is 378 - * performed to let Linux take the IRQ through the normal 376 + * A foreign interrupt was raised while secure world was 377 + * executing, since they are handled in Linux a dummy RPC is 378 + * performed to let Linux take the interrupt through the normal 379 379 * vector. 380 380 */ 381 381 break;