leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coresight: moving PM runtime operations to core framework

Browse Source 
Moving PM runtime operations in Coresight devices enable() and
disable() API to the framework core when a path is setup.  That
way the runtime core doesn't have to be involved everytime a
path is enabled.  It also avoids calling runtime PM operations
in IRQ context.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mathieu Poirier 2016-02-17 17:51:47 -07:00 committed by Greg Kroah-Hartman
parent b6404e21f0
commit 5da5325fa8
9 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hwtracing/coresight/coresight-etb10.c
View File

@ -137,8 +137,6 @@ static int etb_enable(struct coresight_device *csdev)
struct etb_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); struct etb_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
unsigned long flags; unsigned long flags;
pm_runtime_get_sync(drvdata->dev);
spin_lock_irqsave(&drvdata->spinlock, flags); spin_lock_irqsave(&drvdata->spinlock, flags);
etb_enable_hw(drvdata); etb_enable_hw(drvdata);
drvdata->enable = true; drvdata->enable = true;
@ -247,8 +245,6 @@ static void etb_disable(struct coresight_device *csdev)
drvdata->enable = false; drvdata->enable = false;
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);
pm_runtime_put(drvdata->dev);
dev_info(drvdata->dev, "ETB disabled\n"); dev_info(drvdata->dev, "ETB disabled\n");
} }

3
drivers/hwtracing/coresight/coresight-etm3x.c
View File

