android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "coresight: tmc: fix spinlock bad magic/usb_qdss_close"

Browse Source
This commit is contained in:
qctecmdr 2020-11-01 20:06:46 -08:00 committed by Gerrit - the friendly Code Review server
commit 878a2ef45f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hwtracing/coresight/coresight-tmc-etr.c
View File

@ -2013,6 +2013,7 @@ static int _tmc_disable_etr_sink(struct coresight_device *csdev,
/* Complain if we (somehow) got out of sync */
WARN_ON_ONCE(drvdata->mode == CS_MODE_DISABLED);
if (drvdata->mode != CS_MODE_DISABLED) {
drvdata->mode = CS_MODE_DISABLED;
if (drvdata->out_mode == TMC_ETR_OUT_MODE_USB) {
if (!drvdata->byte_cntr->sw_usb) {
__tmc_etr_disable_to_bam(drvdata);
@ -2021,7 +2022,6 @@ static int _tmc_disable_etr_sink(struct coresight_device *csdev,
tmc_etr_bam_disable(drvdata);
usb_qdss_close(drvdata->usbch);
drvdata->usbch = NULL;
drvdata->mode = CS_MODE_DISABLED;
goto out;
} else {
spin_unlock_irqrestore(&drvdata->spinlock,
@ -2033,11 +2033,9 @@ static int _tmc_disable_etr_sink(struct coresight_device *csdev,
} else {
tmc_etr_disable_hw(drvdata);
}
drvdata->mode = CS_MODE_DISABLED;
}
/* Dissociate from monitored process. */
drvdata->pid = -1;
drvdata->mode = CS_MODE_DISABLED;
/* Reset perf specific data */
drvdata->perf_buf = NULL;