From: Sricharan R <sricha...@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 <sricha...@codeaurora.org>
Signed-off-by: Vivek Gautam <vivek.gau...@codeaurora.org>
Reviewed-by: Tomasz Figa <tf...@chromium.org>
Cc: Rafael J. Wysocki <r...@rjwysocki.net>
Cc: Lukas Wunner <lu...@wunner.de>
---

 - Change since v11
   * Replaced DL_FLAG_AUTOREMOVE flag with DL_FLAG_AUTOREMOVE_SUPPLIER.

 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 09265e206e2d..916cde4954d2 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_SUPPLIER)) {
+               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

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Reply via email to