p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

coresight: etb10: Add support for CLAIM tag 

Following in the footstep of what was done for other CoreSight devices,
add CLAIM tag support to ETB10 in order to synchronise access to the
HW between the kernel and an external agent.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mathieu Poirier 2018-11-30 11:43:03 -07:00 committed by Greg Kroah-Hartman
parent 323ed1e0f6
commit acaf5a06b9
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,6 +136,11 @@ static void __etb_enable_hw(struct etb_drvdata *drvdata)
static int etb_enable_hw(struct etb_drvdata *drvdata) static int etb_enable_hw(struct etb_drvdata *drvdata)
{ {
int rc = coresight_claim_device(drvdata->base);
if (rc)
return rc;
__etb_enable_hw(drvdata); __etb_enable_hw(drvdata);
return 0; return 0;
} }
@ -223,7 +228,7 @@ static int etb_enable(struct coresight_device *csdev, u32 mode, void *data)
return 0; return 0;
} }
static void etb_disable_hw(struct etb_drvdata *drvdata) static void __etb_disable_hw(struct etb_drvdata *drvdata)
{ {
u32 ffcr; u32 ffcr;
@ -313,6 +318,13 @@ static void etb_dump_hw(struct etb_drvdata *drvdata)
CS_LOCK(drvdata->base); CS_LOCK(drvdata->base);
} }
static void etb_disable_hw(struct etb_drvdata *drvdata)
{
__etb_disable_hw(drvdata);
etb_dump_hw(drvdata);
coresight_disclaim_device(drvdata->base);
}
static void etb_disable(struct coresight_device *csdev) static void 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);
@ -323,7 +335,6 @@ static void etb_disable(struct coresight_device *csdev)
/* Disable the ETB only if it needs to */ /* Disable the ETB only if it needs to */
if (drvdata->mode != CS_MODE_DISABLED) { if (drvdata->mode != CS_MODE_DISABLED) {
etb_disable_hw(drvdata); etb_disable_hw(drvdata);
etb_dump_hw(drvdata);
drvdata->mode = CS_MODE_DISABLED; drvdata->mode = CS_MODE_DISABLED;
} }
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);
@ -402,7 +413,7 @@ static unsigned long etb_update_buffer(struct coresight_device *csdev,
capacity = drvdata->buffer_depth * ETB_FRAME_SIZE_WORDS; capacity = drvdata->buffer_depth * ETB_FRAME_SIZE_WORDS;
etb_disable_hw(drvdata); __etb_disable_hw(drvdata);
CS_UNLOCK(drvdata->base); CS_UNLOCK(drvdata->base);
/* unit is in words, not bytes */ /* unit is in words, not bytes */
@ -510,7 +521,7 @@ static unsigned long etb_update_buffer(struct coresight_device *csdev,
handle->head = (cur * PAGE_SIZE) + offset; handle->head = (cur * PAGE_SIZE) + offset;
to_read = buf->nr_pages << PAGE_SHIFT; to_read = buf->nr_pages << PAGE_SHIFT;
} }
etb_enable_hw(drvdata); __etb_enable_hw(drvdata);
CS_LOCK(drvdata->base); CS_LOCK(drvdata->base);
return to_read; return to_read;
@ -534,9 +545,9 @@ static void etb_dump(struct etb_drvdata *drvdata)
spin_lock_irqsave(&drvdata->spinlock, flags); spin_lock_irqsave(&drvdata->spinlock, flags);
if (drvdata->mode == CS_MODE_SYSFS) { if (drvdata->mode == CS_MODE_SYSFS) {
etb_disable_hw(drvdata); __etb_disable_hw(drvdata);
etb_dump_hw(drvdata); etb_dump_hw(drvdata);
etb_enable_hw(drvdata); __etb_enable_hw(drvdata);
} }
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);