leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firmware: qcom_scm-32: Move SMCCC register filling to qcom_scm_call

Browse Source 
Move SMCCC register filling to qcom_scm_call so that __scm_legacy_do
only needs to concern itself with retry mechanism. qcom_scm_call then is
responsible for translating qcom_scm_desc into the complete set of
register arguments and passing onto qcom_scm_call_do.

Tested-by: Brian Masney <masneyb@onstation.org> # arm32
Tested-by: Stephan Gerhold <stephan@gerhold.net>
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
Link: https://lore.kernel.org/r/1578431066-19600-13-git-send-email-eberman@codeaurora.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Elliot Berman 2020-01-07 13:04:21 -08:00 committed by Bjorn Andersson
parent efd2b15c21
commit 590e92809a
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/firmware/qcom_scm-32.c
View File

@ -85,6 +85,14 @@ struct qcom_scm_res {
u64 result[MAX_QCOM_SCM_RETS]; u64 result[MAX_QCOM_SCM_RETS];
}; };
/**
* struct arm_smccc_args
* @args: The array of values used in registers in smc instruction
*/
struct arm_smccc_args {
unsigned long args[8];
};
#define SCM_LEGACY_FNID(s, c) (((s) << 10) | ((c) & 0x3ff)) #define SCM_LEGACY_FNID(s, c) (((s) << 10) | ((c) & 0x3ff))
/** /**
@ -167,16 +175,14 @@ static inline void *scm_legacy_get_response_buffer(
return (void *)rsp + le32_to_cpu(rsp->buf_offset); return (void *)rsp + le32_to_cpu(rsp->buf_offset);
} }
static u32 __scm_legacy_do(u32 cmd_addr) static void __scm_legacy_do(const struct arm_smccc_args *smc,
struct arm_smccc_res *res)
{ {
int context_id;
struct arm_smccc_res res;
do { do {
arm_smccc_smc(1, (unsigned long)&context_id, cmd_addr, arm_smccc_smc(smc->args[0], smc->args[1], smc->args[2],
0, 0, 0, 0, 0, &res); smc->args[3], smc->args[4], smc->args[5],
} while (res.a0 == QCOM_SCM_INTERRUPTED); smc->args[6], smc->args[7], res);
} while (res->a0 == QCOM_SCM_INTERRUPTED);
return res.a0;
} }
/** /**
@ -194,10 +200,12 @@ static int qcom_scm_call(struct device *dev, const struct qcom_scm_desc *desc,
struct qcom_scm_res *res) struct qcom_scm_res *res)
{ {
u8 arglen = desc->arginfo & 0xf; u8 arglen = desc->arginfo & 0xf;
int ret; int ret = 0, context_id;
unsigned int i; unsigned int i;
struct scm_legacy_command *cmd; struct scm_legacy_command *cmd;
struct scm_legacy_response *rsp; struct scm_legacy_response *rsp;
struct arm_smccc_args smc = {0};
struct arm_smccc_res smc_res;
const size_t cmd_len = arglen * sizeof(__le32); const size_t cmd_len = arglen * sizeof(__le32);
const size_t resp_len = MAX_QCOM_SCM_RETS * sizeof(__le32); const size_t resp_len = MAX_QCOM_SCM_RETS * sizeof(__le32);
size_t alloc_len = sizeof(*cmd) + cmd_len + sizeof(*rsp) + resp_len; size_t alloc_len = sizeof(*cmd) + cmd_len + sizeof(*rsp) + resp_len;
@ -226,10 +234,14 @@ static int qcom_scm_call(struct device *dev, const struct qcom_scm_desc *desc,
return -ENOMEM; return -ENOMEM;
} }
smc.args[0] = 1;
smc.args[1] = (unsigned long)&context_id;
smc.args[2] = cmd_phys;
mutex_lock(&qcom_scm_lock); mutex_lock(&qcom_scm_lock);
ret = __scm_legacy_do(cmd_phys); __scm_legacy_do(&smc, &smc_res);
if (ret < 0) if (smc_res.a0)
ret = qcom_scm_remap_error(ret); ret = qcom_scm_remap_error(smc_res.a0);
mutex_unlock(&qcom_scm_lock); mutex_unlock(&qcom_scm_lock);
if (ret) if (ret)
goto out; goto out;