All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andy Gross <andy.gross@linaro.org>
To: linux-arm-msm@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
	jilai wang <jilaiw@codeaurora.org>,
	Stephen Boyd <sboyd@codeaurora.org>,
	Andy Gross <andy.gross@linaro.org>,
	Andy Gross <agross@codeaurora.org>
Subject: [Patch v2 3/8] firmware: qcom: scm: Generalize shared error map
Date: Mon, 25 Apr 2016 18:08:40 -0500	[thread overview]
Message-ID: <1461625725-32425-4-git-send-email-andy.gross@linaro.org> (raw)
In-Reply-To: <1461625725-32425-1-git-send-email-andy.gross@linaro.org>

This patch moves the qcom_scm_remap_error function to the include file
where can be used by both the 32 and 64 bit versions of the code.

Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <agross@codeaurora.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
---
 drivers/firmware/qcom_scm-32.c | 17 -----------------
 drivers/firmware/qcom_scm.h    | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/drivers/firmware/qcom_scm-32.c b/drivers/firmware/qcom_scm-32.c
index 0883292..9e3dc2f 100644
--- a/drivers/firmware/qcom_scm-32.c
+++ b/drivers/firmware/qcom_scm-32.c
@@ -168,23 +168,6 @@ static inline void *qcom_scm_get_response_buffer(const struct qcom_scm_response
 	return (void *)rsp + le32_to_cpu(rsp->buf_offset);
 }
 