@ -349,7 +349,6 @@ static int etm_enable(struct coresight_device *csdev)
struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
int ret; int ret;
pm_runtime_get_sync(csdev->dev.parent);
spin_lock(&drvdata->spinlock); spin_lock(&drvdata->spinlock);
/* /*
@ -373,7 +372,6 @@ static int etm_enable(struct coresight_device *csdev)
return 0; return 0;
err: err:
spin_unlock(&drvdata->spinlock); spin_unlock(&drvdata->spinlock);
pm_runtime_put(csdev->dev.parent);
return ret; return ret;
} }
@ -422,7 +420,6 @@ static void etm_disable(struct coresight_device *csdev)
spin_unlock(&drvdata->spinlock); spin_unlock(&drvdata->spinlock);
put_online_cpus(); put_online_cpus();
pm_runtime_put(csdev->dev.parent);
dev_info(drvdata->dev, "ETM tracing disabled\n"); dev_info(drvdata->dev, "ETM tracing disabled\n");
} }

6
drivers/hwtracing/coresight/coresight-etm4x.c
View File

@ -79,7 +79,6 @@ static int etm4_trace_id(struct coresight_device *csdev)
if (!drvdata->enable) if (!drvdata->enable)
return drvdata->trcid; return drvdata->trcid;
pm_runtime_get_sync(drvdata->dev);
spin_lock_irqsave(&drvdata->spinlock, flags); spin_lock_irqsave(&drvdata->spinlock, flags);
CS_UNLOCK(drvdata->base); CS_UNLOCK(drvdata->base);
@ -88,7 +87,6 @@ static int etm4_trace_id(struct coresight_device *csdev)
CS_LOCK(drvdata->base); CS_LOCK(drvdata->base);
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);
pm_runtime_put(drvdata->dev);
return trace_id; return trace_id;
} }
@ -194,7 +192,6 @@ static int etm4_enable(struct coresight_device *csdev)
struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
int ret; int ret;
pm_runtime_get_sync(drvdata->dev);
spin_lock(&drvdata->spinlock); spin_lock(&drvdata->spinlock);
/* /*
@ -214,7 +211,6 @@ static int etm4_enable(struct coresight_device *csdev)
return 0; return 0;
err: err:
spin_unlock(&drvdata->spinlock); spin_unlock(&drvdata->spinlock);
pm_runtime_put(drvdata->dev);
return ret; return ret;
} }
@ -263,8 +259,6 @@ static void etm4_disable(struct coresight_device *csdev)
spin_unlock(&drvdata->spinlock); spin_unlock(&drvdata->spinlock);
put_online_cpus(); put_online_cpus();
pm_runtime_put(drvdata->dev);
dev_info(drvdata->dev, "ETM tracing disabled\n"); dev_info(drvdata->dev, "ETM tracing disabled\n");
} }

2
drivers/hwtracing/coresight/coresight-funnel.c
View File

@ -69,7 +69,6 @@ static int funnel_enable(struct coresight_device *csdev, int inport,
{ {
struct funnel_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); struct funnel_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
pm_runtime_get_sync(drvdata->dev);
funnel_enable_hw(drvdata, inport); funnel_enable_hw(drvdata, inport);
dev_info(drvdata->dev, "FUNNEL inport %d enabled\n", inport); dev_info(drvdata->dev, "FUNNEL inport %d enabled\n", inport);
@ -95,7 +94,6 @@ static void funnel_disable(struct coresight_device *csdev, int inport,
struct funnel_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); struct funnel_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
funnel_disable_hw(drvdata, inport); funnel_disable_hw(drvdata, inport);
pm_runtime_put(drvdata->dev);
dev_info(drvdata->dev, "FUNNEL inport %d disabled\n", inport); dev_info(drvdata->dev, "FUNNEL inport %d disabled\n", inport);
} }

4
drivers/hwtracing/coresight/coresight-replicator-qcom.c
View File

@ -48,8 +48,6 @@ static int replicator_enable(struct coresight_device *csdev, int inport,
{ {
struct replicator_state *drvdata = dev_get_drvdata(csdev->dev.parent); struct replicator_state *drvdata = dev_get_drvdata(csdev->dev.parent);
pm_runtime_get_sync(drvdata->dev);
CS_UNLOCK(drvdata->base); CS_UNLOCK(drvdata->base);
/* /*
@ -86,8 +84,6 @@ static void replicator_disable(struct coresight_device *csdev, int inport,
CS_LOCK(drvdata->base); CS_LOCK(drvdata->base);
pm_runtime_put(drvdata->dev);
dev_info(drvdata->dev, "REPLICATOR disabled\n"); dev_info(drvdata->dev, "REPLICATOR disabled\n");
} }

2
drivers/hwtracing/coresight/coresight-replicator.c
View File

@ -41,7 +41,6 @@ static int replicator_enable(struct coresight_device *csdev, int inport,
{ {
struct replicator_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); struct replicator_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
pm_runtime_get_sync(drvdata->dev);
dev_info(drvdata->dev, "REPLICATOR enabled\n"); dev_info(drvdata->dev, "REPLICATOR enabled\n");
return 0; return 0;
} }
@ -51,7 +50,6 @@ static void replicator_disable(struct coresight_device *csdev, int inport,
{ {
struct replicator_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); struct replicator_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
pm_runtime_put(drvdata->dev);
dev_info(drvdata->dev, "REPLICATOR disabled\n"); dev_info(drvdata->dev, "REPLICATOR disabled\n");
} }

5
drivers/hwtracing/coresight/coresight-tmc.c
View File

@ -242,12 +242,9 @@ static int tmc_enable(struct tmc_drvdata *drvdata, enum tmc_mode mode)
{ {
unsigned long flags; unsigned long flags;
pm_runtime_get_sync(drvdata->dev);
spin_lock_irqsave(&drvdata->spinlock, flags); spin_lock_irqsave(&drvdata->spinlock, flags);
if (drvdata->reading) { if (drvdata->reading) {
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);
pm_runtime_put(drvdata->dev);
return -EBUSY; return -EBUSY;
} }
@ -381,8 +378,6 @@ out:
drvdata->enable = false; drvdata->enable = false;
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);
pm_runtime_put(drvdata->dev);
dev_info(drvdata->dev, "TMC disabled\n"); dev_info(drvdata->dev, "TMC disabled\n");
} }

2
drivers/hwtracing/coresight/coresight-tpiu.c
View File

@ -74,7 +74,6 @@ static int tpiu_enable(struct coresight_device *csdev)
{ {
struct tpiu_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); struct tpiu_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
pm_runtime_get_sync(csdev->dev.parent);
tpiu_enable_hw(drvdata); tpiu_enable_hw(drvdata);
dev_info(drvdata->dev, "TPIU enabled\n"); dev_info(drvdata->dev, "TPIU enabled\n");
@ -98,7 +97,6 @@ static void tpiu_disable(struct coresight_device *csdev)
struct tpiu_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); struct tpiu_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
tpiu_disable_hw(drvdata); tpiu_disable_hw(drvdata);
pm_runtime_put(csdev->dev.parent);
dev_info(drvdata->dev, "TPIU disabled\n"); dev_info(drvdata->dev, "TPIU disabled\n");
} }

9
drivers/hwtracing/coresight/coresight.c
View File

@ -24,6 +24,7 @@
#include <linux/coresight.h> #include <linux/coresight.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/pm_runtime.h>
#include "coresight-priv.h" #include "coresight-priv.h"
@ -376,7 +377,8 @@ out:
/* /*
* A path from this element to a sink has been found. The elements * A path from this element to a sink has been found. The elements
* leading to the sink are already enqueued, all that is left to do * leading to the sink are already enqueued, all that is left to do
* is add a node for this element. * is tell the PM runtime core we need this element and add a node
* for it.
*/ */
node = kzalloc(sizeof(struct coresight_node), GFP_KERNEL); node = kzalloc(sizeof(struct coresight_node), GFP_KERNEL);
if (!node) if (!node)
@ -384,6 +386,7 @@ out:
node->csdev = csdev; node->csdev = csdev;
list_add(&node->link, path); list_add(&node->link, path);
pm_runtime_get_sync(csdev->dev.parent);
return 0; return 0;
} }
@ -415,9 +418,13 @@ struct list_head *coresight_build_path(struct coresight_device *csdev)
*/ */
void coresight_release_path(struct list_head *path) void coresight_release_path(struct list_head *path)
{ {
struct coresight_device *csdev;
struct coresight_node *nd, *next; struct coresight_node *nd, *next;
list_for_each_entry_safe(nd, next, path, link) { list_for_each_entry_safe(nd, next, path, link) {
csdev = nd->csdev;
pm_runtime_put_sync(csdev->dev.parent);
list_del(&nd->link); list_del(&nd->link);
kfree(nd); kfree(nd);
} }