evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

coresight: etm4x: unlocking tracers in default arch init

Browse source 
As with the ETMv3.x driver, calling 'smp_call_function_single()'
twice in a row is highly ineffective.  As such moving function
'etm4_os_unlock()' before the default initialisation takes
place, which results in the same outcome.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 66bbbb77540e846b9aac4c9467aca936128951bf)
This commit is contained in:
Mathieu Poirier 2016-04-05 11:53:46 -06:00
parent 687e025078
commit 17b04a9f55
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/hwtracing/coresight/coresight-etm4x.c
View file

@ -44,12 +44,11 @@ module_param_named(boot_enable, boot_enable, int, S_IRUGO);
static int etm4_count; static int etm4_count;
static struct etmv4_drvdata *etmdrvdata[NR_CPUS]; static struct etmv4_drvdata *etmdrvdata[NR_CPUS];
static void etm4_os_unlock(void *info) static void etm4_os_unlock(struct etmv4_drvdata *drvdata)
{ {
struct etmv4_drvdata *drvdata = (struct etmv4_drvdata *)info;
/* Writing any value to ETMOSLAR unlocks the trace registers */ /* Writing any value to ETMOSLAR unlocks the trace registers */
writel_relaxed(0x0, drvdata->base + TRCOSLAR); writel_relaxed(0x0, drvdata->base + TRCOSLAR);
drvdata->os_unlock = true;
isb(); isb();
} }
@ -286,6 +285,9 @@ static void etm4_init_arch_data(void *info)
u32 etmidr5; u32 etmidr5;
struct etmv4_drvdata *drvdata = info; struct etmv4_drvdata *drvdata = info;
/* Make sure all registers are accessible */
etm4_os_unlock(drvdata);
CS_UNLOCK(drvdata->base); CS_UNLOCK(drvdata->base);
/* find all capabilities of the tracing unit */ /* find all capabilities of the tracing unit */
@ -603,9 +605,6 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)
get_online_cpus(); get_online_cpus();
etmdrvdata[drvdata->cpu] = drvdata; etmdrvdata[drvdata->cpu] = drvdata;
if (!smp_call_function_single(drvdata->cpu, etm4_os_unlock, drvdata, 1))
drvdata->os_unlock = true;
if (smp_call_function_single(drvdata->cpu, if (smp_call_function_single(drvdata->cpu,
etm4_init_arch_data, drvdata, 1)) etm4_init_arch_data, drvdata, 1))
dev_err(dev, "ETM arch init failed\n"); dev_err(dev, "ETM arch init failed\n");