linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bhupesh Sharma <bhupesh.sharma@linaro.org>
To: linux-arm-msm@vger.kernel.org, linux-crypto@vger.kernel.org
Cc: bhupesh.sharma@linaro.org, bhupesh.linux@gmail.com,
	linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
	robh+dt@kernel.org, agross@kernel.org,
	herbert@gondor.apana.org.au, davem@davemloft.net,
	Thara Gopinath <thara.gopinath@linaro.org>,
	Bjorn Andersson <bjorn.andersson@linaro.org>
Subject: [PATCH v4 13/20] dma: qcom: bam_dma: Add support to initialize interconnect path
Date: Wed, 13 Oct 2021 16:25:34 +0530	[thread overview]
Message-ID: <20211013105541.68045-14-bhupesh.sharma@linaro.org> (raw)
In-Reply-To: <20211013105541.68045-1-bhupesh.sharma@linaro.org>

From: Thara Gopinath <thara.gopinath@linaro.org>

BAM dma engine associated with certain hardware blocks could require
relevant interconnect pieces be initialized prior to the dma engine
initialization. For e.g. crypto bam dma engine on sm8250. Such requirement
is passed on to the bam dma driver from dt via the "interconnects"
property.  Add support in bam_dma driver to check whether the interconnect
path is accessible/enabled prior to attempting driver intializations.

Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org>
[Make header file inclusion alphabetical]
Signed-off-by: Thara Gopinath <thara.gopinath@linaro.org>
---
 drivers/dma/qcom/bam_dma.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/drivers/dma/qcom/bam_dma.c b/drivers/dma/qcom/bam_dma.c
index c8a77b428b52..fc84ef42507d 100644
--- a/drivers/dma/qcom/bam_dma.c
+++ b/drivers/dma/qcom/bam_dma.c
@@ -26,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/io.h>
 #include <linux/init.h>
+#include <linux/interconnect.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
@@ -392,6 +393,7 @@ struct bam_device {
 	const struct reg_offset_data *layout;
 
 	struct clk *bamclk;
+	struct icc_path *mem_path;
 	int irq;
 
 	/* dma start transaction tasklet */
@@ -1284,9 +1286,18 @@ static int bam_dma_probe(struct platform_device *pdev)
 		return ret;
 	}
 
+	/* Ensure that interconnects are initialized */
+	bdev->mem_path = of_icc_get(bdev->dev, "memory");
+
+	if (IS_ERR(bdev->mem_path)) {
+		ret = PTR_ERR(bdev->mem_path);
+		dev_err(bdev->dev, "failed to acquire icc path %d\n", ret);
+		goto err_disable_clk;
+	}
+
 	ret = bam_init(bdev);
 	if (ret)
-		goto err_disable_clk;
+		goto err_icc_path_put;
 
 	tasklet_setup(&bdev->task, dma_tasklet);
 
@@ -1371,6 +1382,8 @@ static int bam_dma_probe(struct platform_device *pdev)
 		tasklet_kill(&bdev->channels[i].vc.task);
 err_tasklet_kill:
 	tasklet_kill(&bdev->task);
+err_icc_path_put:
+	icc_put(bdev->mem_path);
 err_disable_clk:
 	clk_disable_unprepare(bdev->bamclk);
 
@@ -1406,6 +1419,7 @@ static int bam_dma_remove(struct platform_device *pdev)
 
 	tasklet_kill(&bdev->task);
 
+	icc_put(bdev->mem_path);
 	clk_disable_unprepare(bdev->bamclk);
 
 	return 0;
