diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-08-15 14:29:42 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-08-15 14:29:43 +0200 |
| commit | 157eed91b374c42eb264157366daf3dabc8bc816 (patch) | |
| tree | 8315c02bd11bd915c450207203d7abea3466ab09 /drivers | |
| parent | 738590a3fe053929815fb71122c2519431807130 (diff) | |
| parent | 9f02b8f61f29f4518581770d57bfffe99b1ea599 (diff) | |
| download | linux-157eed91b374c42eb264157366daf3dabc8bc816.tar.bz2 | |
Merge tag 'tee-optee-for-5.4' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/drivers
Add might_sleep() in OP-TEE RPC requests
* tag 'tee-optee-for-5.4' of git://git.linaro.org/people/jens.wiklander/linux-tee:
tee: optee: add might_sleep for RPC requests
Link: https://lore.kernel.org/r/20190815065659.GA13498@jax
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tee/optee/call.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c index aa942703ae65..13b0269a0abc 100644 --- a/drivers/tee/optee/call.c +++ b/drivers/tee/optee/call.c @@ -148,6 +148,7 @@ u32 optee_do_call_with_arg(struct tee_context *ctx, phys_addr_t parg) */ optee_cq_wait_for_completion(&optee->call_queue, &w); } else if (OPTEE_SMC_RETURN_IS_RPC(res.a0)) { + might_sleep(); param.a0 = res.a0; param.a1 = res.a1; param.a2 = res.a2; |