From: Vivek Gautam <vivek.gautam@codeaurora.org>
To: joro@8bytes.org, robh+dt@kernel.org, mark.rutland@arm.com,
robin.murphy@arm.com, will.deacon@arm.com,
iommu@lists.linux-foundation.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: rjw@rjwysocki.net, robdclark@gmail.com, sboyd@codeaurora.org,
sricharan@codeaurora.org, m.szyprowski@samsung.com,
architt@codeaurora.org, lukas@wunner.de, tfiga@chromium.org,
linux-arm-msm@vger.kernel.org, vivek.gautam@codeaurora.org
Subject: [PATCH v11 3/4] iommu/arm-smmu: Add the device_link between masters and smmu
Date: Thu, 22 Mar 2018 15:52:03 +0530 [thread overview]
Message-ID: <20180322102204.14760-4-vivek.gautam@codeaurora.org> (raw)
In-Reply-To: <20180322102204.14760-1-vivek.gautam@codeaurora.org>
From: Sricharan R <sricharan@codeaurora.org>
Finally add the device link between the master device and
smmu, so that the smmu gets runtime enabled/disabled only when the
master needs it. This is done from add_device callback which gets
called once when the master is added to the smmu.
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
---
drivers/iommu/arm-smmu.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 3383c6657857..da50fd979d5f 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1461,8 +1461,20 @@ static int arm_smmu_add_device(struct device *dev)
iommu_device_link(&smmu->iommu, dev);
+ if (pm_runtime_enabled(smmu->dev) &&
+ !device_link_add(dev, smmu->dev,
+ DL_FLAG_PM_RUNTIME | DL_FLAG_AUTOREMOVE)) {
+ dev_err(smmu->dev, "Unable to add link to the consumer %s\n",
+ dev_name(dev));
+ ret = -ENODEV;
+ goto out_unlink;
+ }
+
return 0;
+out_unlink:
+ iommu_device_unlink(&smmu->iommu, dev);
+ arm_smmu_master_free_smes(fwspec);
out_cfg_free:
kfree(cfg);
out_free:
--
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:[~2018-03-22 10:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-22 10:22 [PATCH v11 0/4] iommu/arm-smmu: Add runtime pm/sleep support Vivek Gautam
2018-03-22 10:22 ` [PATCH v11 1/4] iommu/arm-smmu: Add pm_runtime/sleep ops Vivek Gautam
2018-03-22 10:22 ` [PATCH v11 2/4] iommu/arm-smmu: Invoke pm_runtime during probe, add/remove device Vivek Gautam
2018-03-22 10:22 ` Vivek Gautam [this message]
2018-03-22 10:22 ` [PATCH v11 4/4] iommu/arm-smmu: Add support for qcom,smmu-v2 variant Vivek Gautam
2018-04-09 4:22 ` [PATCH v11 0/4] iommu/arm-smmu: Add runtime pm/sleep support Tomasz Figa
2018-05-18 10:14 ` Vivek Gautam
2018-05-21 13:42 ` Robin Murphy
2018-05-30 10:02 ` Vivek Gautam
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=20180322102204.14760-4-vivek.gautam@codeaurora.org \
--to=vivek.gautam@codeaurora.org \
--cc=architt@codeaurora.org \
--cc=devicetree@vger.kernel.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=m.szyprowski@samsung.com \
--cc=mark.rutland@arm.com \
--cc=rjw@rjwysocki.net \
--cc=robdclark@gmail.com \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=sboyd@codeaurora.org \
--cc=sricharan@codeaurora.org \
--cc=tfiga@chromium.org \
--cc=will.deacon@arm.com \
/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).