These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / hwtracing / coresight / coresight-tpiu.c

diff --git a/kernel/drivers/hwtracing/coresight/coresight-tpiu.c b/kernel/drivers/hwtracing/coresight/coresight-tpiu.c
index 3b33af2..7214efd 100644 (file)
--- a/kernel/drivers/hwtracing/coresight/coresight-tpiu.c
+++ b/kernel/drivers/hwtracing/coresight/coresight-tpiu.c
@@ -17,9 +17,10 @@
 #include <linux/io.h>
 #include <linux/err.h>
 #include <linux/slab.h>
-#include <linux/clk.h>
+#include <linux/pm_runtime.h>
 #include <linux/coresight.h>
 #include <linux/amba/bus.h>
+#include <linux/clk.h>
 
 #include "coresight-priv.h"
 
@@ -50,14 +51,14 @@
 /**
  * @base:      memory mapped base address for this component.
  * @dev:       the device entity associated to this component.
+ * @atclk:     optional clock for the core parts of the TPIU.
  * @csdev:     component vitals needed by the framework.
- * @clk:       the clock this component is associated to.
  */
 struct tpiu_drvdata {
        void __iomem            *base;
        struct device           *dev;
+       struct clk              *atclk;
        struct coresight_device *csdev;
-       struct clk              *clk;
 };
 
 static void tpiu_enable_hw(struct tpiu_drvdata *drvdata)
@@ -72,12 +73,8 @@ static void tpiu_enable_hw(struct tpiu_drvdata *drvdata)
 static int tpiu_enable(struct coresight_device *csdev)
 {
        struct tpiu_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
-       int ret;
-
-       ret = clk_prepare_enable(drvdata->clk);
-       if (ret)
-               return ret;
 
+       pm_runtime_get_sync(csdev->dev.parent);
        tpiu_enable_hw(drvdata);
 
        dev_info(drvdata->dev, "TPIU enabled\n");
@@ -101,8 +98,7 @@ static void tpiu_disable(struct coresight_device *csdev)
        struct tpiu_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
 
        tpiu_disable_hw(drvdata);
-
-       clk_disable_unprepare(drvdata->clk);
+       pm_runtime_put(csdev->dev.parent);
 
        dev_info(drvdata->dev, "TPIU disabled\n");
 }
@@ -139,6 +135,12 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id)
                return -ENOMEM;
 
        drvdata->dev = &adev->dev;
+       drvdata->atclk = devm_clk_get(&adev->dev, "atclk"); /* optional */
+       if (!IS_ERR(drvdata->atclk)) {
+               ret = clk_prepare_enable(drvdata->atclk);
+               if (ret)
+                       return ret;
+       }
        dev_set_drvdata(dev, drvdata);
 
        /* Validity for the resource is already checked by the AMBA core */
@@ -148,15 +150,10 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id)
 
        drvdata->base = base;
 
-       drvdata->clk = adev->pclk;
-       ret = clk_prepare_enable(drvdata->clk);
-       if (ret)
-               return ret;
-
        /* Disable tpiu to support older devices */
        tpiu_disable_hw(drvdata);
 
-       clk_disable_unprepare(drvdata->clk);
+       pm_runtime_put(&adev->dev);
 
        desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL);
        if (!desc)
@@ -183,11 +180,41 @@ static int tpiu_remove(struct amba_device *adev)
        return 0;
 }
 
+#ifdef CONFIG_PM
+static int tpiu_runtime_suspend(struct device *dev)
+{
+       struct tpiu_drvdata *drvdata = dev_get_drvdata(dev);
+
+       if (drvdata && !IS_ERR(drvdata->atclk))
+               clk_disable_unprepare(drvdata->atclk);
+
+       return 0;
+}
+
+static int tpiu_runtime_resume(struct device *dev)
+{
+       struct tpiu_drvdata *drvdata = dev_get_drvdata(dev);
+
+       if (drvdata && !IS_ERR(drvdata->atclk))
+               clk_prepare_enable(drvdata->atclk);
+
+       return 0;
+}
+#endif
+
+static const struct dev_pm_ops tpiu_dev_pm_ops = {
+       SET_RUNTIME_PM_OPS(tpiu_runtime_suspend, tpiu_runtime_resume, NULL)
+};
+
 static struct amba_id tpiu_ids[] = {
        {
                .id     = 0x0003b912,
                .mask   = 0x0003ffff,
        },
+       {
+               .id     = 0x0004b912,
+               .mask   = 0x0007ffff,
+       },
        { 0, 0},
 };
 
@@ -195,6 +222,7 @@ static struct amba_driver tpiu_driver = {
        .drv = {
                .name   = "coresight-tpiu",
                .owner  = THIS_MODULE,
+               .pm     = &tpiu_dev_pm_ops,
        },
        .probe          = tpiu_probe,
        .remove         = tpiu_remove,