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

Commit 959d8a67 authored by Dinesh K Garg's avatar Dinesh K Garg
Browse files

qseecom: handle HW FDE key operations asynchronously 



Key management operations for HW FDE that take long processing time
in secure environment, secure environment will send pending operation
response so that non-secure side can request further processing at a
later time. This would prevent non-secure components from starving for
secure processing time. This would also prevent non-secure WDT to bark.

Change-Id: I823c06b712fcdcecac30d886c6d1aa01ada56bd0
Signed-off-by: default avatarDinesh K Garg <dineshg@codeaurora.org>
parent 925f5828

drivers/misc/qseecom.c

+39 −5
Original line number Diff line number Diff line
@@ -4712,6 +4712,10 @@ static int __qseecom_set_clear_ce_key(struct qseecom_dev_handle *data, 
			resp.result == QSEOS_RESULT_FAIL_MAX_ATTEMPT) {

			pr_debug("Max attempts to input password reached.\n");

			ret = -ERANGE;

		} else if (ret == -EINVAL &&

			resp.result == QSEOS_RESULT_FAIL_PENDING_OPERATION) {

			pr_debug("Set Key operation under processing...\n");

			ret = QSEOS_RESULT_FAIL_PENDING_OPERATION;

		} else {

			pr_err("scm call to set QSEOS_PIPE_ENC key failed : %d\n",

				ret);
@@ -4728,6 +4732,11 @@ static int __qseecom_set_clear_ce_key(struct qseecom_dev_handle *data, 
		if (ret) {

			pr_err("process_incomplete_cmd FAILED, resp.result %d\n",

					resp.result);

			if (resp.result ==

				QSEOS_RESULT_FAIL_PENDING_OPERATION) {

				pr_debug("Set Key operation under processing...\n");

				ret = QSEOS_RESULT_FAIL_PENDING_OPERATION;

			}

			if (resp.result == QSEOS_RESULT_FAIL_MAX_ATTEMPT) {

				pr_debug("Max attempts to input password reached.\n");

				ret = -ERANGE;
@@ -4738,6 +4747,10 @@ static int __qseecom_set_clear_ce_key(struct qseecom_dev_handle *data, 
		pr_debug("Max attempts to input password reached.\n");

		ret = -ERANGE;

		break;

	case QSEOS_RESULT_FAIL_PENDING_OPERATION:

		pr_debug("Set Key operation under processing...\n");

		ret = QSEOS_RESULT_FAIL_PENDING_OPERATION;

		break;

	case QSEOS_RESULT_FAILURE:

	default:

		pr_err("Set key scm call failed resp.result %d\n", resp.result);
@@ -4771,20 +4784,36 @@ static int __qseecom_update_current_key_user_info( 
		ireq, sizeof(struct qseecom_key_userinfo_update_ireq),

		&resp, sizeof(struct qseecom_command_scm_resp));

	if (ret) {

		pr_err("scm call to update key userinfo failed : %d\n", ret);

		if (ret == -EINVAL &&

			resp.result == QSEOS_RESULT_FAIL_PENDING_OPERATION) {

			pr_debug("Set Key operation under processing...\n");

			ret = QSEOS_RESULT_FAIL_PENDING_OPERATION;

		} else {

			pr_err("scm call to update key userinfo failed: %d\n",

									ret);

			__qseecom_disable_clk(CLK_QSEE);

			return -EFAULT;

		}

	}



	switch (resp.result) {

	case QSEOS_RESULT_SUCCESS:

		break;

	case QSEOS_RESULT_INCOMPLETE:

		ret = __qseecom_process_incomplete_cmd(data, &resp);

		if (resp.result ==

			QSEOS_RESULT_FAIL_PENDING_OPERATION) {

			pr_debug("Set Key operation under processing...\n");

			ret = QSEOS_RESULT_FAIL_PENDING_OPERATION;

		}

		if (ret)

			pr_err("process_incomplete_cmd FAILED, resp.result %d\n",

					resp.result);

		break;

	case QSEOS_RESULT_FAIL_PENDING_OPERATION:

		pr_debug("Update Key operation under processing...\n");

		ret = QSEOS_RESULT_FAIL_PENDING_OPERATION;

		break;

	case QSEOS_RESULT_FAILURE:

	default:

		pr_err("Set key scm call failed resp.result %d\n", resp.result);
@@ -4917,9 +4946,11 @@ static int qseecom_create_key(struct qseecom_dev_handle *data, 
		if (qseecom_enable_ice_setup(create_key_req.usage))

			goto free_buf;



		do {

			ret = __qseecom_set_clear_ce_key(data,

					create_key_req.usage,

					&set_key_ireq);

		} while (ret == QSEOS_RESULT_FAIL_PENDING_OPERATION);



		qseecom_disable_ice_setup(create_key_req.usage);
@@ -5079,8 +5110,11 @@ static int qseecom_update_key_user_info(struct qseecom_dev_handle *data, 
	memcpy((void *)ireq.new_hash32,

		(void *)update_key_req.new_hash32, QSEECOM_HASH_SIZE);



	ret = __qseecom_update_current_key_user_info(data, update_key_req.usage,

	do {

		ret = __qseecom_update_current_key_user_info(data,

						update_key_req.usage,

						&ireq);

	} while (ret == QSEOS_RESULT_FAIL_PENDING_OPERATION);

	if (ret) {

		pr_err("Failed to update key info: %d\n", ret);

		return ret;

include/soc/qcom/qseecomi.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#define QSEOS_RESULT_FAIL_KEY_ID_DNE          -70

#define QSEOS_RESULT_FAIL_INCORRECT_PSWD      -71

#define QSEOS_RESULT_FAIL_MAX_ATTEMPT         -72

#define QSEOS_RESULT_FAIL_PENDING_OPERATION   -73



enum qseecom_command_scm_resp_type {

	QSEOS_APP_ID = 0xEE01,