-- 
2.31.1


  parent reply	other threads:[~2021-10-13 10:59 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-13 10:55 [PATCH v4 00/20] Enable Qualcomm Crypto Engine on sm8250 Bhupesh Sharma
2021-10-13 10:55 ` [PATCH v4 01/20] arm64/dts: qcom: Fix 'dma' & 'qcom,controlled-remotely' nodes in dts Bhupesh Sharma
2021-10-13 10:55 ` [PATCH v4 02/20] arm64/dts: qcom: ipq6018: Remove unused 'qcom,config-pipe-trust-reg' property Bhupesh Sharma
2021-10-13 10:55 ` [PATCH v4 03/20] arm64/dts: qcom: ipq6018: Remove unused 'iface_clk' property from dma-controller node Bhupesh Sharma
2021-10-13 10:55 ` [PATCH v4 04/20] dt-bindings: qcom-bam: Convert binding to YAML Bhupesh Sharma
2021-10-13 12:56   ` Vladimir Zapolskiy
2021-10-13 17:13     ` Bhupesh Sharma
2021-10-13 10:55 ` [PATCH v4 05/20] dt-bindings: qcom-bam: Add 'interconnects' & 'interconnect-names' to optional properties Bhupesh Sharma
2021-10-13 13:03   ` Vladimir Zapolskiy
2021-10-13 17:14     ` Bhupesh Sharma
2021-10-13 18:39   ` Rob Herring
2021-10-14  7:03     ` Bhupesh Sharma
2021-10-24 13:55       ` Bhupesh Sharma
2021-10-13 10:55 ` [PATCH v4 06/20] dt-bindings: qcom-bam: Add 'iommus' " Bhupesh Sharma
2021-10-13 10:55 ` [PATCH v4 07/20] dt-bindings: qcom-qce: Convert bindings to yaml Bhupesh Sharma
2021-10-13 13:05   ` Vladimir Zapolskiy
2021-10-13 17:15     ` Bhupesh Sharma
2021-10-13 10:55 ` [PATCH v4 08/20] dt-bindings: qcom-qce: Add 'interconnects' and move 'clocks' to optional properties Bhupesh Sharma
2021-10-26 19:40   ` Rob Herring
2021-10-13 10:55 ` [PATCH v4 09/20] dt-bindings: qcom-qce: Add 'iommus' " Bhupesh Sharma
2021-10-26 19:40   ` Rob Herring
2021-10-13 10:55 ` [PATCH v4 10/20] arm64/dts: qcom: sdm845: Use RPMH_CE_CLK macro directly Bhupesh Sharma
2021-10-13 10:55 ` [PATCH v4 11/20] dt-bindings: crypto : Add new compatible strings for qcom-qce Bhupesh Sharma
2021-10-18 18:26   ` Rob Herring
2021-10-13 10:55 ` [PATCH v4 12/20] arm64/dts: qcom: Use new compatibles for crypto nodes Bhupesh Sharma
2021-10-13 10:55 ` Bhupesh Sharma [this message]
2021-10-13 19:15   ` [PATCH v4 13/20] dma: qcom: bam_dma: Add support to initialize interconnect path Vladimir Zapolskiy
2021-10-24 13:53     ` Bhupesh Sharma
2021-10-13 10:55 ` [PATCH v4 14/20] crypto: qce: core: " Bhupesh Sharma
2021-10-13 19:19   ` Vladimir Zapolskiy
2021-10-24 13:53     ` Bhupesh Sharma
2021-10-13 10:55 ` [PATCH v4 15/20] crypto: qce: Add new compatibles for qce crypto driver Bhupesh Sharma
2021-10-13 19:22   ` Vladimir Zapolskiy
2021-10-20 14:07   ` Thara Gopinath
2021-10-24 13:52     ` Bhupesh Sharma
2021-10-13 10:55 ` [PATCH v4 16/20] crypto: qce: core: Make clocks optional Bhupesh Sharma
2021-10-13 19:23   ` Vladimir Zapolskiy
2021-10-24 13:34     ` Bhupesh Sharma
2021-10-13 10:55 ` [PATCH v4 17/20] crypto: qce: Print a failure msg in case probe() fails Bhupesh Sharma
2021-10-13 19:26   ` Vladimir Zapolskiy
2021-10-24 13:33     ` Bhupesh Sharma
2021-10-13 10:55 ` [PATCH v4 18/20] crypto: qce: Defer probing if BAM dma channel is not yet initialized Bhupesh Sharma
2021-10-13 20:49   ` Vladimir Zapolskiy
2021-10-14  7:40     ` Bhupesh Sharma
2021-10-14  8:42       ` Vladimir Zapolskiy
2021-10-20 14:10   ` Thara Gopinath
2021-10-24 14:05     ` Bhupesh Sharma
2021-10-13 10:55 ` [PATCH v4 19/20] crypto: qce: Add 'sm8250-qce' compatible string check Bhupesh Sharma
2021-10-20 14:11   ` Thara Gopinath
2021-10-13 10:55 ` [PATCH v4 20/20] arm64/dts: qcom: sm8250: Add dt entries to support crypto engine Bhupesh Sharma
2021-10-20 14:03 ` [PATCH v4 00/20] Enable Qualcomm Crypto Engine on sm8250 Thara Gopinath
2021-10-24 13:58   ` Bhupesh Sharma

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=20211013105541.68045-14-bhupesh.sharma@linaro.org \
    --to=bhupesh.sharma@linaro.org \
    --cc=agross@kernel.org \
    --cc=bhupesh.linux@gmail.com \
    --cc=bjorn.andersson@linaro.org \
    --cc=davem@davemloft.net \
    --cc=devicetree@vger.kernel.org \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    --cc=thara.gopinath@linaro.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).