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

Commit a972dbe7 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Yabin Cui
Browse files

UPSTREAM: coresight: etmx: Claim devices before use 



(Upstream commit 68a147752d04da73e2786890d78317fc37e6a6a8).

Use the CLAIM tags to grab the device for self-hosted usage.

Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

Bug: 140266694
Change-Id: Ieb98a7a68560a94b4d74b62206d4b530eb2cb008
Signed-off-by: default avatarYabin Cui <yabinc@google.com>
parent 7757d73a

drivers/hwtracing/coresight/coresight-etm3x.c

+13 −3
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ static int etm_parse_event_config(struct etm_drvdata *drvdata, 


static int etm_enable_hw(struct etm_drvdata *drvdata)

{

	int i;

	int i, rc;

	u32 etmcr;

	struct etm_config *config = &drvdata->config;
@@ -369,6 +369,9 @@ static int etm_enable_hw(struct etm_drvdata *drvdata) 
	etm_set_pwrup(drvdata);

	/* Make sure all registers are accessible */

	etm_os_unlock(drvdata);

	rc = coresight_claim_device_unlocked(drvdata->base);

	if (rc)

		goto done;



	etm_set_prog(drvdata);
@@ -417,10 +420,15 @@ static int etm_enable_hw(struct etm_drvdata *drvdata) 
	etm_writel(drvdata, 0x0, ETMVMIDCVR);



	etm_clr_prog(drvdata);



done:

	if (rc)

		etm_set_pwrdwn(drvdata);

	CS_LOCK(drvdata->base);



	dev_dbg(drvdata->dev, "cpu: %d enable smp call done\n", drvdata->cpu);

	return 0;

	dev_dbg(drvdata->dev, "cpu: %d enable smp call done: %d\n",

		drvdata->cpu, rc);

	return rc;

}



struct etm_enable_arg {
@@ -569,6 +577,8 @@ static void etm_disable_hw(void *info) 
	for (i = 0; i < drvdata->nr_cntr; i++)

		config->cntr_val[i] = etm_readl(drvdata, ETMCNTVRn(i));



	coresight_disclaim_device_unlocked(drvdata->base);



	etm_set_pwrdwn(drvdata);

	CS_LOCK(drvdata->base);

drivers/hwtracing/coresight/coresight-etm4x.c

+11 −3
Original line number Diff line number Diff line
@@ -86,13 +86,17 @@ struct etm4_enable_arg { 


static int etm4_enable_hw(struct etmv4_drvdata *drvdata)

{

	int i;

	int i, rc;

	struct etmv4_config *config = &drvdata->config;



	CS_UNLOCK(drvdata->base);



	etm4_os_unlock(drvdata);



	rc = coresight_claim_device_unlocked(drvdata->base);

	if (rc)

		goto done;



	/* Disable the trace unit before programming trace registers */

	writel_relaxed(0, drvdata->base + TRCPRGCTLR);
@@ -186,10 +190,12 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata) 
	dsb(sy);

	isb();



done:

	CS_LOCK(drvdata->base);



	dev_dbg(drvdata->dev, "cpu: %d enable smp call done\n", drvdata->cpu);

	return 0;

	dev_dbg(drvdata->dev, "cpu: %d enable smp call done: %d\n",

		drvdata->cpu, rc);

	return rc;

}



static void etm4_enable_hw_smp_call(void *info)
@@ -353,6 +359,8 @@ static void etm4_disable_hw(void *info) 
	isb();

	writel_relaxed(control, drvdata->base + TRCPRGCTLR);



	coresight_disclaim_device_unlocked(drvdata->base);



	CS_LOCK(drvdata->base);



	dev_dbg(drvdata->dev, "cpu: %d disable smp call done\n", drvdata->cpu);