From: Elliot Berman <eberman@codeaurora.org>
To: bjorn.andersson@linaro.org, agross@kernel.org, swboyd@chromium.org
Cc: Elliot Berman <eberman@codeaurora.org>,
saiprakash.ranjan@codeaurora.org, tsoni@codeaurora.org,
sidgup@codeaurora.org, psodagud@codeaurora.org,
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v4 08/17] firmware: qcom_scm-64: Improve SMC convention detection
Date: Thu, 12 Dec 2019 18:51:12 +0000 [thread overview]
Message-ID: <0101016efb735e6d-94821623-6253-48d9-992c-d268d6961791-000000@us-west-2.amazonses.com> (raw)
In-Reply-To: <1576176651-17089-1-git-send-email-eberman@codeaurora.org>
Improve the calling convention detection to use
__qcom_scm_is_call_available() and not blindly assume 32-bit mode if
the checks fails. BUG() if neither 32-bit or 64-bit mode works.
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
---
drivers/firmware/qcom_scm-64.c | 41 +++++++++++++++++++++++++++--------------
1 file changed, 27 insertions(+), 14 deletions(-)
diff --git a/drivers/firmware/qcom_scm-64.c b/drivers/firmware/qcom_scm-64.c
index 3ae171a..6bc7f69 100644
--- a/drivers/firmware/qcom_scm-64.c
+++ b/drivers/firmware/qcom_scm-64.c
@@ -336,21 +336,34 @@ int __qcom_scm_ocmem_unlock(struct device *dev, uint32_t id, uint32_t offset,
void __qcom_scm_init(void)
{
- u64 cmd;
- struct arm_smccc_res res;
- u32 fnid = SCM_SMC_FNID(QCOM_SCM_SVC_INFO, QCOM_SCM_INFO_IS_CALL_AVAIL);
-
- /* First try a SMC64 call */
- cmd = ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, ARM_SMCCC_SMC_64,
- ARM_SMCCC_OWNER_SIP, fnid);
-
- arm_smccc_smc(cmd, QCOM_SCM_ARGS(1), cmd & (~BIT(ARM_SMCCC_TYPE_SHIFT)),
- 0, 0, 0, 0, 0, &res);
+ struct qcom_scm_desc desc = {
+ .svc = QCOM_SCM_SVC_INFO,
+ .cmd = QCOM_SCM_INFO_IS_CALL_AVAIL,
+ .args[0] = SCM_SMC_FNID(QCOM_SCM_SVC_INFO,
+ QCOM_SCM_INFO_IS_CALL_AVAIL) |
+ (ARM_SMCCC_OWNER_SIP << ARM_SMCCC_OWNER_SHIFT),
+ .arginfo = QCOM_SCM_ARGS(1),
+ .owner = ARM_SMCCC_OWNER_SIP,
+ };
+ struct qcom_scm_res res;
+ int ret;
- if (!res.a0 && res.a1)
- qcom_smccc_convention = ARM_SMCCC_SMC_64;
- else
- qcom_smccc_convention = ARM_SMCCC_SMC_32;
+ qcom_smccc_convention = ARM_SMCCC_SMC_64;
+ // Device isn't required as there is only one argument - no device
+ // needed to dma_map_single to secure world
+ ret = qcom_scm_call_atomic(NULL, &desc, &res);
+ if (!ret && res.result[0] == 1)
+ goto out;
+
+ qcom_smccc_convention = ARM_SMCCC_SMC_32;
+ ret = qcom_scm_call_atomic(NULL, &desc, &res);
+ if (!ret && res.result[0] == 1)
+ goto out;
+
+ qcom_smccc_convention = -1;
+ BUG();
+out:
+ pr_info("QCOM SCM SMC Convention: %lld\n", qcom_smccc_convention);
}
bool __qcom_scm_pas_supported(struct device *dev, u32 peripheral)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2019-12-12 18:52 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1576176651-17089-1-git-send-email-eberman@codeaurora.org>
2019-12-12 18:51 ` [PATCH v4 01/17] firmware: qcom_scm: Rename macros and structures Elliot Berman
2019-12-12 18:51 ` [PATCH v4 02/17] firmware: qcom_scm: Apply consistent naming scheme to command IDs Elliot Berman
2019-12-12 18:51 ` [PATCH v4 04/17] firmware: qcom_scm-64: Make SMC macros less magical Elliot Berman
2019-12-12 18:51 ` [PATCH v4 03/17] firmware: qcom_scm: Remove unused qcom_scm_get_version Elliot Berman
2019-12-12 18:51 ` [PATCH v4 05/17] firmware: qcom_scm-64: Move svc/cmd/owner into qcom_scm_desc Elliot Berman
2019-12-12 18:51 ` Elliot Berman [this message]
2019-12-12 18:51 ` [PATCH v4 06/17] firmware: qcom_scm-64: Add SCM results struct Elliot Berman
2019-12-12 18:51 ` [PATCH v4 10/17] firmware: qcom_scm-32: Add funcnum IDs Elliot Berman
2019-12-12 18:51 ` [PATCH v4 07/17] firmware: qcom_scm-64: Move SMC register filling to qcom_scm_call_smccc Elliot Berman
2019-12-12 18:51 ` [PATCH v4 09/17] firmware: qcom_scm-32: Use SMC arch wrappers Elliot Berman
2019-12-12 18:51 ` [PATCH v4 12/17] firmware: qcom_scm-32: Move SMCCC register filling to qcom_scm_call Elliot Berman
2019-12-12 18:51 ` [PATCH v4 13/17] firmware: qcom_scm-32: Create common legacy atomic call Elliot Berman
2019-12-12 18:51 ` [PATCH v4 11/17] firmware: qcom_scm-32: Use qcom_scm_desc in non-atomic calls Elliot Berman
2019-12-12 18:51 ` [PATCH v4 14/17] firmware: qcom_scm-32: Add device argument to atomic calls Elliot Berman
2019-12-12 18:51 ` [PATCH v4 15/17] firmware: qcom_scm: Order functions, definitions by service/command Elliot Berman
2019-12-12 18:51 ` [PATCH v4 17/17] firmware: qcom_scm: Dynamically support SMCCC and legacy conventions Elliot Berman
2019-12-12 18:51 ` [PATCH v4 16/17] firmware: qcom_scm: Remove thin wrappers Elliot Berman
2020-01-05 11:21 ` Stephan Gerhold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0101016efb735e6d-94821623-6253-48d9-992c-d268d6961791-000000@us-west-2.amazonses.com \
--to=eberman@codeaurora.org \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=psodagud@codeaurora.org \
--cc=saiprakash.ranjan@codeaurora.org \
--cc=sidgup@codeaurora.org \
--cc=swboyd@chromium.org \
--cc=tsoni@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).