From cb5899aec0fed967088942832814747d8b1ac3b8 Mon Sep 17 00:00:00 2001 From: Naman Padhiar Date: Wed, 7 Oct 2020 10:52:58 +0530 Subject: [PATCH] icnss2: Decrement soc wake ref count If ref count is greater than 1, decrement ref count without calling SOC_WAKE_RELEASE QMI as for ref count greater than 1 SOC_WAKE_REQ is also not sent. This will protect req/release mismatch in FW. Change-Id: I8475e7b2429389c22a23483ee129db8753957ad3 Signed-off-by: Naman Padhiar --- drivers/soc/qcom/icnss2/main.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/soc/qcom/icnss2/main.c b/drivers/soc/qcom/icnss2/main.c index 5777a1941b61..33bd3cc32cda 100644 --- a/drivers/soc/qcom/icnss2/main.c +++ b/drivers/soc/qcom/icnss2/main.c @@ -2332,6 +2332,12 @@ int icnss_force_wake_request(struct device *dev) return -EINVAL; } + 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_pr_dbg("Calling SOC Wake request"); if (atomic_read(&priv->soc_wake_ref_count)) { @@ -2350,6 +2356,7 @@ EXPORT_SYMBOL(icnss_force_wake_request); int icnss_force_wake_release(struct device *dev) { struct icnss_priv *priv = dev_get_drvdata(dev); + int count = 0; if (!dev) return -ENODEV; @@ -2359,6 +2366,13 @@ int icnss_force_wake_release(struct device *dev) return -EINVAL; } + if (atomic_read(&priv->soc_wake_ref_count) > 1) { + count = atomic_dec_return(&priv->soc_wake_ref_count); + icnss_pr_dbg("SOC previous release pending, Ref count: %d", + count); + return 0; + } + icnss_pr_dbg("Calling SOC Wake response"); icnss_soc_wake_event_post(priv, ICNSS_SOC_WAKE_RELEASE_EVENT,