linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Vivek Gautam <vivek.gautam-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
To: joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org,
	robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
	robin.murphy-5wv7dgnIgG8@public.gmane.org,
	iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: mark.rutland-5wv7dgnIgG8@public.gmane.org,
	linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	will.deacon-5wv7dgnIgG8@public.gmane.org
Subject: [PATCH v9 2/5] iommu/arm-smmu: Add pm_runtime/sleep ops
Date: Tue, 13 Mar 2018 14:25:31 +0530	[thread overview]
Message-ID: <20180313085534.11650-3-vivek.gautam@codeaurora.org> (raw)
In-Reply-To: <20180313085534.11650-1-vivek.gautam-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>

From: Sricharan R <sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>

The smmu needs to be functional only when the respective
master's using it are active. The device_link feature
helps to track such functional dependencies, so that the
iommu gets powered when the master device enables itself
using pm_runtime. So by adapting the smmu driver for
runtime pm, above said dependency can be addressed.

This patch adds the pm runtime/sleep callbacks to the
driver and also the functions to parse the smmu clocks
from DT and enable them in resume/suspend.

Signed-off-by: Sricharan R <sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
Signed-off-by: Archit Taneja <architt-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
[vivek: Clock rework to request bulk of clocks]
Signed-off-by: Vivek Gautam <vivek.gautam-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
Reviewed-by: Tomasz Figa <tfiga-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
---
 drivers/iommu/arm-smmu.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 69e7c60792a8..d5873d545024 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -48,6 +48,7 @@
 #include <linux/of_iommu.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 
@@ -205,6 +206,8 @@ struct arm_smmu_device {
 	u32				num_global_irqs;
 	u32				num_context_irqs;
 	unsigned int			*irqs;
+	struct clk_bulk_data		*clks;
+	int				num_clks;
 
 	u32				cavium_id_base; /* Specific to Cavium */
 
@@ -1897,10 +1900,12 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
 struct arm_smmu_match_data {
 	enum arm_smmu_arch_version version;
 	enum arm_smmu_implementation model;
+	const char * const *clks;
+	int num_clks;
 };
 
 #define ARM_SMMU_MATCH_DATA(name, ver, imp)	\
-static struct arm_smmu_match_data name = { .version = ver, .model = imp }
+static const struct arm_smmu_match_data name = { .version = ver, .model = imp }
 
 ARM_SMMU_MATCH_DATA(smmu_generic_v1, ARM_SMMU_V1, GENERIC_SMMU);
 ARM_SMMU_MATCH_DATA(smmu_generic_v2, ARM_SMMU_V2, GENERIC_SMMU);
@@ -1919,6 +1924,23 @@ static const struct of_device_id arm_smmu_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, arm_smmu_of_match);
 
+static void arm_smmu_fill_clk_data(struct arm_smmu_device *smmu,
+				   const char * const *clks)
+{
+	int i;
+
+	if (smmu->num_clks < 1)
+		return;
+
+	smmu->clks = devm_kcalloc(smmu->dev, smmu->num_clks,
+				  sizeof(*smmu->clks), GFP_KERNEL);
+	if (!smmu->clks)
+		return;
+
+	for (i = 0; i < smmu->num_clks; i++)
+		smmu->clks[i].id = clks[i];
+}
+
 #ifdef CONFIG_ACPI
 static int acpi_smmu_get_data(u32 model, struct arm_smmu_device *smmu)
 {
@@ -2001,6 +2023,9 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev,
 	data = of_device_get_match_data(dev);
 	smmu->version = data->version;
 	smmu->model = data->model;
+	smmu->num_clks = data->num_clks;
+
+	arm_smmu_fill_clk_data(smmu, data->clks);
 
 	parse_driver_options(smmu);
 
@@ -2099,6 +2124,14 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
 		smmu->irqs[i] = irq;
 	}
 
