mirrors
/
anolis-cloud-kernel
mirror of https://gitee.com/anolis/cloud-kernel.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

coresight: Adding return code to sink::disable() operation 

In preparation to handle device reference counting inside of the sink
drivers, add a return code to the sink::disable() operation so that
proper action can be taken if a sink has not been disabled.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Tested-by: Leo Yan <leo.yan@linaro.org>
Tested-by: Robert Walker <robert.walker@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mathieu Poirier 2019-04-25 13:52:55 -06:00 committed by Greg Kroah-Hartman
parent a54e14f810
commit 6c817a95d8
6 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,7 +317,7 @@ static void etb_disable_hw(struct etb_drvdata *drvdata)
coresight_disclaim_device(drvdata->base); coresight_disclaim_device(drvdata->base);
} }
static void etb_disable(struct coresight_device *csdev) static int etb_disable(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;
@ -332,6 +332,7 @@ static void etb_disable(struct coresight_device *csdev)
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);
dev_dbg(drvdata->dev, "ETB disabled\n"); dev_dbg(drvdata->dev, "ETB disabled\n");
return 0;
} }
static void *etb_alloc_buffer(struct coresight_device *csdev, int cpu, static void *etb_alloc_buffer(struct coresight_device *csdev, int cpu,

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

@ -273,7 +273,7 @@ static int tmc_enable_etf_sink(struct coresight_device *csdev,
return 0; return 0;
} }
static void tmc_disable_etf_sink(struct coresight_device *csdev) static int tmc_disable_etf_sink(struct coresight_device *csdev)
{ {
unsigned long flags; unsigned long flags;
struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
@ -281,7 +281,7 @@ static void tmc_disable_etf_sink(struct coresight_device *csdev)
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);
return; return -EBUSY;
} }
/* Disable the TMC only if it needs to */ /* Disable the TMC only if it needs to */
@ -293,6 +293,7 @@ static void tmc_disable_etf_sink(struct coresight_device *csdev)
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);
dev_dbg(drvdata->dev, "TMC-ETB/ETF disabled\n"); dev_dbg(drvdata->dev, "TMC-ETB/ETF disabled\n");
return 0;
} }
static int tmc_enable_etf_link(struct coresight_device *csdev, static int tmc_enable_etf_link(struct coresight_device *csdev,

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

@ -1393,7 +1393,7 @@ static int tmc_enable_etr_sink(struct coresight_device *csdev,
return -EINVAL; return -EINVAL;
} }
static void tmc_disable_etr_sink(struct coresight_device *csdev) static int tmc_disable_etr_sink(struct coresight_device *csdev)
{ {
unsigned long flags; unsigned long flags;
struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
@ -1401,7 +1401,7 @@ static void tmc_disable_etr_sink(struct coresight_device *csdev)
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);
return; return -EBUSY;
} }
/* Disable the TMC only if it needs to */ /* Disable the TMC only if it needs to */
@ -1413,6 +1413,7 @@ static void tmc_disable_etr_sink(struct coresight_device *csdev)
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);
dev_dbg(drvdata->dev, "TMC-ETR disabled\n"); dev_dbg(drvdata->dev, "TMC-ETR disabled\n");
return 0;
} }
static const struct coresight_ops_sink tmc_etr_sink_ops = { static const struct coresight_ops_sink tmc_etr_sink_ops = {

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

@ -94,13 +94,14 @@ static void tpiu_disable_hw(struct tpiu_drvdata *drvdata)
CS_LOCK(drvdata->base); CS_LOCK(drvdata->base);
} }
static void tpiu_disable(struct coresight_device *csdev) static int 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);
dev_dbg(drvdata->dev, "TPIU disabled\n"); dev_dbg(drvdata->dev, "TPIU disabled\n");
return 0;
} }
static const struct coresight_ops_sink tpiu_sink_ops = { static const struct coresight_ops_sink tpiu_sink_ops = {

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

@ -239,9 +239,13 @@ static int coresight_enable_sink(struct coresight_device *csdev,
static void coresight_disable_sink(struct coresight_device *csdev) static void coresight_disable_sink(struct coresight_device *csdev)
{ {
int ret;
if (atomic_dec_return(csdev->refcnt) == 0) { if (atomic_dec_return(csdev->refcnt) == 0) {
if (sink_ops(csdev)->disable) { if (sink_ops(csdev)->disable) {
sink_ops(csdev)->disable(csdev); ret = sink_ops(csdev)->disable(csdev);
if (ret)
return;
csdev->enable = false; csdev->enable = false;
} }
} }

2
include/linux/coresight.h
View File

@ -192,7 +192,7 @@ struct coresight_device {
*/ */
struct coresight_ops_sink { struct coresight_ops_sink {
int (*enable)(struct coresight_device *csdev, u32 mode, void *data); int (*enable)(struct coresight_device *csdev, u32 mode, void *data);
void (*disable)(struct coresight_device *csdev); int (*disable)(struct coresight_device *csdev);
void *(*alloc_buffer)(struct coresight_device *csdev, int cpu, void *(*alloc_buffer)(struct coresight_device *csdev, int cpu,
void **pages, int nr_pages, bool overwrite); void **pages, int nr_pages, bool overwrite);
void (*free_buffer)(void *config); void (*free_buffer)(void *config);