From: Wen Gong <wgong@codeaurora.org>
To: ath10k@lists.infradead.org
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH v4 1/2] ath10k: add refcount for ath10k_core_restart
Date: Wed, 8 Jan 2020 11:19:56 +0800 [thread overview]
Message-ID: <20200108031957.22308-2-wgong@codeaurora.org> (raw)
In-Reply-To: <20200108031957.22308-1-wgong@codeaurora.org>
When it has more than one restart_work queued meanwhile, the 2nd
restart_work is very esay to break the 1st restart work and lead
recovery fail.
Add a ref count to allow only one restart work running untill
device successfully recovered.
Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00029.
Signed-off-by: Wen Gong <wgong@codeaurora.org>
---
drivers/net/wireless/ath/ath10k/core.c | 13 +++++++++++++
drivers/net/wireless/ath/ath10k/core.h | 2 ++
drivers/net/wireless/ath/ath10k/mac.c | 1 +
3 files changed, 16 insertions(+)
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 91f131b87efc..0e31846e6c89 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -2199,6 +2199,14 @@ static void ath10k_core_restart(struct work_struct *work)
{
struct ath10k *ar = container_of(work, struct ath10k, restart_work);
int ret;
+ int restart_count;
+
+ restart_count = atomic_add_return(1, &ar->restart_count);
+ if (restart_count > 1) {
+ ath10k_warn(ar, "can not restart, count: %d\n", restart_count);
+ atomic_dec(&ar->restart_count);
+ return;
+ }
set_bit(ATH10K_FLAG_CRASH_FLUSH, &ar->dev_flags);
@@ -2231,6 +2239,11 @@ static void ath10k_core_restart(struct work_struct *work)
mutex_lock(&ar->conf_mutex);
+ if (ar->state != ATH10K_STATE_ON) {
+ ath10k_warn(ar, "state is not on: %d\n", ar->state);
+ atomic_dec(&ar->restart_count);
+ }
+
switch (ar->state) {
case ATH10K_STATE_ON:
ar->state = ATH10K_STATE_RESTARTING;
diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index e57b2e7235e3..810c99f2dc0e 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -982,6 +982,8 @@ struct ath10k {
/* protected by conf_mutex */
u8 ps_state_enable;
+ atomic_t restart_count;
+
bool nlo_enabled;
bool p2p;
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 3856edba7915..bc1574145e66 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -7208,6 +7208,7 @@ static void ath10k_reconfig_complete(struct ieee80211_hw *hw,
ath10k_info(ar, "device successfully recovered\n");
ar->state = ATH10K_STATE_ON;
ieee80211_wake_queues(ar->hw);
+ atomic_dec(&ar->restart_count);
}
mutex_unlock(&ar->conf_mutex);
--
2.23.0
next prev parent reply other threads:[~2020-01-08 3:20 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-08 3:19 [PATCH v4 0/2] start recovery process when payload length overflow for sdio Wen Gong
2020-01-08 3:19 ` Wen Gong [this message]
2020-01-08 12:02 ` [PATCH v4 1/2] ath10k: add refcount for ath10k_core_restart Justin Capella
2020-01-10 10:29 ` Wen Gong
2020-01-17 7:19 ` Wen Gong
2020-01-20 9:38 ` Justin Capella
2020-01-20 13:34 ` Wen Gong
2020-01-20 15:37 ` Justin Capella
2020-08-14 17:19 ` Kalle Valo
2020-08-18 8:39 ` Wen Gong
2020-09-07 15:52 ` Kalle Valo
2020-08-19 12:01 ` Wen Gong
2020-08-20 9:18 ` Wen Gong
2020-08-24 4:36 ` Wen Gong
2020-09-07 15:55 ` Kalle Valo
[not found] ` <871rjd37kz.fsf@codeaurora.org>
2020-09-08 3:47 ` Wen Gong
2020-01-08 3:19 ` [PATCH v4 2/2] ath10k: start recovery process when payload length exceeds max htc length for sdio Wen Gong
2020-08-14 15:37 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200108031957.22308-2-wgong@codeaurora.org \
--to=wgong@codeaurora.org \
--cc=ath10k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).