GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-20 13:41:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

coresight: etb10: Handle errors enabling the device

Browse source 
Prepare the etb10 driver to return errors in enabling
the device.

Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Suzuki K Poulose 2018-09-20 13:18:09 -06:00 • committed by Greg Kroah-Hartman
parent e2a1551a88
commit 62563e84a8
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/hwtracing/coresight/coresight-etb10.c
View file

@ -106,7 +106,7 @@ static unsigned int etb_get_buffer_depth(struct etb_drvdata *drvdata)
return depth; return depth;
} }
static void etb_enable_hw(struct etb_drvdata *drvdata) static void __etb_enable_hw(struct etb_drvdata *drvdata)
{ {
int i; int i;
u32 depth; u32 depth;
@ -134,6 +134,12 @@ static void etb_enable_hw(struct etb_drvdata *drvdata)
CS_LOCK(drvdata->base); CS_LOCK(drvdata->base);
} }
static int etb_enable_hw(struct etb_drvdata *drvdata)
{
__etb_enable_hw(drvdata);
return 0;
}
static int etb_enable_sysfs(struct coresight_device *csdev) static int etb_enable_sysfs(struct coresight_device *csdev)
{ {
int ret = 0; int ret = 0;
@ -152,8 +158,9 @@ static int etb_enable_sysfs(struct coresight_device *csdev)
if (drvdata->mode == CS_MODE_SYSFS) if (drvdata->mode == CS_MODE_SYSFS)
goto out; goto out;
ret = etb_enable_hw(drvdata);
if (!ret)
drvdata->mode = CS_MODE_SYSFS; drvdata->mode = CS_MODE_SYSFS;
etb_enable_hw(drvdata);
out: out:
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);
@ -183,8 +190,9 @@ static int etb_enable_perf(struct coresight_device *csdev, void *data)
if (ret) if (ret)
goto out; goto out;
ret = etb_enable_hw(drvdata);
if (!ret)
drvdata->mode = CS_MODE_PERF; drvdata->mode = CS_MODE_PERF;
etb_enable_hw(drvdata);
out: out:
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);