Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ee32ca2 authored by Zhen Kong's avatar Zhen Kong Committed by Gerrit - the friendly Code Review server
Browse files

qseecom: replace scm_call2 with scm_call2_noretry 



To avoid potential EBUSY error from scm_call2() when smcinvoke TA
requests listener and qseecom sends scm_call at the same time, change
to use scm_call2_noretry and release app_access_mutex before msleep.

Change-Id: I57103d3f5667df6ced824e51ba6555f5d6722af3
Signed-off-by: default avatarZhen Kong <zkong@codeaurora.org>
parent f5f31790

drivers/misc/qseecom.c

+62 −33
Original line number Diff line number Diff line
@@ -420,6 +420,29 @@ static int get_qseecom_keymaster_status(char *str) 
}

__setup("androidboot.keymaster=", get_qseecom_keymaster_status);





#define QSEECOM_SCM_EBUSY_WAIT_MS 30

#define QSEECOM_SCM_EBUSY_MAX_RETRY 67



static int __qseecom_scm_call2_locked(uint32_t smc_id, struct scm_desc *desc)

{

	int ret = 0;

	int retry_count = 0;



	do {

		ret = scm_call2_noretry(smc_id, desc);

		if (ret == -EBUSY) {

			mutex_unlock(&app_access_lock);

			msleep(QSEECOM_SCM_EBUSY_WAIT_MS);

			mutex_lock(&app_access_lock);

		}

		if (retry_count == 33)

			pr_warn("secure world has been busy for 1 second!\n");

	} while (ret == -EBUSY &&

			(retry_count++ < QSEECOM_SCM_EBUSY_MAX_RETRY));

	return ret;

}



static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id,

			const void *req_buf, void *resp_buf)

{
@@ -447,7 +470,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
				svc_id, tz_cmd_id);

			return -EINVAL;

		}

		ret = scm_call2(smc_id, &desc);

		ret = __qseecom_scm_call2_locked(smc_id, &desc);

		break;

	}

	case SCM_SVC_ES: {
@@ -470,7 +493,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
			desc.args[0] = p_hash_req->partition_id;

			desc.args[1] = virt_to_phys(tzbuf);

			desc.args[2] = SHA256_DIGEST_LENGTH;

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			kzfree(tzbuf);

			break;

		}
@@ -505,7 +528,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
				desc.args[2] = req_64bit->phy_addr;

			}

			__qseecom_reentrancy_check_if_no_app_blocked(smc_id);

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_APP_SHUTDOWN_COMMAND: {
@@ -515,7 +538,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
			smc_id = TZ_OS_APP_SHUTDOWN_ID;

			desc.arginfo = TZ_OS_APP_SHUTDOWN_ID_PARAM_ID;

			desc.args[0] = req->app_id;

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_APP_LOOKUP_COMMAND: {
@@ -534,7 +557,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
			desc.args[0] = virt_to_phys(tzbuf);

			desc.args[1] = strlen(req->app_name);

			__qseecom_reentrancy_check_if_no_app_blocked(smc_id);

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			kzfree(tzbuf);

			break;

		}
@@ -558,7 +581,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
				desc.args[1] = req_64bit->size;

			}

			__qseecom_reentrancy_check_if_no_app_blocked(smc_id);

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_LOAD_SERV_IMAGE_COMMAND: {
@@ -582,14 +605,14 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
				desc.args[2] = req_64bit->phy_addr;

			}

			__qseecom_reentrancy_check_if_no_app_blocked(smc_id);

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_UNLOAD_SERV_IMAGE_COMMAND: {

			smc_id = TZ_OS_UNLOAD_SERVICES_IMAGE_ID;

			desc.arginfo = TZ_OS_UNLOAD_SERVICES_IMAGE_ID_PARAM_ID;

			__qseecom_reentrancy_check_if_no_app_blocked(smc_id);

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_REGISTER_LISTENER: {
@@ -614,12 +637,12 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
			}

			qseecom.smcinvoke_support = true;

			smc_id = TZ_OS_REGISTER_LISTENER_SMCINVOKE_ID;

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			if (ret == -EIO) {

				/* smcinvoke is not supported */

				qseecom.smcinvoke_support = false;

				smc_id = TZ_OS_REGISTER_LISTENER_ID;

				ret = scm_call2(smc_id, &desc);

				ret = __qseecom_scm_call2_locked(smc_id, &desc);

			}

			break;

		}
