Commit 157eed91 authored Aug 15, 2019 by Arnd Bergmann

Merge tag 'tee-optee-for-5.4' of...

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>

parents 738590a3 9f02b8f6

drivers/tee/optee/call.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;