Merge "soc: qcom: Increase the retry timeout to 2 seconds" (92209056) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/soc/qcom/scm.c

+6 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2010-2015, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2010-2016, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -46,7 +46,7 @@ static DEFINE_MUTEX(scm_lock);
		DEFINE_MUTEX(scm_lmh_lock);

		#define SCM_EBUSY_WAIT_MS 30
		#define SCM_EBUSY_MAX_RETRY 20
		#define SCM_EBUSY_MAX_RETRY 67

		#define N_EXT_SCM_ARGS 7
		#define FIRST_EXT_ARG_IDX 3
		@@ -333,6 +333,8 @@ static int _scm_call_retry(u32 svc_id, u32 cmd_id, const void *cmd_buf,
		resp_buf, resp_len, cmd, len);
		if (ret == SCM_EBUSY)
		msleep(SCM_EBUSY_WAIT_MS);
		if (retry_count == 33)
		pr_warn("scm: secure world has been busy for 1 second!\n");
		} while (ret == SCM_EBUSY && (retry_count++ < SCM_EBUSY_MAX_RETRY));

		if (ret == SCM_EBUSY)
		@@ -688,6 +690,8 @@ int scm_call2(u32 fn_id, struct scm_desc *desc)

		if (ret == SCM_V2_EBUSY)
		msleep(SCM_EBUSY_WAIT_MS);
		if (retry_count == 33)
		pr_warn("scm: secure world has been busy for 1 second!\n");
		} while (ret == SCM_V2_EBUSY && (retry_count++ < SCM_EBUSY_MAX_RETRY));

		if (ret < 0)