From: Rakesh Pillai <pillair@codeaurora.org> To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, kvalo@codeaurora.org, johannes@sipsolutions.net, davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org, dianders@chromium.org, evgreen@chromium.org, Rakesh Pillai <pillair@codeaurora.org> Subject: [RFC 7/7] ath10k: Handle rx thread suspend and resume Date: Tue, 21 Jul 2020 22:44:26 +0530 [thread overview] Message-ID: <1595351666-28193-8-git-send-email-pillair@codeaurora.org> (raw) In-Reply-To: <1595351666-28193-1-git-send-email-pillair@codeaurora.org> During the system suspend or resume, the rx thread also needs to be suspended or resume respectively. Handle the rx thread as well during the system suspend and resume. Tested-on: WCN3990 hw1.0 SNOC WLAN.HL.3.1-01040-QCAHLSWMTPLZ-1 Signed-off-by: Rakesh Pillai <pillair@codeaurora.org> --- drivers/net/wireless/ath/ath10k/core.c | 23 ++++++++++++++++++ drivers/net/wireless/ath/ath10k/core.h | 5 ++++ drivers/net/wireless/ath/ath10k/snoc.c | 44 +++++++++++++++++++++++++++++++++- 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 4064fa2..b82b355 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -668,6 +668,27 @@ static unsigned int ath10k_core_get_fw_feature_str(char *buf, return scnprintf(buf, buf_len, "%s", ath10k_core_fw_feature_str[feat]); } +int ath10k_core_thread_suspend(struct ath10k_thread *thread) +{ + ath10k_dbg(thread->ar, ATH10K_DBG_BOOT, "Suspending thread %s\n", + thread->name); + set_bit(ATH10K_THREAD_EVENT_SUSPEND, thread->event_flags); + wait_for_completion(&thread->suspend); + + return 0; +} +EXPORT_SYMBOL(ath10k_core_thread_suspend); + +int ath10k_core_thread_resume(struct ath10k_thread *thread) +{ + ath10k_dbg(thread->ar, ATH10K_DBG_BOOT, "Resuming thread %s\n", + thread->name); + complete(&thread->resume); + + return 0; +} +EXPORT_SYMBOL(ath10k_core_thread_resume); + void ath10k_core_thread_post_event(struct ath10k_thread *thread, enum ath10k_thread_events event) { @@ -700,6 +721,8 @@ int ath10k_core_thread_init(struct ath10k *ar, init_waitqueue_head(&thread->wait_q); init_completion(&thread->shutdown); + init_completion(&thread->suspend); + init_completion(&thread->resume); memcpy(thread->name, thread_name, ATH10K_THREAD_NAME_SIZE_MAX); clear_bit(ATH10K_THREAD_EVENT_SHUTDOWN, thread->event_flags); ath10k_info(ar, "Starting thread %s\n", thread_name); diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 596d31b..df65e75 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -976,6 +976,7 @@ enum ath10k_thread_events { ATH10K_THREAD_EVENT_SHUTDOWN, ATH10K_THREAD_EVENT_RX_POST, ATH10K_THREAD_EVENT_TX_POST, + ATH10K_THREAD_EVENT_SUSPEND, ATH10K_THREAD_EVENT_MAX, }; @@ -983,6 +984,8 @@ struct ath10k_thread { struct ath10k *ar; struct task_struct *task; struct completion shutdown; + struct completion suspend; + struct completion resume; wait_queue_head_t wait_q; DECLARE_BITMAP(event_flags, ATH10K_THREAD_EVENT_MAX); char name[ATH10K_THREAD_NAME_SIZE_MAX]; @@ -1296,6 +1299,8 @@ static inline bool ath10k_peer_stats_enabled(struct ath10k *ar) extern unsigned long ath10k_coredump_mask; +int ath10k_core_thread_suspend(struct ath10k_thread *thread); +int ath10k_core_thread_resume(struct ath10k_thread *thread); void ath10k_core_thread_post_event(struct ath10k_thread *thread, enum ath10k_thread_events event); int ath10k_core_thread_shutdown(struct ath10k *ar, diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c index 3eb5eac..a373b2b 100644 --- a/drivers/net/wireless/ath/ath10k/snoc.c +++ b/drivers/net/wireless/ath/ath10k/snoc.c @@ -932,13 +932,31 @@ int ath10k_snoc_rx_thread_loop(void *data) rx_thread->event_flags) || test_and_clear_bit(ATH10K_THREAD_EVENT_TX_POST, rx_thread->event_flags) || + test_bit(ATH10K_THREAD_EVENT_SUSPEND, + rx_thread->event_flags) || test_bit(ATH10K_THREAD_EVENT_SHUTDOWN, rx_thread->event_flags))); + if (test_and_clear_bit(ATH10K_THREAD_EVENT_SUSPEND, + rx_thread->event_flags)) { + complete(&rx_thread->suspend); + ath10k_info(ar, "rx thread suspend\n"); + wait_for_completion(&rx_thread->resume); + ath10k_info(ar, "rx thread resume\n"); + } + ath10k_htt_txrx_compl_task(ar, thread_budget); if (test_and_clear_bit(ATH10K_THREAD_EVENT_SHUTDOWN, rx_thread->event_flags)) shutdown = true; + + if (test_and_clear_bit(ATH10K_THREAD_EVENT_SUSPEND, + rx_thread->event_flags)) { + complete(&rx_thread->suspend); + ath10k_info(ar, "rx thread suspend\n"); + wait_for_completion(&rx_thread->resume); + ath10k_info(ar, "rx thread resume\n"); + } } ath10k_dbg(ar, ATH10K_DBG_SNOC, "rx thread exiting\n"); @@ -1133,15 +1151,30 @@ static int ath10k_snoc_hif_suspend(struct ath10k *ar) if (!device_may_wakeup(ar->dev)) return -EPERM; + if (ar->rx_thread_enable) { + ret = ath10k_core_thread_suspend(&ar->rx_thread); + if (ret) { + ath10k_err(ar, "failed to suspend rx_thread, %d\n", + ret); + return ret; + } + } + ret = enable_irq_wake(ar_snoc->ce_irqs[ATH10K_SNOC_WAKE_IRQ].irq_line); if (ret) { ath10k_err(ar, "failed to enable wakeup irq :%d\n", ret); - return ret; + goto fail; } ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc device suspended\n"); return ret; + +fail: + if (ar->rx_thread_enable) + ath10k_core_thread_resume(&ar->rx_thread); + + return ret; } static int ath10k_snoc_hif_resume(struct ath10k *ar) @@ -1158,6 +1191,15 @@ static int ath10k_snoc_hif_resume(struct ath10k *ar) return ret; } + if (ar->rx_thread_enable) { + ret = ath10k_core_thread_resume(&ar->rx_thread); + if (ret) { + ath10k_err(ar, "failed to suspend rx_thread, %d\n", + ret); + return ret; + } + } + ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc device resumed\n"); return ret; -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Rakesh Pillai <pillair@codeaurora.org> To: ath10k@lists.infradead.org Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, evgreen@chromium.org, dianders@chromium.org, Rakesh Pillai <pillair@codeaurora.org>, kuba@kernel.org, johannes@sipsolutions.net, davem@davemloft.net, kvalo@codeaurora.org Subject: [RFC 7/7] ath10k: Handle rx thread suspend and resume Date: Tue, 21 Jul 2020 22:44:26 +0530 [thread overview] Message-ID: <1595351666-28193-8-git-send-email-pillair@codeaurora.org> (raw) In-Reply-To: <1595351666-28193-1-git-send-email-pillair@codeaurora.org> During the system suspend or resume, the rx thread also needs to be suspended or resume respectively. Handle the rx thread as well during the system suspend and resume. Tested-on: WCN3990 hw1.0 SNOC WLAN.HL.3.1-01040-QCAHLSWMTPLZ-1 Signed-off-by: Rakesh Pillai <pillair@codeaurora.org> --- drivers/net/wireless/ath/ath10k/core.c | 23 ++++++++++++++++++ drivers/net/wireless/ath/ath10k/core.h | 5 ++++ drivers/net/wireless/ath/ath10k/snoc.c | 44 +++++++++++++++++++++++++++++++++- 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 4064fa2..b82b355 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -668,6 +668,27 @@ static unsigned int ath10k_core_get_fw_feature_str(char *buf, return scnprintf(buf, buf_len, "%s", ath10k_core_fw_feature_str[feat]); } +int ath10k_core_thread_suspend(struct ath10k_thread *thread) +{ + ath10k_dbg(thread->ar, ATH10K_DBG_BOOT, "Suspending thread %s\n", + thread->name); + set_bit(ATH10K_THREAD_EVENT_SUSPEND, thread->event_flags); + wait_for_completion(&thread->suspend); + + return 0; +} +EXPORT_SYMBOL(ath10k_core_thread_suspend); + +int ath10k_core_thread_resume(struct ath10k_thread *thread) +{ + ath10k_dbg(thread->ar, ATH10K_DBG_BOOT, "Resuming thread %s\n", + thread->name); + complete(&thread->resume); + + return 0; +} +EXPORT_SYMBOL(ath10k_core_thread_resume); + void ath10k_core_thread_post_event(struct ath10k_thread *thread, enum ath10k_thread_events event) { @@ -700,6 +721,8 @@ int ath10k_core_thread_init(struct ath10k *ar, init_waitqueue_head(&thread->wait_q); init_completion(&thread->shutdown); + init_completion(&thread->suspend); + init_completion(&thread->resume); memcpy(thread->name, thread_name, ATH10K_THREAD_NAME_SIZE_MAX); clear_bit(ATH10K_THREAD_EVENT_SHUTDOWN, thread->event_flags); ath10k_info(ar, "Starting thread %s\n", thread_name); diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 596d31b..df65e75 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -976,6 +976,7 @@ enum ath10k_thread_events { ATH10K_THREAD_EVENT_SHUTDOWN, ATH10K_THREAD_EVENT_RX_POST, ATH10K_THREAD_EVENT_TX_POST, + ATH10K_THREAD_EVENT_SUSPEND, ATH10K_THREAD_EVENT_MAX, }; @@ -983,6 +984,8 @@ struct ath10k_thread { struct ath10k *ar; struct task_struct *task; struct completion shutdown; + struct completion suspend; + struct completion resume; wait_queue_head_t wait_q; DECLARE_BITMAP(event_flags, ATH10K_THREAD_EVENT_MAX); char name[ATH10K_THREAD_NAME_SIZE_MAX]; @@ -1296,6 +1299,8 @@ static inline bool ath10k_peer_stats_enabled(struct ath10k *ar) extern unsigned long ath10k_coredump_mask; +int ath10k_core_thread_suspend(struct ath10k_thread *thread); +int ath10k_core_thread_resume(struct ath10k_thread *thread); void ath10k_core_thread_post_event(struct ath10k_thread *thread, enum ath10k_thread_events event); int ath10k_core_thread_shutdown(struct ath10k *ar, diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c index 3eb5eac..a373b2b 100644 --- a/drivers/net/wireless/ath/ath10k/snoc.c +++ b/drivers/net/wireless/ath/ath10k/snoc.c @@ -932,13 +932,31 @@ int ath10k_snoc_rx_thread_loop(void *data) rx_thread->event_flags) || test_and_clear_bit(ATH10K_THREAD_EVENT_TX_POST, rx_thread->event_flags) || + test_bit(ATH10K_THREAD_EVENT_SUSPEND, + rx_thread->event_flags) || test_bit(ATH10K_THREAD_EVENT_SHUTDOWN, rx_thread->event_flags))); + if (test_and_clear_bit(ATH10K_THREAD_EVENT_SUSPEND, + rx_thread->event_flags)) { + complete(&rx_thread->suspend); + ath10k_info(ar, "rx thread suspend\n"); + wait_for_completion(&rx_thread->resume); + ath10k_info(ar, "rx thread resume\n"); + } + ath10k_htt_txrx_compl_task(ar, thread_budget); if (test_and_clear_bit(ATH10K_THREAD_EVENT_SHUTDOWN, rx_thread->event_flags)) shutdown = true; + + if (test_and_clear_bit(ATH10K_THREAD_EVENT_SUSPEND, + rx_thread->event_flags)) { + complete(&rx_thread->suspend); + ath10k_info(ar, "rx thread suspend\n"); + wait_for_completion(&rx_thread->resume); + ath10k_info(ar, "rx thread resume\n"); + } } ath10k_dbg(ar, ATH10K_DBG_SNOC, "rx thread exiting\n"); @@ -1133,15 +1151,30 @@ static int ath10k_snoc_hif_suspend(struct ath10k *ar) if (!device_may_wakeup(ar->dev)) return -EPERM; + if (ar->rx_thread_enable) { + ret = ath10k_core_thread_suspend(&ar->rx_thread); + if (ret) { + ath10k_err(ar, "failed to suspend rx_thread, %d\n", + ret); + return ret; + } + } + ret = enable_irq_wake(ar_snoc->ce_irqs[ATH10K_SNOC_WAKE_IRQ].irq_line); if (ret) { ath10k_err(ar, "failed to enable wakeup irq :%d\n", ret); - return ret; + goto fail; } ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc device suspended\n"); return ret; + +fail: + if (ar->rx_thread_enable) + ath10k_core_thread_resume(&ar->rx_thread); + + return ret; } static int ath10k_snoc_hif_resume(struct ath10k *ar) @@ -1158,6 +1191,15 @@ static int ath10k_snoc_hif_resume(struct ath10k *ar) return ret; } + if (ar->rx_thread_enable) { + ret = ath10k_core_thread_resume(&ar->rx_thread); + if (ret) { + ath10k_err(ar, "failed to suspend rx_thread, %d\n", + ret); + return ret; + } + } + ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc device resumed\n"); return ret; -- 2.7.4 _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2020-07-21 17:15 UTC|newest] Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-21 17:14 [RFC 0/7] Add support to process rx packets in thread Rakesh Pillai 2020-07-21 17:14 ` Rakesh Pillai 2020-07-21 17:14 ` [RFC 1/7] mac80211: Add check for napi handle before WARN_ON Rakesh Pillai 2020-07-21 17:14 ` Rakesh Pillai 2020-07-22 12:56 ` Johannes Berg 2020-07-22 12:56 ` Johannes Berg 2020-07-23 18:26 ` Rakesh Pillai 2020-07-23 18:26 ` Rakesh Pillai 2020-07-23 20:06 ` Johannes Berg 2020-07-23 20:06 ` Johannes Berg 2020-07-24 6:21 ` Rakesh Pillai 2020-07-24 6:21 ` Rakesh Pillai 2020-07-26 16:19 ` Rakesh Pillai 2020-07-26 16:19 ` Rakesh Pillai 2020-07-30 12:40 ` Johannes Berg 2020-07-30 12:40 ` Johannes Berg 2020-07-21 17:14 ` [RFC 2/7] ath10k: Add support to process rx packet in thread Rakesh Pillai 2020-07-21 17:14 ` Rakesh Pillai 2020-07-21 21:53 ` Rajkumar Manoharan 2020-07-21 21:53 ` Rajkumar Manoharan 2020-07-22 12:27 ` Felix Fietkau 2020-07-22 12:27 ` Felix Fietkau 2020-07-22 12:55 ` Johannes Berg 2020-07-22 12:55 ` Johannes Berg 2020-07-22 13:00 ` Felix Fietkau 2020-07-22 13:00 ` Felix Fietkau 2020-07-23 6:09 ` Rajkumar Manoharan 2020-07-23 6:09 ` Rajkumar Manoharan 2021-03-22 23:57 ` Ben Greear 2021-03-22 23:57 ` Ben Greear 2021-03-23 1:20 ` Brian Norris 2021-03-23 1:20 ` Brian Norris 2021-03-23 3:01 ` Ben Greear 2021-03-23 3:01 ` Ben Greear 2021-03-23 7:45 ` Felix Fietkau 2021-03-23 7:45 ` Felix Fietkau 2021-03-25 9:45 ` Rakesh Pillai 2021-03-25 9:45 ` Rakesh Pillai 2021-03-25 10:33 ` Felix Fietkau 2021-03-25 10:33 ` Felix Fietkau 2020-07-23 18:25 ` Rakesh Pillai 2020-07-23 18:25 ` Rakesh Pillai 2020-07-24 23:11 ` Jacob Keller 2020-07-24 23:11 ` Jacob Keller 2020-07-21 17:14 ` [RFC 3/7] ath10k: Add module param to enable rx thread Rakesh Pillai 2020-07-21 17:14 ` Rakesh Pillai 2020-07-21 17:14 ` [RFC 4/7] ath10k: Do not exhaust budget on process tx completion Rakesh Pillai 2020-07-21 17:14 ` Rakesh Pillai 2020-07-21 17:14 ` [RFC 5/7] ath10k: Handle the rx packet processing in thread Rakesh Pillai 2020-07-21 17:14 ` Rakesh Pillai 2020-07-21 17:14 ` [RFC 6/7] ath10k: Add deliver to stack from thread context Rakesh Pillai 2020-07-21 17:14 ` Rakesh Pillai 2020-07-21 17:14 ` Rakesh Pillai [this message] 2020-07-21 17:14 ` [RFC 7/7] ath10k: Handle rx thread suspend and resume Rakesh Pillai 2020-07-23 23:06 ` Sebastian Gottschall 2020-07-23 23:06 ` Sebastian Gottschall 2020-07-24 6:19 ` Rakesh Pillai 2020-07-24 6:19 ` Rakesh Pillai 2020-07-21 17:25 ` [RFC 0/7] Add support to process rx packets in thread Andrew Lunn 2020-07-21 17:25 ` Andrew Lunn 2020-07-21 18:05 ` Florian Fainelli 2020-07-21 18:05 ` Florian Fainelli 2020-07-23 18:21 ` Rakesh Pillai 2020-07-23 18:21 ` Rakesh Pillai 2020-07-23 19:02 ` Florian Fainelli 2020-07-23 19:02 ` Florian Fainelli 2020-07-24 6:20 ` Rakesh Pillai 2020-07-24 6:20 ` Rakesh Pillai 2020-07-24 22:28 ` Florian Fainelli 2020-07-24 22:28 ` Florian Fainelli 2020-07-22 9:12 ` David Laight 2020-07-22 9:12 ` David Laight 2020-07-25 8:16 ` Hillf Danton 2020-07-25 10:38 ` Sebastian Gottschall 2020-07-25 10:38 ` Sebastian Gottschall 2020-07-25 12:25 ` Hillf Danton 2020-07-25 14:08 ` Sebastian Gottschall 2020-07-25 14:08 ` Sebastian Gottschall 2020-07-25 14:57 ` Hillf Danton 2020-07-25 15:41 ` Sebastian Gottschall 2020-07-25 15:41 ` Sebastian Gottschall 2020-07-26 11:16 ` David Laight 2020-07-26 11:16 ` David Laight 2020-07-28 16:59 ` Rakesh Pillai 2020-07-28 16:59 ` Rakesh Pillai 2020-07-29 1:34 ` Hillf Danton 2020-07-25 17:57 ` Felix Fietkau 2020-07-25 17:57 ` Felix Fietkau 2020-07-26 1:22 ` Hillf Danton 2020-07-26 8:10 ` Felix Fietkau 2020-07-26 8:10 ` Felix Fietkau 2020-07-26 8:32 ` Hillf Danton 2020-07-26 8:59 ` Felix Fietkau 2020-07-26 8:59 ` Felix Fietkau 2020-07-22 16:20 ` Jakub Kicinski 2020-07-22 16:20 ` Jakub Kicinski
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=1595351666-28193-8-git-send-email-pillair@codeaurora.org \ --to=pillair@codeaurora.org \ --cc=ath10k@lists.infradead.org \ --cc=davem@davemloft.net \ --cc=dianders@chromium.org \ --cc=evgreen@chromium.org \ --cc=johannes@sipsolutions.net \ --cc=kuba@kernel.org \ --cc=kvalo@codeaurora.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-wireless@vger.kernel.org \ --cc=netdev@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.