All of lore.kernel.org
 help / color / mirror / Atom feed
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 10/17] firmware: qcom_scm-32: Add funcnum IDs
Date: Thu, 12 Dec 2019 18:51:13 +0000	[thread overview]
Message-ID: <0101016efb7363da-a7c086c4-3107-4443-b223-1b8e84f41736-000000@us-west-2.amazonses.com> (raw)
In-Reply-To: <1576176651-17089-1-git-send-email-eberman@codeaurora.org>

Add SCM_LEGACY_FNID macro to qcom_scm-32.

Signed-off-by: Elliot Berman <eberman@codeaurora.org>
---
 drivers/firmware/qcom_scm-32.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/firmware/qcom_scm-32.c b/drivers/firmware/qcom_scm-32.c
index 362d042..fcbe9e0 100644
--- a/drivers/firmware/qcom_scm-32.c
+++ b/drivers/firmware/qcom_scm-32.c
@@ -39,6 +39,8 @@ static struct qcom_scm_entry qcom_scm_wb[] = {
 
 static DEFINE_MUTEX(qcom_scm_lock);
 
+#define SCM_LEGACY_FNID(s, c)	(((s) << 10) | ((c) & 0x3ff))
+
 /**
  * struct scm_legacy_command - one SCM command buffer
  * @len: total available memory for command and response
@@ -168,7 +170,7 @@ static int qcom_scm_call(struct device *dev, u32 svc_id, u32 cmd_id,
 	cmd->buf_offset = cpu_to_le32(sizeof(*cmd));
 	cmd->resp_hdr_offset = cpu_to_le32(sizeof(*cmd) + cmd_len);
 
-	cmd->id = cpu_to_le32((svc_id << 10) | cmd_id);
+	cmd->id = cpu_to_le32(SCM_LEGACY_FNID(svc_id, cmd_id));
 	if (cmd_buf)
 		memcpy(scm_legacy_get_command_buffer(cmd), cmd_buf, cmd_len);
 
@@ -209,7 +211,7 @@ static int qcom_scm_call(struct device *dev, u32 svc_id, u32 cmd_id,
 #define SCM_LEGACY_CLASS_REGISTER		(0x2 << 8)
 #define SCM_LEGACY_MASK_IRQS		BIT(5)
 #define SCM_LEGACY_ATOMIC_ID(svc, cmd, n) \
-				(((((svc) << 10)|((cmd) & 0x3ff)) << 12) | \
+				((SCM_LEGACY_FNID(svc, cmd) << 12) | \
 				SCM_LEGACY_CLASS_REGISTER | \
 				SCM_LEGACY_MASK_IRQS | \
 				(n & 0xf))
@@ -350,7 +352,7 @@ void __qcom_scm_cpu_power_down(u32 flags)
 int __qcom_scm_is_call_available(struct device *dev, u32 svc_id, u32 cmd_id)
 {
 	int ret;
-	__le32 svc_cmd = cpu_to_le32((svc_id << 10) | cmd_id);
+	__le32 svc_cmd = cpu_to_le32(SCM_LEGACY_FNID(svc_id, cmd_id));
 	__le32 ret_val = 0;
 
 	ret = qcom_scm_call(dev, QCOM_SCM_SVC_INFO, QCOM_SCM_INFO_IS_CALL_AVAIL,
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project


  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 ` [PATCH v4 08/17] firmware: qcom_scm-64: Improve SMC convention detection Elliot Berman
2019-12-12 18:51 ` [PATCH v4 06/17] firmware: qcom_scm-64: Add SCM results struct Elliot Berman
2019-12-12 18:51 ` Elliot Berman [this message]
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=0101016efb7363da-a7c086c4-3107-4443-b223-1b8e84f41736-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.