commit f1420dd7fe8fee5893922e82d7766d6512e4514f
author Jens Wiklander <jens.wiklander@linaro.org> Tue Sep 25 16:40:14 2018 +0200
committer Tom Rini <trini@konsulko.com> Sun Oct 07 10:47:38 2018 -0400
tree f27206b6d3a7f8e3dc5830f7854e8c9feec0c3a7
parent 7f9672ffd51f526ab59cce5019eec3f09663fb17

optee: support routing of rpmb data frames to mmc

Adds support in optee supplicant to route signed (MACed) RPMB frames
from OP-TEE Secure OS to MMC and vice versa to manipulate the RPMB
partition.

Tested-by: Igor Opaniuk <igor.opaniuk@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

drivers/tee/optee/core.c

diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index 726382d..7f870f2 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -315,6 +315,13 @@
 			param.a3 = res.a3;
 			handle_rpc(dev, &param, &page_list);
 		} else {
+			/*
+			 * In case we've accessed RPMB to serve an RPC
+			 * request we need to restore the previously
+			 * selected partition as the caller may expect it
+			 * to remain unchanged.
+			 */
+			optee_suppl_rpmb_release(dev);
 			return call_err_to_res(res.a0);
 		}
 	}
@@ -651,4 +658,5 @@
 	.probe = optee_probe,
 	.ops = &optee_ops,
 	.platdata_auto_alloc_size = sizeof(struct optee_pdata),
+	.priv_auto_alloc_size = sizeof(struct optee_private),
 };