@@ -631,7 +654,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
			smc_id = TZ_OS_DEREGISTER_LISTENER_ID;

			desc.arginfo = TZ_OS_DEREGISTER_LISTENER_ID_PARAM_ID;

			desc.args[0] = req->listener_id;

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_LISTENER_DATA_RSP_COMMAND: {
@@ -644,7 +667,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
				TZ_OS_LISTENER_RESPONSE_HANDLER_ID_PARAM_ID;

			desc.args[0] = req->listener_id;

			desc.args[1] = req->status;

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_LISTENER_DATA_RSP_COMMAND_WHITELIST: {
@@ -672,7 +695,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
				desc.args[2] = req_64->sglistinfo_ptr;

				desc.args[3] = req_64->sglistinfo_len;

			}

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_LOAD_EXTERNAL_ELF_COMMAND: {
@@ -694,14 +717,14 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
				desc.args[2] = req_64bit->phy_addr;

			}

			__qseecom_reentrancy_check_if_no_app_blocked(smc_id);

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_UNLOAD_EXTERNAL_ELF_COMMAND: {

			smc_id = TZ_OS_UNLOAD_EXTERNAL_IMAGE_ID;

			desc.arginfo = TZ_OS_UNLOAD_SERVICES_IMAGE_ID_PARAM_ID;

			__qseecom_reentrancy_check_if_no_app_blocked(smc_id);

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

			}
@@ -729,7 +752,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
				desc.args[3] = req_64bit->rsp_ptr;

				desc.args[4] = req_64bit->rsp_len;

			}

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_CLIENT_SEND_DATA_COMMAND_WHITELIST: {
@@ -761,7 +784,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
				desc.args[5] = req_64bit->sglistinfo_ptr;

				desc.args[6] = req_64bit->sglistinfo_len;

			}

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_RPMB_PROVISION_KEY_COMMAND: {
@@ -773,21 +796,21 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
			desc.arginfo = TZ_OS_RPMB_PROVISION_KEY_ID_PARAM_ID;

			desc.args[0] = req->key_type;

			__qseecom_reentrancy_check_if_no_app_blocked(smc_id);

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_RPMB_ERASE_COMMAND: {

			smc_id = TZ_OS_RPMB_ERASE_ID;

			desc.arginfo = TZ_OS_RPMB_ERASE_ID_PARAM_ID;

			__qseecom_reentrancy_check_if_no_app_blocked(smc_id);

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_RPMB_CHECK_PROV_STATUS_COMMAND: {

			smc_id = TZ_OS_RPMB_CHECK_PROV_STATUS_ID;

			desc.arginfo = TZ_OS_RPMB_CHECK_PROV_STATUS_ID_PARAM_ID;

			__qseecom_reentrancy_check_if_no_app_blocked(smc_id);

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_GENERATE_KEY: {
@@ -808,7 +831,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
			desc.args[0] = virt_to_phys(tzbuf);

			desc.args[1] = tzbuflen;

			__qseecom_reentrancy_check_if_no_app_blocked(smc_id);

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			kzfree(tzbuf);

			break;

		}
@@ -830,7 +853,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
			desc.args[0] = virt_to_phys(tzbuf);

			desc.args[1] = tzbuflen;

			__qseecom_reentrancy_check_if_no_app_blocked(smc_id);

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			kzfree(tzbuf);

			break;

		}
@@ -852,7 +875,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
			desc.args[0] = virt_to_phys(tzbuf);

			desc.args[1] = tzbuflen;

			__qseecom_reentrancy_check_if_no_app_blocked(smc_id);

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			kzfree(tzbuf);

			break;

		}
@@ -874,7 +897,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
			desc.args[0] = virt_to_phys(tzbuf);

			desc.args[1] = tzbuflen;

			__qseecom_reentrancy_check_if_no_app_blocked(smc_id);

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			kzfree(tzbuf);

			break;

		}
