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

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

UPSTREAM: coreisght: tmc: Claim device before use 



(Upstream commit 4d3ebd3658d8b87d8ead979725305adc6fae3855).

Use CLAIM tags to make sure the device is available for use.

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: I3f3ea1037e956a2f6e8235494d73d9d76581749f
Signed-off-by: default avatarYabin Cui <yabinc@google.com>
parent e718162c

drivers/hwtracing/coresight/coresight-tmc-etf.c

+19 −3
Original line number Diff line number Diff line
@@ -36,6 +36,11 @@ static void __tmc_etb_enable_hw(struct tmc_drvdata *drvdata) 


static int tmc_etb_enable_hw(struct tmc_drvdata *drvdata)

{

	int rc = coresight_claim_device(drvdata->base);



	if (rc)

		return rc;



	__tmc_etb_enable_hw(drvdata);

	return 0;

}
@@ -66,7 +71,7 @@ static void tmc_etb_dump_hw(struct tmc_drvdata *drvdata) 
	return;

}



static void tmc_etb_disable_hw(struct tmc_drvdata *drvdata)

static void __tmc_etb_disable_hw(struct tmc_drvdata *drvdata)

{

	CS_UNLOCK(drvdata->base);
@@ -82,6 +87,12 @@ static void tmc_etb_disable_hw(struct tmc_drvdata *drvdata) 
	CS_LOCK(drvdata->base);

}



static void tmc_etb_disable_hw(struct tmc_drvdata *drvdata)

{

	coresight_disclaim_device(drvdata);

	__tmc_etb_disable_hw(drvdata);

}



static void __tmc_etf_enable_hw(struct tmc_drvdata *drvdata)

{

	CS_UNLOCK(drvdata->base);
@@ -100,6 +111,11 @@ static void __tmc_etf_enable_hw(struct tmc_drvdata *drvdata) 


static int tmc_etf_enable_hw(struct tmc_drvdata *drvdata)

{

	int rc = coresight_claim_device(drvdata->base);



	if (rc)

		return rc;



	__tmc_etf_enable_hw(drvdata);

	return 0;

}
@@ -110,7 +126,7 @@ static void tmc_etf_disable_hw(struct tmc_drvdata *drvdata) 


	tmc_flush_and_stop(drvdata);

	tmc_disable_hw(drvdata);



	coresight_disclaim_device_unlocked(drvdata->base);

	CS_LOCK(drvdata->base);

}
@@ -556,7 +572,7 @@ int tmc_read_prepare_etb(struct tmc_drvdata *drvdata) 


	/* Disable the TMC if need be */

	if (drvdata->mode == CS_MODE_SYSFS)

		tmc_etb_disable_hw(drvdata);

		__tmc_etb_disable_hw(drvdata);



	drvdata->reading = true;

out:

drivers/hwtracing/coresight/coresight-tmc-etr.c

+4 −0
Original line number Diff line number Diff line
@@ -991,6 +991,9 @@ static int tmc_etr_enable_hw(struct tmc_drvdata *drvdata, 
	 * this on.

	 */

	rc = tmc_etr_enable_catu(drvdata, etr_buf);

	if (rc)

		return rc;

	rc = coresight_claim_device(drvdata->base);

	if (!rc) {

		drvdata->etr_buf = etr_buf;

		__tmc_etr_enable_hw(drvdata);
@@ -1077,6 +1080,7 @@ static void tmc_etr_disable_hw(struct tmc_drvdata *drvdata) 
	__tmc_etr_disable_hw(drvdata);

	/* Disable CATU device if this ETR is connected to one */

	tmc_etr_disable_catu(drvdata);

	coresight_disclaim_device(drvdata->base);

	/* Reset the ETR buf used by hardware */

	drvdata->etr_buf = NULL;

}