Merge "icnss2: Fix race condition during SOC wake req/release" (2db8ce7b) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/soc/qcom/icnss2/main.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -986,10 +986,17 @@ static int icnss_qdss_trace_save_hdlr(struct icnss_priv *priv,
		static int icnss_event_soc_wake_request(struct icnss_priv priv, void data)
		{
		int ret = 0;
		int count = 0;

		if (!priv)
		return -ENODEV;

		if (atomic_read(&priv->soc_wake_ref_count)) {
		count = atomic_inc_return(&priv->soc_wake_ref_count);
		icnss_pr_dbg("SOC already awake, Ref count: %d", count);
		return 0;
		}

		ret = wlfw_send_soc_wake_msg(priv, QMI_WLFW_WAKE_REQUEST_V01);
		if (!ret)
		atomic_inc(&priv->soc_wake_ref_count);
		@@ -2329,7 +2336,6 @@ EXPORT_SYMBOL(icnss_set_fw_log_mode);
		int icnss_force_wake_request(struct device *dev)
		{
		struct icnss_priv *priv = dev_get_drvdata(dev);
		int count = 0;

		if (!dev)
		return -ENODEV;
		@@ -2341,12 +2347,6 @@ int icnss_force_wake_request(struct device *dev)

		icnss_pr_dbg("Calling SOC Wake request");

		if (atomic_read(&priv->soc_wake_ref_count)) {
		count = atomic_inc_return(&priv->soc_wake_ref_count);
		icnss_pr_dbg("SOC already awake, Ref count: %d", count);
		return 0;
		}

		icnss_soc_wake_event_post(priv, ICNSS_SOC_WAKE_REQUEST_EVENT,
		0, NULL);