Linux-ARM-MSM Archive on lore.kernel.org
 help / color / Atom feed
From: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
To: gokulsri@codeaurora.org, sboyd@kernel.org, agross@kernel.org,
	bjorn.andersson@linaro.org, david.brown@linaro.org,
	devicetree@vger.kernel.org, jassisinghbrar@gmail.com,
	linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org,
	mark.rutland@arm.com, mturquette@baylibre.com, ohad@wizery.com,
	robh+dt@kernel.org, sricharan@codeaurora.org,
	nprakash@codeaurora.org
Subject: [PATCH V2 03/12] remoteproc: qcom: Add support for split q6 + m3 wlan firmware
Date: Fri, 13 Sep 2019 17:26:02 +0530
Message-ID: <1568375771-22933-4-git-send-email-gokulsri@codeaurora.org> (raw)
In-Reply-To: <1568375771-22933-1-git-send-email-gokulsri@codeaurora.org>

IPQ8074 supports split firmware for q6 and m3 as well.
So add support for loading the m3 firmware before q6.
Now the drivers works fine for both split and unified
firmwares.

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 | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
index 8418f57..5957114 100644
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
@@ -138,12 +138,14 @@ struct q6v5_wcss {
 	u8 version;
 	bool requires_force_stop;
 	bool need_mem_protection;
+	const char *m3_firmware_name;
 };
 
 struct wcss_data {
 	int (*init_clock)(struct q6v5_wcss *wcss);
 	int (*init_regulator)(struct q6v5_wcss *wcss);
-	const char *firmware_name;
+	const char *q6_firmware_name;
+	const char *m3_firmware_name;
 	int crash_reason_smem;
 	u8 version;
 	bool aon_reset_required;
@@ -759,7 +761,26 @@ static void *q6v5_wcss_da_to_va(struct rproc *rproc, u64 da, int len)
 static int q6v5_wcss_load(struct rproc *rproc, const struct firmware *fw)
 {
 	struct q6v5_wcss *wcss = rproc->priv;
+	const struct firmware *m3_fw;
+	int ret;
+
+	if (wcss->m3_firmware_name) {
+		ret = request_firmware(&m3_fw, wcss->m3_firmware_name,
+				       wcss->dev);
+		if (ret)
+			goto skip_m3;
+
+		ret = qcom_mdt_load_no_init(wcss->dev, m3_fw,
+					    wcss->m3_firmware_name, 0,
+					    wcss->mem_region, wcss->mem_phys,
+					    wcss->mem_size, &wcss->mem_reloc);
+		if (ret) {
+			dev_err(wcss->dev, "can't load m3_fw.bXX\n");
+			return ret;
+		}
+	}
 
+skip_m3:
 	if (wcss->need_mem_protection)
 		return qcom_mdt_load(wcss->dev, fw, rproc->firmware,
 				     WCNSS_PAS_ID, wcss->mem_region,
@@ -1055,7 +1076,7 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
 		return -EPROBE_DEFER;
 
 	rproc = rproc_alloc(&pdev->dev, pdev->name, desc->ops,
-			    desc->firmware_name, sizeof(*wcss));
+			    desc->q6_firmware_name, sizeof(*wcss));
 	if (!rproc) {
 		dev_err(&pdev->dev, "failed to allocate rproc\n");
 		return -ENOMEM;
@@ -1068,6 +1089,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;
+	wcss->m3_firmware_name = desc->m3_firmware_name;
 
 	ret = q6v5_wcss_init_mmio(wcss, pdev);
 	if (ret)
@@ -1130,7 +1152,8 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
 
 static const struct wcss_data wcss_ipq8074_res_init = {
 	.init_clock = ipq8074_init_clock,
-	.firmware_name = "IPQ8074/q6_fw.mdt",
+	.q6_firmware_name = "IPQ8074/q6_fw.mdt",
+	.m3_firmware_name = "IPQ8074/m3_fw.mdt",
 	.crash_reason_smem = 421,
 	.aon_reset_required = true,
 	.ops = &q6v5_wcss_ipq8074_ops,
@@ -1142,7 +1165,7 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
 	.init_clock = qcs404_init_clock,
 	.init_regulator = qcs404_init_regulator,
 	.crash_reason_smem = 421,
-	.firmware_name = "wcnss.mdt",
+	.q6_firmware_name = "wcnss.mdt",
 	.version = WCSS_QCS404,
 	.aon_reset_required = false,
 	.ssr_name = "mpss",
-- 
1.9.1


  parent reply index

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-13 11:55 [PATCH V2 00/12] remoteproc: qcom: q6v5-wcss: Add support for secure pil Gokul Sriram Palanisamy
2019-09-13 11:56 ` [PATCH V2 01/12] remoteproc: qcom: Add PRNG proxy clock Gokul Sriram Palanisamy
2019-09-13 11:56 ` [PATCH V2 02/12] remoteproc: qcom: Add secure PIL support Gokul Sriram Palanisamy
2019-09-13 11:56 ` Gokul Sriram Palanisamy [this message]
2019-09-13 11:56 ` [PATCH V2 04/12] remoteproc: qcom: Add ssr subdevice identifier Gokul Sriram Palanisamy
2019-09-13 11:56 ` [PATCH V2 05/12] remoteproc: qcom: Update regmap offsets for halt register Gokul Sriram Palanisamy
2019-09-13 11:56 ` [PATCH V2 06/12] dt-bindings: clock: qcom: Add reset for WCSSAON Gokul Sriram Palanisamy
2019-09-13 21:48   ` Rob Herring
2019-09-16 11:49     ` gokulsri
2019-09-17 16:16   ` Stephen Boyd
2019-09-13 11:56 ` [PATCH V2 07/12] clk: qcom: Add WCSSAON reset Gokul Sriram Palanisamy
2019-09-17 16:16   ` Stephen Boyd
2019-09-13 11:56 ` [PATCH V2 08/12] dt-bindings: mailbox: qom: Add ipq8074 APPS compatible Gokul Sriram Palanisamy
2019-09-13 21:48   ` Rob Herring
2019-09-16 11:52     ` gokulsri
2019-09-13 11:56 ` [PATCH V2 09/12] mailbox: qcom: Add support for IPQ8074 APCS Gokul Sriram Palanisamy
2019-09-13 11:56 ` [PATCH V2 10/12] dt-bindings: firmware: qcom: Add compatible for IPQ8074 SoC Gokul Sriram Palanisamy
2019-09-13 21:48   ` Rob Herring
2019-09-17  7:07     ` gokulsri
2019-09-13 11:56 ` [PATCH V2 11/12] arm64: dts: Add support for scm on IPQ8074 SoCs Gokul Sriram Palanisamy
2019-09-13 11:56 ` [PATCH V2 12/12] arm64: dts: qcom: Enable Q6v5 WCSS for ipq8074 SoC Gokul Sriram Palanisamy
2019-09-17 16:15   ` Stephen Boyd
2019-11-27 15:03     ` gokulsri

Reply instructions:

You may reply publically 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=1568375771-22933-4-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=nprakash@codeaurora.org \
    --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

Linux-ARM-MSM Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-arm-msm/0 linux-arm-msm/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-arm-msm linux-arm-msm/ https://lore.kernel.org/linux-arm-msm \
		linux-arm-msm@vger.kernel.org
	public-inbox-index linux-arm-msm

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-arm-msm


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git