Merge fd37da76a2 on remote branch

Change-Id: I59ee3f90b6cde3f55b96f5c493dc167aac8c2625

crypto-qti/qcedev.c

@@ -3,7 +3,7 @@
  * QTI CE device driver.
  *
  * Copyright (c) 2010-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/mman.h>
@@ -47,7 +47,7 @@
  * This is temporary, and we can use the 1500 value once the
  * core irqs are enabled.
  */
-#define MAX_OFFLOAD_CRYPTO_WAIT_TIME 20
+#define MAX_OFFLOAD_CRYPTO_WAIT_TIME 50
 
 #define MAX_REQUEST_TIME 5000
 

smcinvoke/smcinvoke.c

@@ -1244,7 +1244,6 @@ static int32_t smcinvoke_map_mem_region_locked(struct smcinvoke_mem_obj* mem_obj
 
 		if (!find_mem_obj_locked(mem_obj->mem_region_id,
 				SMCINVOKE_MEM_RGN_OBJ)) {
-			mutex_unlock(&g_smcinvoke_lock);
 			pr_err("Memory object not found\n");
 			return OBJECT_ERROR_BADOBJ;
 		}