Merge "soc: qcom: jtagv8-etm: fix race condition during probe" (188ab649) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/soc/qcom/jtagv8-etm.c

+9 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1556,7 +1556,6 @@ static int jtag_mm_etm_probe(struct platform_device *pdev, uint32_t cpu)
	if (!etmdata)		if (!etmdata)
	return -ENOMEM;		return -ENOMEM;

	etm[cpu] = etmdata;

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "etm-base");		res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "etm-base");
	if (!res)		if (!res)
	@@ -1585,12 +1584,18 @@ static int jtag_mm_etm_probe(struct platform_device *pdev, uint32_t cpu)
	if (cnt++ == 0)		if (cnt++ == 0)
	register_hotcpu_notifier(&jtag_mm_etm_notifier);		register_hotcpu_notifier(&jtag_mm_etm_notifier);

			get_online_cpus();

	if (!smp_call_function_single(cpu, etm_init_arch_data, etmdata,		if (!smp_call_function_single(cpu, etm_init_arch_data, etmdata,
	1))		1))
	etmdata->init = true;		etmdata->init = true;

	if (etmdata->init) {		etm[cpu] = etmdata;

			put_online_cpus();

	mutex_lock(&etmdata->mutex);		mutex_lock(&etmdata->mutex);
			if (etmdata->init && !etmdata->enable) {
	if (etm_arch_supported(etmdata->arch)) {		if (etm_arch_supported(etmdata->arch)) {
	if (scm_get_feat_version(TZ_DBG_ETM_FEAT_ID) <		if (scm_get_feat_version(TZ_DBG_ETM_FEAT_ID) <
	TZ_DBG_ETM_VER)		TZ_DBG_ETM_VER)
	@@ -1600,8 +1605,8 @@ static int jtag_mm_etm_probe(struct platform_device *pdev, uint32_t cpu)
	} else		} else
	pr_info("etm arch %u not supported\n", etmdata->arch);		pr_info("etm arch %u not supported\n", etmdata->arch);
	etmdata->enable = true;		etmdata->enable = true;
	mutex_unlock(&etmdata->mutex);
	}		}
			mutex_unlock(&etmdata->mutex);
	return 0;		return 0;
	}		}