@@ -900,7 +923,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
				desc.args[3] = req_64bit->resp_ptr;

				desc.args[4] = req_64bit->resp_len;

			}

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_TEE_OPEN_SESSION_WHITELIST: {
@@ -930,7 +953,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
				desc.args[5] = req_64bit->sglistinfo_ptr;

				desc.args[6] = req_64bit->sglistinfo_len;

			}

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_TEE_INVOKE_COMMAND: {
@@ -955,7 +978,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
				desc.args[3] = req_64bit->resp_ptr;

				desc.args[4] = req_64bit->resp_len;

			}

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_TEE_INVOKE_COMMAND_WHITELIST: {
@@ -985,7 +1008,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
				desc.args[5] = req_64bit->sglistinfo_ptr;

				desc.args[6] = req_64bit->sglistinfo_len;

			}

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_TEE_CLOSE_SESSION: {
@@ -1010,7 +1033,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
				desc.args[3] = req_64bit->resp_ptr;

				desc.args[4] = req_64bit->resp_len;

			}

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_TEE_REQUEST_CANCELLATION: {
@@ -1036,7 +1059,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
				desc.args[3] = req_64bit->resp_ptr;

				desc.args[4] = req_64bit->resp_len;

			}

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		case QSEOS_CONTINUE_BLOCKED_REQ_COMMAND: {
@@ -1051,7 +1074,7 @@ static int qseecom_scm_call2(uint32_t svc_id, uint32_t tz_cmd_id, 
			desc.arginfo =

				TZ_OS_CONTINUE_BLOCKED_REQUEST_ID_PARAM_ID;

			desc.args[0] = req->app_or_session_id;

			ret = scm_call2(smc_id, &desc);

			ret = __qseecom_scm_call2_locked(smc_id, &desc);

			break;

		}

		default: {
@@ -6475,7 +6498,7 @@ static int qseecom_mdtp_cipher_dip(void __user *argp) 
		if (ret)

			break;



		ret = scm_call2(TZ_MDTP_CIPHER_DIP_ID, &desc);

		ret = __qseecom_scm_call2_locked(TZ_MDTP_CIPHER_DIP_ID, &desc);



		__qseecom_disable_clk(CLK_QSEE);
@@ -8668,8 +8691,10 @@ static int qseecom_check_whitelist_feature(void) 


	desc.args[0] = FEATURE_ID_WHITELIST;

	desc.arginfo = SCM_ARGS(1);

	ret = scm_call2(SCM_SIP_FNID(SCM_SVC_INFO,

	mutex_lock(&app_access_lock);

	ret = __qseecom_scm_call2_locked(SCM_SIP_FNID(SCM_SVC_INFO,

		GET_FEAT_VERSION_CMD), &desc);

	mutex_unlock(&app_access_lock);

	if (!ret)

		version = desc.ret[0];
@@ -8752,8 +8777,10 @@ static int qseecom_probe(struct platform_device *pdev) 
	qseecom.send_resp_flag = 0;



	qseecom.qsee_version = QSEEE_VERSION_00;

	mutex_lock(&app_access_lock);

	rc = qseecom_scm_call(6, 3, &feature, sizeof(feature),

		&resp, sizeof(resp));

	mutex_unlock(&app_access_lock);

	pr_info("qseecom.qsee_version = 0x%x\n", resp.result);

	if (rc) {

		pr_err("Failed to get QSEE version info %d\n", rc);
@@ -8906,9 +8933,11 @@ static int qseecom_probe(struct platform_device *pdev) 
				rc = -EIO;

				goto exit_deinit_clock;

			}

			mutex_lock(&app_access_lock);

			rc = qseecom_scm_call(SCM_SVC_TZSCHEDULER, 1,

					cmd_buf, cmd_len,

					&resp, sizeof(resp));

			mutex_unlock(&app_access_lock);

			__qseecom_disable_clk(CLK_QSEE);

			if (rc || (resp.result != QSEOS_RESULT_SUCCESS)) {

				pr_err("send secapp reg fail %d resp.res %d\n",