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

Commit 639dd974 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "qseecom: New command IDs for FSM IKE and LTEOTA"

parents 9e042e39 76d6c825

drivers/misc/qseecom.c

+4 −12
Original line number Original line Diff line number Diff line
@@ -2221,18 +2221,10 @@ static int qseecom_send_service_cmd(struct qseecom_dev_handle *data, 
				send_req_ptr))

				send_req_ptr))

			return -EINVAL;

			return -EINVAL;

		break;

		break;

	case QSEOS_FSM_LTE_INIT_DB:

	case QSEOS_FSM_LTEOTA_REQ_CMD:

	case QSEOS_FSM_LTE_STORE_KENB:

	case QSEOS_FSM_LTEOTA_REQ_RSP_CMD:

	case QSEOS_FSM_LTE_GEN_KEYS:

	case QSEOS_FSM_IKE_REQ_CMD:

	case QSEOS_FSM_LTE_GET_KEY_OFFSETS:

	case QSEOS_FSM_IKE_REQ_RSP_CMD:

	case QSEOS_FSM_LTE_GEN_KENB_STAR:

	case QSEOS_FSM_LTE_GET_KENB_STAR:

	case QSEOS_FSM_LTE_STORE_NH:

	case QSEOS_FSM_LTE_DELETE_NH:

	case QSEOS_FSM_LTE_DELETE_KEYS:

	case QSEOS_FSM_IKE_CMD_SIGN:

	case QSEOS_FSM_IKE_CMD_PROV_KEY:

	case QSEOS_FSM_IKE_CMD_ENCRYPT_PRIVATE_KEY:

	case QSEOS_FSM_OEM_FUSE_WRITE_ROW:

	case QSEOS_FSM_OEM_FUSE_WRITE_ROW:

	case QSEOS_FSM_OEM_FUSE_READ_ROW:

	case QSEOS_FSM_OEM_FUSE_READ_ROW:

		send_req_ptr = &send_fsm_key_svc_ireq;

		send_req_ptr = &send_fsm_key_svc_ireq;

include/soc/qcom/qseecomi.h

+4 −12
Original line number Original line Diff line number Diff line
@@ -62,18 +62,10 @@ enum qseecom_qceos_cmd_id { 
	QSEOS_TEE_CLOSE_SESSION,

	QSEOS_TEE_CLOSE_SESSION,

	QSEOS_TEE_REQUEST_CANCELLATION,

	QSEOS_TEE_REQUEST_CANCELLATION,

	QSEOS_CONTINUE_BLOCKED_REQ_COMMAND,

	QSEOS_CONTINUE_BLOCKED_REQ_COMMAND,

	QSEOS_FSM_LTE_INIT_DB = 0x100,

	QSEOS_FSM_LTEOTA_REQ_CMD = 0x109,

	QSEOS_FSM_LTE_STORE_KENB = 0x101,

	QSEOS_FSM_LTEOTA_REQ_RSP_CMD = 0x110,

	QSEOS_FSM_LTE_GEN_KEYS = 0x102,

	QSEOS_FSM_IKE_REQ_CMD = 0x203,

	QSEOS_FSM_LTE_GET_KEY_OFFSETS = 0x103,

	QSEOS_FSM_IKE_REQ_RSP_CMD = 0x204,

	QSEOS_FSM_LTE_GEN_KENB_STAR = 0x104,

	QSEOS_FSM_LTE_GET_KENB_STAR = 0x105,

	QSEOS_FSM_LTE_STORE_NH = 0x106,

	QSEOS_FSM_LTE_DELETE_NH = 0x107,

	QSEOS_FSM_LTE_DELETE_KEYS = 0x108,

	QSEOS_FSM_IKE_CMD_SIGN = 0x200,

	QSEOS_FSM_IKE_CMD_PROV_KEY = 0x201,

	QSEOS_FSM_IKE_CMD_ENCRYPT_PRIVATE_KEY = 0x202,

	QSEOS_FSM_OEM_FUSE_WRITE_ROW = 0x301,

	QSEOS_FSM_OEM_FUSE_WRITE_ROW = 0x301,

	QSEOS_FSM_OEM_FUSE_READ_ROW = 0x302,

	QSEOS_FSM_OEM_FUSE_READ_ROW = 0x302,

	QSEOS_CMD_MAX     = 0xEFFFFFFF

	QSEOS_CMD_MAX     = 0xEFFFFFFF