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

Commit d2f63e15 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "coresight-tmc: Avoid reading TMC buffer before enabling" into msm-4.9

parents 3f91993c 6b630baa

drivers/hwtracing/coresight/coresight-tmc.c

+4 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ void tmc_flush_and_stop(struct tmc_drvdata *drvdata) 
void tmc_enable_hw(struct tmc_drvdata *drvdata)

{

	drvdata->enable = true;

	drvdata->sticky_enable = true;

	writel_relaxed(TMC_CTL_CAPT_EN, drvdata->base + TMC_CTL);

}
@@ -77,6 +78,9 @@ static int tmc_read_prepare(struct tmc_drvdata *drvdata) 
{

	int ret = 0;



	if (!drvdata->sticky_enable)

		return -EPERM;



	switch (drvdata->config_type) {

	case TMC_CONFIG_TYPE_ETB:

	case TMC_CONFIG_TYPE_ETF:

drivers/hwtracing/coresight/coresight-tmc.h

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ struct tmc_drvdata { 
	struct usb_qdss_ch	*usbch;

	struct tmc_etr_bam_data	*bamdata;

	bool			enable_to_bam;

	bool			sticky_enable;



};