Merge "msm: ipa3: IPA GSI channel context state not sync with current state" (cf8648ec) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/platform/msm/gsi/gsi.c

+13 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2018, 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
		@@ -27,6 +27,7 @@

		#define GSI_RESET_WA_MIN_SLEEP 1000
		#define GSI_RESET_WA_MAX_SLEEP 2000
		#define GSI_CHNL_STATE_MAX_RETRYCNT 10
		static const struct of_device_id msm_gsi_match[] = {
		{ .compatible = "qcom,msm_gsi", },
		{ },
		@@ -2076,6 +2077,7 @@ int gsi_reset_channel(unsigned long chan_hdl)
		uint32_t val;
		struct gsi_chan_ctx *ctx;
		bool reset_done = false;
		uint32_t retry_cnt = 0;

		if (!gsi_ctx) {
		pr_err("%s:%d gsi context not allocated\n", __func__, __LINE__);
		@@ -2112,9 +2114,19 @@ int gsi_reset_channel(unsigned long chan_hdl)
		return -GSI_STATUS_TIMED_OUT;
		}

		revrfy_chnlstate:
		if (ctx->state != GSI_CHAN_STATE_ALLOCATED) {
		GSIERR("chan_hdl=%lu unexpected state=%u\n", chan_hdl,
		ctx->state);
		/* GSI register update state not sync with gsi channel
		* context state not sync, need to wait for 1ms to sync.
		*/
		retry_cnt++;
		if (retry_cnt <= GSI_CHNL_STATE_MAX_RETRYCNT) {
		usleep_range(GSI_RESET_WA_MIN_SLEEP,
		GSI_RESET_WA_MAX_SLEEP);
		goto revrfy_chnlstate;
		}
		BUG();
		}