Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66bbbb77 authored by Mathieu Poirier's avatar Mathieu Poirier Committed by Greg Kroah-Hartman
Browse files

coresight: etm4x: unlocking tracers in default arch init 



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: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fc208abe

drivers/hwtracing/coresight/coresight-etm4x.c

+5 −6
Original line number Diff line number Diff line
@@ -44,12 +44,11 @@ module_param_named(boot_enable, boot_enable, int, S_IRUGO); 
static int etm4_count;

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 */

	writel_relaxed(0x0, drvdata->base + TRCOSLAR);

	drvdata->os_unlock = true;

	isb();

}
@@ -286,6 +285,9 @@ static void etm4_init_arch_data(void *info) 
	u32 etmidr5;

	struct etmv4_drvdata *drvdata = info;



	/* Make sure all registers are accessible */

	etm4_os_unlock(drvdata);



	CS_UNLOCK(drvdata->base);



	/* 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();

	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,

				etm4_init_arch_data,  drvdata, 1))

		dev_err(dev, "ETM arch init failed\n");