From b0b2892b93ae8223f3cbef733c497029a449cd50 Mon Sep 17 00:00:00 2001
From: Hisping Lin <hisping.lin@rock-chips.com>
Date: Thu, 11 Jan 2024 17:33:30 +0800
Subject: [PATCH] tee: optee: interrupt an RPC depend on shutdown flag

Change-Id: I33f33af02afb75bda5d68c9731fe636bb97132fe
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
---
 drivers/tee/optee/optee_private.h |  1 +
 drivers/tee/optee/smc_abi.c       |  6 ++++++
 drivers/tee/optee/supp.c          | 13 +++++--------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h
index 04ae58892608..c2a9c987092c 100644
--- a/drivers/tee/optee/optee_private.h
+++ b/drivers/tee/optee/optee_private.h
@@ -92,6 +92,7 @@ struct optee_supp {
 	struct list_head reqs;
 	struct idr idr;
 	struct completion reqs_c;
+	bool shutdown;
 };
 
 struct optee_smc {
diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
index e6e0428f8e7b..fd082216f0eb 100644
--- a/drivers/tee/optee/smc_abi.c
+++ b/drivers/tee/optee/smc_abi.c
@@ -7,6 +7,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/arm-smccc.h>
+#include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
@@ -1352,6 +1353,11 @@ static void optee_shutdown(struct platform_device *pdev)
 {
 	struct optee *optee = platform_get_drvdata(pdev);
 
+	/* Tell requesting thread to interrupt an RPC */
+	smp_store_mb(optee->supp.shutdown, true);
+	/* Wait requesting thread to release resources */
+	mdelay(200);
+
 	if (!optee->rpc_param_count)
 		optee_disable_shm_cache(optee);
 }
diff --git a/drivers/tee/optee/supp.c b/drivers/tee/optee/supp.c
index 2d556b79a67e..a8656a72d83a 100644
--- a/drivers/tee/optee/supp.c
+++ b/drivers/tee/optee/supp.c
@@ -82,7 +82,6 @@ u32 optee_supp_thrd_req(struct tee_context *ctx, u32 func, size_t num_params,
 	struct optee_supp_req *req;
 	bool interruptable;
 	u32 ret;
-	unsigned long timeleft;
 	int id;
 	struct optee_supp_req *get_req;
 
@@ -117,14 +116,12 @@ u32 optee_supp_thrd_req(struct tee_context *ctx, u32 func, size_t num_params,
 	 * exclusive access again.
 	 */
 	while (wait_for_completion_interruptible(&req->c)) {
-		pr_err("Warning, Interrupting an RPC to supplicant!\n");
-		timeleft = wait_for_completion_timeout(&req->c, msecs_to_jiffies(2000));
-		if (timeleft) {
-			/* get completion, it means tee-supplicant is alive. */
-			break;
-		} else {
-			/* timeout, it means tee-supplicant is dead, interrupting an RPC. */
+		if (supp->shutdown) {
+			/* Reboot happen, tee-supplicant is dead, interrupt an RPC */
 			interruptable = true;
+		} else {
+			/* Deep sleep, tee-supplicant is freeze, wait tee-supplicant */
+			continue;
 		}
 
 		mutex_lock(&supp->mutex);