Add might_sleep() in OP-TEE RPC requests

-----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCgA4FiEEcK3MsDvGvFp6zV9ztbC4QZeP7NMFAl1U/rsaHGplbnMud2lr
 bGFuZGVyQGxpbmFyby5vcmcACgkQtbC4QZeP7NOwIQ//fweaMpjaQstE4jNvoq3m
 LXD03jMgdJiQQfI5qTGuRSUWcUF4ICcTQ/9heRNbCDCrk4eg+uueQmynuB8+C513
 3uKrFSG/S++icaWMRYWmIlZlBoLD+fXIAN+QfgjcVK5g9QZ+ue5GqZVV0IqI9FZ0
 jlmcYXE6NcmP7kL/Xxr+Ml4QGU6xB/3pNzcGbYKRJ58GH5PAPU3mUeEdfQgTZP8A
 bsoJI8Nu92dReW9EQww6VGICS6fry9pKB3aRD3A23M7QFiKLToykKttNozuWGlIB
 /AgXgbwU2rILfUzSq5U+3h5Q6d0ratpNaeAFLNxqo2JD2AbcwqfWY9bAqyUpdjR3
 xNrFVckQCsyjtyi13hYWSfuQk7nZgEkVV9G6EKjLXSJ3fqJ/4jU+Q/3GIHUeJKRP
 DmpZWE63OmdTOdx9tpVZsLgXrJxDk+UMABLP/P0exr7RRR6XTJlO37hNgrRiPMa5
 D3f1q+OJGuSW330k5A3nYq4FAvsdUk4Kl2q5ppZ+aWTsn1+8280+ly2psY2AZ5BS
 zAsR7WoxYlWKPduP281OZ6xHYuR1c36WD4QhOKRfss93C3GmIWtYLcSmV80xGFEO
 HTmbkc19Yy+aVhhBrRQ/ebFFW6cmzl7ORjqEgAgrV0rf8F1rfz2HYoH/nqr3Zm0V
 RU53RGCJcfKeeQpklkIfzV0=
 =NFKN
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2019-08-15 14:29:42 +02:00
commit 157eed91b3

View File

@ -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;