Merge "coresight: tmc: Set flush cti for both etr and etb" (648e5513) · Commits · e / devices / android_kernel_oneplus_sm7250

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ static void __tmc_etb_enable_hw(struct tmc_drvdata *drvdata)
		writel_relaxed(TMC_MODE_CIRCULAR_BUFFER, drvdata->base + TMC_MODE);
		writel_relaxed(TMC_FFCR_EN_FMT \| TMC_FFCR_EN_TI \|
		TMC_FFCR_FON_FLIN \| TMC_FFCR_FON_TRIG_EVT \|
		TMC_FFCR_TRIGON_TRIGIN,
		TMC_FFCR_TRIGON_TRIGIN \| TMC_FFCR_STOP_ON_FLUSH,
		drvdata->base + TMC_FFCR);

		writel_relaxed(drvdata->trigger_cntr, drvdata->base + TMC_TRG);

+3 −3

Original line number	Diff line number	Diff line
		@@ -1016,7 +1016,7 @@ static void __tmc_etr_enable_hw(struct tmc_drvdata *drvdata)

		writel_relaxed(TMC_FFCR_EN_FMT \| TMC_FFCR_EN_TI \|
		TMC_FFCR_FON_FLIN \| TMC_FFCR_FON_TRIG_EVT \|
		TMC_FFCR_TRIGON_TRIGIN,
		TMC_FFCR_TRIGON_TRIGIN \| TMC_FFCR_STOP_ON_FLUSH,
		drvdata->base + TMC_FFCR);
		writel_relaxed(drvdata->trigger_cntr, drvdata->base + TMC_TRG);
		tmc_enable_hw(drvdata);
		@@ -1454,7 +1454,7 @@ static int tmc_enable_etr_sink_sysfs(struct coresight_device *csdev)
		return -ENOMEM;
		}
		coresight_cti_map_trigout(drvdata->cti_flush, 3, 0);
		coresight_cti_map_trigin(drvdata->cti_reset, 2, 0);
		coresight_cti_map_trigin(drvdata->cti_reset, 0, 0);
		} else if (drvdata->byte_cntr->sw_usb) {
		if (!drvdata->etr_buf) {
		free_buf = new_buf =
		@@ -1464,7 +1464,7 @@ static int tmc_enable_etr_sink_sysfs(struct coresight_device *csdev)
		}
		}
		coresight_cti_map_trigout(drvdata->cti_flush, 3, 0);
		coresight_cti_map_trigin(drvdata->cti_reset, 2, 0);
		coresight_cti_map_trigin(drvdata->cti_reset, 0, 0);

		drvdata->usbch = usb_qdss_open("qdss_mdm",
		drvdata->byte_cntr,