From: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
To: agross@kernel.org, david.brown@linaro.org, robh+dt@kernel.org,
mark.rutland@arm.com, mturquette@baylibre.com, sboyd@kernel.org,
jassisinghbrar@gmail.com, ohad@wizery.com,
bjorn.andersson@linaro.org, linux-arm-msm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-clk@vger.kernel.org, linux-remoteproc@vger.kernel.org,
sricharan@codeaurora.org, gokulsri@codeaurora.org
Subject: [PATCH 02/12] remoteproc: qcom: Add secure PIL support
Date: Thu, 11 Jul 2019 21:10:58 +0530 [thread overview]
Message-ID: <1562859668-14209-3-git-send-email-gokulsri@codeaurora.org> (raw)
In-Reply-To: <1562859668-14209-1-git-send-email-gokulsri@codeaurora.org>
IPQ8074 uses secure PIL. Hence, adding the support for the same.
Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
---
drivers/remoteproc/qcom_q6v5_wcss.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
index dc2bae4..8418f57 100644
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
@@ -19,6 +19,7 @@
#include <linux/regulator/consumer.h>
#include <linux/reset.h>
#include <linux/soc/qcom/mdt_loader.h>
+#include <linux/qcom_scm.h>
#include "qcom_common.h"
#include "qcom_q6v5.h"
@@ -83,6 +84,9 @@
#define TCSR_WCSS_CLK_ENABLE 0x14
#define MAX_HALT_REG 3
+
+#define WCNSS_PAS_ID 6
+
enum {
WCSS_IPQ8074,
WCSS_QCS404,
@@ -133,6 +137,7 @@ struct q6v5_wcss {
int crash_reason_smem;
u8 version;
bool requires_force_stop;
+ bool need_mem_protection;
};
struct wcss_data {
@@ -147,6 +152,7 @@ struct wcss_data {
int ssctl_id;
const struct rproc_ops *ops;
bool requires_force_stop;
+ bool need_mem_protection;
};
static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
@@ -246,6 +252,15 @@ static int q6v5_wcss_start(struct rproc *rproc)
qcom_q6v5_prepare(&wcss->q6v5);
+ if (wcss->need_mem_protection) {
+ ret = qcom_scm_pas_auth_and_reset(WCNSS_PAS_ID);
+ if (ret) {
+ dev_err(wcss->dev, "wcss_reset failed\n");
+ return ret;
+ }
+ goto wait_for_reset;
+ }
+
/* Release Q6 and WCSS reset */
ret = reset_control_deassert(wcss->wcss_reset);
if (ret) {
@@ -280,6 +295,7 @@ static int q6v5_wcss_start(struct rproc *rproc)
if (ret)
goto wcss_q6_reset;
+wait_for_reset:
ret = qcom_q6v5_wait_for_start(&wcss->q6v5, 5 * HZ);
if (ret == -ETIMEDOUT)
dev_err(wcss->dev, "start timed out\n");
@@ -688,6 +704,15 @@ static int q6v5_wcss_stop(struct rproc *rproc)
struct q6v5_wcss *wcss = rproc->priv;
int ret;
+ if (wcss->need_mem_protection) {
+ ret = qcom_scm_pas_shutdown(WCNSS_PAS_ID);
+ if (ret) {
+ dev_err(wcss->dev, "not able to shutdown\n");
+ return ret;
+ }
+ goto pas_done;
+ }
+
/* WCSS powerdown */
if (wcss->requires_force_stop) {
ret = qcom_q6v5_request_stop(&wcss->q6v5);
@@ -712,6 +737,7 @@ static int q6v5_wcss_stop(struct rproc *rproc)
return ret;
}
+pas_done:
clk_disable_unprepare(wcss->prng_clk);
qcom_q6v5_unprepare(&wcss->q6v5);
@@ -734,6 +760,12 @@ static int q6v5_wcss_load(struct rproc *rproc, const struct firmware *fw)
{
struct q6v5_wcss *wcss = rproc->priv;
+ if (wcss->need_mem_protection)
+ return qcom_mdt_load(wcss->dev, fw, rproc->firmware,
+ WCNSS_PAS_ID, wcss->mem_region,
+ wcss->mem_phys, wcss->mem_size,
+ &wcss->mem_reloc);
+
return qcom_mdt_load_no_init(wcss->dev, fw, rproc->firmware,
0, wcss->mem_region, wcss->mem_phys,
wcss->mem_size, &wcss->mem_reloc);
@@ -1019,6 +1051,9 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
if (!desc)
return -EINVAL;
+ if (desc->need_mem_protection && !qcom_scm_is_available())
+ return -EPROBE_DEFER;
+
rproc = rproc_alloc(&pdev->dev, pdev->name, desc->ops,
desc->firmware_name, sizeof(*wcss));
if (!rproc) {
@@ -1032,6 +1067,7 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
wcss->version = desc->version;
wcss->requires_force_stop = desc->requires_force_stop;
+ wcss->need_mem_protection = desc->need_mem_protection;
ret = q6v5_wcss_init_mmio(wcss, pdev);
if (ret)
@@ -1099,6 +1135,7 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
.aon_reset_required = true,
.ops = &q6v5_wcss_ipq8074_ops,
.requires_force_stop = true,
+ .need_mem_protection = true,
};
static const struct wcss_data wcss_qcs404_res_init = {
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2019-07-11 15:47 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-11 15:40 [PATCH 00/12] remoteproc: qcom: q6v5-wcss: Add support for secure pil Gokul Sriram Palanisamy
2019-07-11 15:40 ` [PATCH 01/12] remoteproc: qcom: Add PRNG proxy clock Gokul Sriram Palanisamy
2019-07-11 15:40 ` Gokul Sriram Palanisamy [this message]
2019-07-11 15:40 ` [PATCH 03/12] remoteproc: qcom: Add support for split q6 + m3 wlan firmware Gokul Sriram Palanisamy
2019-07-11 15:41 ` [PATCH 04/12] remoteproc: qcom: Add ssr subdevice identifier Gokul Sriram Palanisamy
2019-07-11 15:41 ` [PATCH 05/12] remoteproc: qcom: Update regmap offsets for halt register Gokul Sriram Palanisamy
2019-07-11 15:41 ` [PATCH 06/12] dt-bindings: clock: qcom: Add reset for WCSSAON Gokul Sriram Palanisamy
2019-07-17 20:08 ` Stephen Boyd
2019-07-24 20:37 ` Rob Herring
2019-07-11 15:41 ` [PATCH 07/12] clk: qcom: Add WCSSAON reset Gokul Sriram Palanisamy
2019-07-17 20:09 ` Stephen Boyd
2019-07-11 15:41 ` [PATCH 08/12] dt-bindings: mailbox: qom: Add ipq8074 APPS compatible Gokul Sriram Palanisamy
2019-07-24 20:37 ` Rob Herring
2019-07-11 15:41 ` [PATCH 09/12] mailbox: qcom: Add support for IPQ8074 APCS Gokul Sriram Palanisamy
2019-07-11 15:41 ` [PATCH 10/12] dt-bindings: firmware: qcom: Add compatible for IPQ8074 SoC Gokul Sriram Palanisamy
2019-07-24 20:38 ` Rob Herring
2019-07-11 15:41 ` [PATCH 11/12] arm64: dts: Add support for scm on IPQ8074 SoCs Gokul Sriram Palanisamy
2019-07-11 15:41 ` [PATCH 12/12] arm64: dts: qcom: Enable Q6v5 WCSS for ipq8074 SoC Gokul Sriram Palanisamy
2019-07-17 20:13 ` Stephen Boyd
2019-07-18 6:24 ` gokulsri
2019-07-12 5:43 ` [PATCH 00/12] remoteproc: qcom: q6v5-wcss: Add support for secure pil gokulsri
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=1562859668-14209-3-git-send-email-gokulsri@codeaurora.org \
--to=gokulsri@codeaurora.org \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=david.brown@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=jassisinghbrar@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mturquette@baylibre.com \
--cc=ohad@wizery.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
--cc=sricharan@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).