-static int qcom_scm_remap_error(int err)
-{
-	pr_err("qcom_scm_call failed with error code %d\n", err);
-	switch (err) {
-	case QCOM_SCM_ERROR:
-		return -EIO;
-	case QCOM_SCM_EINVAL_ADDR:
-	case QCOM_SCM_EINVAL_ARG:
-		return -EINVAL;
-	case QCOM_SCM_EOPNOTSUPP:
-		return -EOPNOTSUPP;
-	case QCOM_SCM_ENOMEM:
-		return -ENOMEM;
-	}
-	return -EINVAL;
-}
-
 static u32 smc(u32 cmd_addr)
 {
 	int context_id;
diff --git a/drivers/firmware/qcom_scm.h b/drivers/firmware/qcom_scm.h
index 2cce75c..7dcc733 100644
--- a/drivers/firmware/qcom_scm.h
+++ b/drivers/firmware/qcom_scm.h
@@ -44,4 +44,20 @@ extern int __qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt,
 #define QCOM_SCM_ERROR		-1
 #define QCOM_SCM_INTERRUPTED	1
 
+static inline int qcom_scm_remap_error(int err)
+{
+	switch (err) {
+	case QCOM_SCM_ERROR:
+		return -EIO;
+	case QCOM_SCM_EINVAL_ADDR:
+	case QCOM_SCM_EINVAL_ARG:
+		return -EINVAL;
+	case QCOM_SCM_EOPNOTSUPP:
+		return -EOPNOTSUPP;
+	case QCOM_SCM_ENOMEM:
+		return -ENOMEM;
+	}
+	return -EINVAL;
+}
+
 #endif
-- 
1.9.1

WARNING: multiple messages have this Message-ID (diff)
From: andy.gross@linaro.org (Andy Gross)
To: linux-arm-kernel@lists.infradead.org
Subject: [Patch v2 3/8] firmware: qcom: scm: Generalize shared error map
Date: Mon, 25 Apr 2016 18:08:40 -0500	[thread overview]
Message-ID: <1461625725-32425-4-git-send-email-andy.gross@linaro.org> (raw)
In-Reply-To: <1461625725-32425-1-git-send-email-andy.gross@linaro.org>

This patch moves the qcom_scm_remap_error function to the include file
where can be used by both the 32 and 64 bit versions of the code.

Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <agross@codeaurora.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
---
 drivers/firmware/qcom_scm-32.c | 17 -----------------
 drivers/firmware/qcom_scm.h    | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/drivers/firmware/qcom_scm-32.c b/drivers/firmware/qcom_scm-32.c
index 0883292..9e3dc2f 100644
--- a/drivers/firmware/qcom_scm-32.c
+++ b/drivers/firmware/qcom_scm-32.c
@@ -168,23 +168,6 @@ static inline void *qcom_scm_get_response_buffer(const struct qcom_scm_response
 	return (void *)rsp + le32_to_cpu(rsp->buf_offset);
 }
 
-static int qcom_scm_remap_error(int err)
-{
-	pr_err("qcom_scm_call failed with error code %d\n", err);
-	switch (err) {
-	case QCOM_SCM_ERROR:
-		return -EIO;
-	case QCOM_SCM_EINVAL_ADDR:
-	case QCOM_SCM_EINVAL_ARG:
-		return -EINVAL;
-	case QCOM_SCM_EOPNOTSUPP:
-		return -EOPNOTSUPP;
-	case QCOM_SCM_ENOMEM:
-		return -ENOMEM;
-	}
-	return -EINVAL;
-}
-
 static u32 smc(u32 cmd_addr)
 {
 	int context_id;
diff --git a/drivers/firmware/qcom_scm.h b/drivers/firmware/qcom_scm.h
index 2cce75c..7dcc733 100644
--- a/drivers/firmware/qcom_scm.h
+++ b/drivers/firmware/qcom_scm.h
@@ -44,4 +44,20 @@ extern int __qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt,
 #define QCOM_SCM_ERROR		-1
 #define QCOM_SCM_INTERRUPTED	1
 
+static inline int qcom_scm_remap_error(int err)
+{
+	switch (err) {
+	case QCOM_SCM_ERROR:
+		return -EIO;
+	case QCOM_SCM_EINVAL_ADDR:
+	case QCOM_SCM_EINVAL_ARG:
+		return -EINVAL;
+	case QCOM_SCM_EOPNOTSUPP:
+		return -EOPNOTSUPP;
+	case QCOM_SCM_ENOMEM:
+		return -ENOMEM;
+	}
+	return -EINVAL;
+}
+
 #endif
-- 
1.9.1

  parent reply	other threads:[~2016-04-25 23:08 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-25 23:08 [Patch v2 0/8] Qualcomm SCM Rework Andy Gross
2016-04-25 23:08 ` Andy Gross
2016-04-25 23:08 ` [Patch v2 1/8] dt/bindings: firmware: Add Qualcomm SCM binding Andy Gross
2016-04-25 23:08   ` Andy Gross
2016-04-25 23:08   ` Andy Gross
2016-04-26  1:49   ` Stephen Boyd
2016-04-26  1:49     ` Stephen Boyd
2016-04-26  2:14     ` Andy Gross
2016-04-26  2:14       ` Andy Gross
2016-04-28 20:47       ` Rob Herring
2016-04-28 20:47         ` Rob Herring
2016-04-25 23:08 ` [Patch v2 2/8] firmware: qcom: scm: Convert SCM to platform driver Andy Gross
2016-04-25 23:08   ` Andy Gross
2016-04-26  1:29   ` Stephen Boyd
2016-04-26  1:29     ` Stephen Boyd
2016-04-29 19:25     ` Andy Gross
2016-04-29 19:25       ` Andy Gross
2016-04-25 23:08 ` Andy Gross [this message]
2016-04-25 23:08   ` [Patch v2 3/8] firmware: qcom: scm: Generalize shared error map Andy Gross
2016-04-26  1:29   ` Stephen Boyd
2016-04-26  1:29     ` Stephen Boyd
2016-04-25 23:08 ` [Patch v2 4/8] firmware: qcom: scm: Add memory allocation API Andy Gross
2016-04-25 23:08   ` Andy Gross
2016-04-25 23:08   ` Andy Gross
2016-04-26  1:50   ` Stephen Boyd
2016-04-26  1:50     ` Stephen Boyd
2016-04-25 23:08 ` [Patch v2 5/8] firmware: qcom: scm: Add support for ARM64 SoCs Andy Gross
2016-04-25 23:08   ` Andy Gross
     [not found] ` <1461625725-32425-1-git-send-email-andy.gross-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-25 23:08   ` [Patch v2 6/8] firmware: qcom: scm: Use atomic SCM for cold boot Andy Gross
2016-04-25 23:08     ` Andy Gross
2016-04-25 23:08     ` Andy Gross
2016-04-26  1:44     ` Stephen Boyd
2016-04-26  1:44       ` Stephen Boyd
2016-04-25 23:08   ` [Patch v2 7/8] dts: qcom: apq8084: Add SCM firmware node Andy Gross
2016-04-25 23:08     ` Andy Gross
2016-04-25 23:08     ` Andy Gross
2016-04-25 23:08 ` [Patch v2 8/8] arm64: dts: msm8916: " Andy Gross
2016-04-25 23:08   ` Andy Gross

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=1461625725-32425-4-git-send-email-andy.gross@linaro.org \
    --to=andy.gross@linaro.org \
    --cc=agross@codeaurora.org \
    --cc=devicetree@vger.kernel.org \
    --cc=jilaiw@codeaurora.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sboyd@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.