A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 06:09:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

soc: qcom: Migrating to upstream SCM driver in smcinvoke

Browse source 
Migrate the downstream SCM driver calls to the upstream driver
calls.

Change-Id: Idb94438e439a3bd17a95dd846e6d3bd683bab69e
Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org>
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
This commit is contained in:
Siddharth Gupta 2019-10-17 10:57:25 -07:00 • committed by Elliot Berman
commit f278fbe3a9
4 changed files with 97 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

58
drivers/firmware/qcom_scm-smc.c
View file

@ -1774,6 +1774,64 @@ int __qcom_scm_register_qsee_log_buf(struct device *dev, phys_addr_t buf,
return ret ? : desc.res[0];
}
int __qcom_scm_invoke_smc(struct device *dev, phys_addr_t in_buf,
size_t in_buf_size, phys_addr_t out_buf, size_t out_buf_size,
int32_t *result, u64 *response_type, unsigned int *data)
{
int ret;
struct qcom_scm_desc desc = {
.svc = QCOM_SCM_SVC_SMCINVOKE,
.cmd = QCOM_SCM_SMCINVOKE_INVOKE,
.owner = ARM_SMCCC_OWNER_TRUSTED_OS
};
desc.args[0] = in_buf;
desc.args[1] = in_buf_size;
desc.args[2] = out_buf;
desc.args[3] = out_buf_size;
desc.arginfo = QCOM_SCM_ARGS(4, QCOM_SCM_RW, QCOM_SCM_VAL, QCOM_SCM_RW,
QCOM_SCM_VAL);
ret = qcom_scm_call(dev, &desc);
if (result)
*result = desc.res[1];
if (response_type)
*response_type = desc.res[0];
return ret;
}
int __qcom_scm_invoke_callback_response(struct device *dev, phys_addr_t out_buf,
size_t out_buf_size, int32_t *result, u64 *response_type,
unsigned int *data)
{
int ret;
struct qcom_scm_desc desc = {
.svc = QCOM_SCM_SVC_SMCINVOKE,
.cmd = QCOM_SCM_SMCINVOKE_CB_RSP,
.owner = ARM_SMCCC_OWNER_TRUSTED_OS
};
desc.args[0] = out_buf;
desc.args[1] = out_buf_size;
desc.arginfo = QCOM_SCM_ARGS(2, QCOM_SCM_RW, QCOM_SCM_VAL);
ret = qcom_scm_call(dev, &desc);
if (result)
*result = desc.res[1];
if (response_type)
*response_type = desc.res[0];
if (data)
*data = desc.res[2];
return ret;
}
void __qcom_scm_init(void)
{
__query_convention();

17
drivers/firmware/qcom_scm.c
View file

@ -814,6 +814,23 @@ int qcom_scm_register_qsee_log_buf(phys_addr_t buf, size_t len)
}
EXPORT_SYMBOL(qcom_scm_register_qsee_log_buf);
int qcom_scm_invoke_smc(phys_addr_t in_buf, size_t in_buf_size,
phys_addr_t out_buf, size_t out_buf_size, int32_t *result,
u64 *response_type, unsigned int *data)
{
return __qcom_scm_invoke_smc(__scm->dev, in_buf, in_buf_size, out_buf,
out_buf_size, result, response_type, data);
}
EXPORT_SYMBOL(qcom_scm_invoke_smc);
int qcom_scm_invoke_callback_response(phys_addr_t out_buf,
size_t out_buf_size, int32_t *result, u64 *response_type,
unsigned int *data)
{
return __qcom_scm_invoke_callback_response(__scm->dev, out_buf,
out_buf_size, result, response_type, data);
}
/**
* qcom_scm_is_available() - Checks if SCM is available
*/

10
drivers/firmware/qcom_scm.h
View file

@ -218,6 +218,16 @@ extern int __qcom_scm_register_qsee_log_buf(struct device *dev, phys_addr_t buf,
#define QCOM_SCM_ICE_RESTORE_KEY_ID 0x06
extern int __qcom_scm_ice_restore_cfg(struct device *dev);
#define QCOM_SCM_SVC_SMCINVOKE 0x06
#define QCOM_SCM_SMCINVOKE_INVOKE 0x00
#define QCOM_SCM_SMCINVOKE_CB_RSP 0x01
extern int __qcom_scm_invoke_smc(struct device *dev, phys_addr_t in_buf,
size_t in_buf_size, phys_addr_t out_buf, size_t out_buf_size,
int32_t *result, u64 *response_type, unsigned int *data);
extern int __qcom_scm_invoke_callback_response(struct device *dev,
phys_addr_t out_buf, size_t out_buf_size, int32_t *result,
u64 *response_type, unsigned int *data);
extern void __qcom_scm_init(void);
/* common error codes */

12
include/linux/qcom_scm.h
View file

@ -122,6 +122,12 @@ extern int qcom_scm_camera_protect_phy_lanes(bool protect, u64 regmask);
extern int qcom_scm_ice_restore_cfg(void);
extern int qcom_scm_get_tz_log_feat_id(u64 *version);
extern int qcom_scm_register_qsee_log_buf(phys_addr_t buf, size_t len);
extern int qcom_scm_invoke_smc(phys_addr_t in_buf, size_t in_buf_size,
phys_addr_t out_buf, size_t out_buf_size, int32_t *result,
u64 *response_type, unsigned int *data);
extern int qcom_scm_invoke_callback_response(phys_addr_t out_buf,
size_t out_buf_size, int32_t *result, u64 *response_type,
unsigned int *data);
extern bool qcom_scm_is_available(void);
#else
@ -253,6 +259,12 @@ static inline int qcom_scm_get_tz_log_feat_id(u64 *version)
{ return -ENODEV; }
static inline int qcom_scm_register_qsee_log_buf(phys_addr_t buf, size_t len)
{ return -ENODEV; }
static inline int qcom_scm_invoke_smc(phys_addr_t in_buf, size_t in_buf_size,
phys_addr_t out_buf, size_t out_buf_size, int32_t *result,
u64 *request_type, unsigned int *data) { return -ENODEV; }
static inline int qcom_scm_invoke_callback_response(phys_addr_t out_buf,
size_t out_buf_size, int32_t *result, u64 *request_type,
unsigned int *data) { return -ENODEV; }
static inline bool qcom_scm_is_available(void) { return false; }
#endif
#endif