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

Commit ba936f25 authored by Robert Walker's avatar Robert Walker Committed by Greg Kroah-Hartman
Browse files

coresight: Fix disabling of CoreSight TPIU 




[ Upstream commit 11595db8e17faaa05fadc25746c870e31276962f ]

The CoreSight TPIU should be disabled when tracing to other sinks to allow
them to operate at full bandwidth.

This patch fixes tpiu_disable_hw() to correctly disable the TPIU by
configuring the TPIU to stop on flush, initiating a manual flush, waiting
for the flush to complete and then waits for the TPIU to indicate it has
stopped.

Signed-off-by: default avatarRobert Walker <robert.walker@arm.com>
Tested-by: default avatarMike Leach <mike.leach@linaro.org>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d69cf856

drivers/hwtracing/coresight/coresight-tpiu.c

+10 −3
Original line number Diff line number Diff line
@@ -46,8 +46,11 @@ 
#define TPIU_ITATBCTR0		0xef8



/** register definition **/

/* FFSR - 0x300 */

#define FFSR_FT_STOPPED		BIT(1)

/* FFCR - 0x304 */

#define FFCR_FON_MAN		BIT(6)

#define FFCR_STOP_FI		BIT(12)



/**

 * @base:	memory mapped base address for this component.
@@ -85,10 +88,14 @@ static void tpiu_disable_hw(struct tpiu_drvdata *drvdata) 
{

	CS_UNLOCK(drvdata->base);



	/* Clear formatter controle reg. */

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

	/* Clear formatter and stop on flush */

	writel_relaxed(FFCR_STOP_FI, drvdata->base + TPIU_FFCR);

	/* Generate manual flush */

	writel_relaxed(FFCR_FON_MAN, drvdata->base + TPIU_FFCR);

	writel_relaxed(FFCR_STOP_FI | FFCR_FON_MAN, drvdata->base + TPIU_FFCR);

	/* Wait for flush to complete */

	coresight_timeout(drvdata->base, TPIU_FFCR, FFCR_FON_MAN, 0);

	/* Wait for formatter to stop */

	coresight_timeout(drvdata->base, TPIU_FFSR, FFSR_FT_STOPPED, 1);



	CS_LOCK(drvdata->base);

}