bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-04-18 14:53:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '20250911-qcom-tee-using-tee-ss-without-mem-obj-v12-2-17f07a942b8d@oss.qualcomm.com' into drivers-for-6.18

Browse Source 
Merge the addition of support for object invocation into the SCM driver
though a topic branch, to enable sharing this with TEE subsystem.
This commit is contained in:
Bjorn Andersson
2025-09-15 08:43:03 -05:00
parent 3cc9a8cada 4b700098c0
commit 0ea4535429
5 changed files with 199 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
drivers/firmware/qcom/qcom_scm.c
View File

@@ -2097,6 +2097,122 @@ static int qcom_scm_qseecom_init(struct qcom_scm *scm)
#endif /* CONFIG_QCOM_QSEECOM */
/**
* qcom_scm_qtee_invoke_smc() - Invoke a QTEE object.
* @inbuf: start address of memory area used for inbound buffer.
* @inbuf_size: size of the memory area used for inbound buffer.
* @outbuf: start address of memory area used for outbound buffer.
* @outbuf_size: size of the memory area used for outbound buffer.
* @result: result of QTEE object invocation.
* @response_type: response type returned by QTEE.
*
* @response_type determines how the contents of @inbuf and @outbuf
* should be processed.
*
* Return: On success, return 0 or <0 on failure.
*/
int qcom_scm_qtee_invoke_smc(phys_addr_t inbuf, size_t inbuf_size,
phys_addr_t outbuf, size_t outbuf_size,
u64 *result, u64 *response_type)
{
struct qcom_scm_desc desc = {
.svc = QCOM_SCM_SVC_SMCINVOKE,
.cmd = QCOM_SCM_SMCINVOKE_INVOKE,
.owner = ARM_SMCCC_OWNER_TRUSTED_OS,
.args[0] = inbuf,
.args[1] = inbuf_size,
.args[2] = outbuf,
.args[3] = outbuf_size,
.arginfo = QCOM_SCM_ARGS(4, QCOM_SCM_RW, QCOM_SCM_VAL,
QCOM_SCM_RW, QCOM_SCM_VAL),
};
struct qcom_scm_res res;
int ret;
ret = qcom_scm_call(__scm->dev, &desc, &res);
if (ret)
return ret;
if (response_type)
*response_type = res.result[0];
if (result)
*result = res.result[1];
return 0;
}
EXPORT_SYMBOL(qcom_scm_qtee_invoke_smc);
/**
* qcom_scm_qtee_callback_response() - Submit response for callback request.
* @buf: start address of memory area used for outbound buffer.
* @buf_size: size of the memory area used for outbound buffer.
* @result: Result of QTEE object invocation.
* @response_type: Response type returned by QTEE.
*
* @response_type determines how the contents of @buf should be processed.
*
* Return: On success, return 0 or <0 on failure.
*/
int qcom_scm_qtee_callback_response(phys_addr_t buf, size_t buf_size,
u64 *result, u64 *response_type)
{
struct qcom_scm_desc desc = {
.svc = QCOM_SCM_SVC_SMCINVOKE,
.cmd = QCOM_SCM_SMCINVOKE_CB_RSP,
.owner = ARM_SMCCC_OWNER_TRUSTED_OS,
.args[0] = buf,
.args[1] = buf_size,
.arginfo = QCOM_SCM_ARGS(2, QCOM_SCM_RW, QCOM_SCM_VAL),
};
struct qcom_scm_res res;
int ret;
ret = qcom_scm_call(__scm->dev, &desc, &res);
if (ret)
return ret;
if (response_type)
*response_type = res.result[0];
if (result)
*result = res.result[1];
return 0;
}
EXPORT_SYMBOL(qcom_scm_qtee_callback_response);
static void qcom_scm_qtee_free(void *data)
{
struct platform_device *qtee_dev = data;
platform_device_unregister(qtee_dev);
}
static void qcom_scm_qtee_init(struct qcom_scm *scm)
{
struct platform_device *qtee_dev;
u64 result, response_type;
int ret;
/*
* Probe for smcinvoke support. This will fail due to invalid buffers,
* but first, it checks whether the call is supported in QTEE syscall
* handler. If it is not supported, -EIO is returned.
*/
ret = qcom_scm_qtee_invoke_smc(0, 0, 0, 0, &result, &response_type);
if (ret == -EIO)
return;
/* Setup QTEE interface device. */
qtee_dev = platform_device_register_data(scm->dev, "qcomtee",
PLATFORM_DEVID_NONE, NULL, 0);
if (IS_ERR(qtee_dev))
return;
devm_add_action_or_reset(scm->dev, qcom_scm_qtee_free, qtee_dev);
}
/**
* qcom_scm_is_available() - Checks if SCM is available
*/
@@ -2329,6 +2445,9 @@ static int qcom_scm_probe(struct platform_device *pdev)
ret = qcom_scm_qseecom_init(scm);
WARN(ret < 0, "failed to initialize qseecom: %d\n", ret);
/* Initialize the QTEE object interface. */
qcom_scm_qtee_init(scm);
return 0;
}