+	err = devm_clk_bulk_get(smmu->dev, smmu->num_clks, smmu->clks);
+	if (err)
+		return err;
+
+	err = clk_bulk_prepare(smmu->num_clks, smmu->clks);
+	if (err)
+		return err;
+
 	err = arm_smmu_device_cfg_probe(smmu);
 	if (err)
 		return err;
@@ -2181,6 +2214,9 @@ static int arm_smmu_device_remove(struct platform_device *pdev)
 
 	/* Turn the thing off */
 	writel(sCR0_CLIENTPD, ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sCR0);
+
+	clk_bulk_unprepare(smmu->num_clks, smmu->clks);
+
 	return 0;
 }
 
@@ -2197,7 +2233,27 @@ static int __maybe_unused arm_smmu_pm_resume(struct device *dev)
 	return 0;
 }
 
-static SIMPLE_DEV_PM_OPS(arm_smmu_pm_ops, NULL, arm_smmu_pm_resume);
+static int __maybe_unused arm_smmu_runtime_resume(struct device *dev)
+{
+	struct arm_smmu_device *smmu = dev_get_drvdata(dev);
+
+	return clk_bulk_enable(smmu->num_clks, smmu->clks);
+}
+
+static int __maybe_unused arm_smmu_runtime_suspend(struct device *dev)
+{
+	struct arm_smmu_device *smmu = dev_get_drvdata(dev);
+
+	clk_bulk_disable(smmu->num_clks, smmu->clks);
+
+	return 0;
+}
+
+static const struct dev_pm_ops arm_smmu_pm_ops = {
+	SET_SYSTEM_SLEEP_PM_OPS(NULL, arm_smmu_pm_resume)
+	SET_RUNTIME_PM_OPS(arm_smmu_runtime_suspend,
+			   arm_smmu_runtime_resume, NULL)
+};
 
 static struct platform_driver arm_smmu_driver = {
 	.driver	= {
-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

  parent reply	other threads:[~2018-03-13  8:55 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-13  8:55 [PATCH v9 0/5] iommu/arm-smmu: Add runtime pm/sleep support Vivek Gautam
     [not found] ` <20180313085534.11650-1-vivek.gautam-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-03-13  8:55   ` [PATCH v9 1/5] driver core: Find an existing link between two devices Vivek Gautam
2018-03-13  9:40     ` Rafael J. Wysocki
     [not found]       ` <8903307.QazHKW0JrR-yvgW3jdyMHm1GS7QM15AGw@public.gmane.org>
2018-03-13  9:55         ` Vivek Gautam
     [not found]           ` <CAFp+6iE=0PD6fZZVd+bC1Z95Lkt=X-F4YOXz8EtdiXL=jsC1RA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-03-13 12:49             ` Robin Murphy
     [not found]               ` <4eaf2006-ea68-d9e9-a0db-89acec0ea299-5wv7dgnIgG8@public.gmane.org>
2018-03-13 14:39                 ` Vivek Gautam
     [not found]     ` <20180313085534.11650-2-vivek.gautam-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-03-13  9:58       ` Vivek Gautam
2018-03-13 10:15     ` Tomasz Figa
     [not found]       ` <CAAFQd5DXvnjaFw4Ct1Xn90nQZ4F4dLtov0ymG-tycQt5oLNpiQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-03-13 10:34         ` Vivek Gautam
2018-03-13 11:23           ` Tomasz Figa
     [not found]             ` <CAAFQd5A5Rj1KAZjUc5ZUKuKnbkA5Q6aLw9z0H3_kfyBQOOF-gw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-03-14 11:12               ` Rafael J. Wysocki
     [not found]                 ` <2217404.A2W3Iek6du-yvgW3jdyMHm1GS7QM15AGw@public.gmane.org>
2018-03-14 11:50                   ` Tomasz Figa
     [not found]                     ` <CAAFQd5CQXY0Efv+2MC1kTVW5q4eZjJ=gwVaR-LA=3agnSSHzUw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-03-14 11:57                       ` Rafael J. Wysocki
     [not found]                         ` <2705105.V6KYPvoJqj-yvgW3jdyMHm1GS7QM15AGw@public.gmane.org>
2018-03-14 12:14                           ` Robin Murphy
2018-03-14 12:27                             ` Lukas Wunner
     [not found]                               ` <20180314122759.GB19651-JFq808J9C/izQB+pC5nmwQ@public.gmane.org>
2018-03-20  7:56                                 ` Vivek Gautam
2018-03-14 12:23                 ` Lukas Wunner
2018-03-13  8:55   ` Vivek Gautam [this message]
2018-03-13  8:55   ` [PATCH v9 3/5] iommu/arm-smmu: Invoke pm_runtime during probe, add/remove device Vivek Gautam
     [not found]     ` <20180313085534.11650-4-vivek.gautam-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-03-14 17:46       ` Robin Murphy
     [not found]         ` <77ed3675-0af0-b36a-5f76-b920d7a4c8e0-5wv7dgnIgG8@public.gmane.org>
2018-03-15  7:17           ` Tomasz Figa
2018-03-20  9:49           ` Vivek Gautam
2018-03-13  8:55   ` [PATCH v9 4/5] iommu/arm-smmu: Add the device_link between masters and smmu Vivek Gautam
     [not found]     ` <20180313085534.11650-5-vivek.gautam-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-03-14 17:50       ` Robin Murphy
     [not found]         ` <8b427ea2-5c13-4712-13d1-e4c1aed0779e-5wv7dgnIgG8@public.gmane.org>
2018-03-15  6:18           ` Tomasz Figa
     [not found]             ` <CAAFQd5AqERQMLsJNLAsVXox79kZ+ZtpCUuMSutn70FGK-3Q7vw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-03-15 10:44               ` Robin Murphy
2018-03-15  8:57           ` Vivek Gautam
     [not found]             ` <CAFp+6iEFDXKdS_mTgrrpCX2isMAT3XJifRV0FYxV+PFpVGV=2w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-03-15 11:12               ` Robin Murphy
2018-03-13  8:55   ` [PATCH v9 5/5] iommu/arm-smmu: Add support for qcom,smmu-v2 variant Vivek Gautam
     [not found]     ` <61d30fff-1bf8-d2c1-bbe9-f93de836ae77@huawei.com>
     [not found]       ` <7d5af071-ef98-8461-3ce9-e84fc0b3956a@codeaurora.org>
     [not found]         ` <7d5af071-ef98-8461-3ce9-e84fc0b3956a-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-03-28  6:11           ` Yisheng Xie
     [not found]             ` <d97872fe-5e8e-cc27-e385-64cea8ea2458-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2018-04-10 13:14               ` [PATCH v9 5/5] iommu/arm-smmu: Add support for qcom, smmu-v2 variant Tomasz Figa
     [not found]                 ` <CAAFQd5Cj3qaqt8ACabZwN4ZKaNbF9N9suGVaOKD8-kNxgfeeVA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-04-11  1:22                   ` [PATCH v9 5/5] iommu/arm-smmu: Add support for qcom,smmu-v2 variant Yisheng Xie
     [not found]                     ` <65a57964-805b-3a38-71a2-0c383af30539-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2018-04-11  5:15                       ` Vivek Gautam
     [not found]                         ` <ff1c730f-0009-58e5-cf4a-45fe9ab93d1e-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-04-12  1:55                           ` Yisheng Xie

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=20180313085534.11650-3-vivek.gautam@codeaurora.org \
    --to=vivek.gautam-sgv2jx0feol9jmxxk+q4oq@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
    --cc=joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org \
    --cc=linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
    --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=robin.murphy-5wv7dgnIgG8@public.gmane.org \
    --cc=will.deacon-5wv7dgnIgG8@public.gmane.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).