Merge "soc: qcom: dcc: update xpu probe logic to fix failure" (ed681044) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/soc/qcom/dcc.c

+14 −12

Original line number	Diff line number	Diff line
		@@ -1251,19 +1251,21 @@ static int dcc_probe(struct platform_device *pdev)

		INIT_LIST_HEAD(&drvdata->config_head);
		drvdata->nr_config = 0;

		if (scm_is_call_available(SCM_SVC_MP, SCM_SVC_DISABLE_XPU) > 0)
		drvdata->xpu_scm_avail = 1;
		else
		drvdata->xpu_scm_avail = 0;

		if (drvdata->xpu_scm_avail) {
		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
		"dcc-xpu-base");
		if (!res)
		return -ENODEV;

		if (res) {
		if (scm_is_call_available(SCM_SVC_MP,
		SCM_SVC_DISABLE_XPU) > 0) {
		drvdata->xpu_scm_avail = 1;
		drvdata->xpu_addr = res->start;
		} else {
		dev_err(dev, "scm call is not available\n");
		return -EINVAL;
		}
		} else {
		dev_info(dev, "DCC XPU is not specified\n");
		}

		ret = dcc_xpu_unlock(drvdata);