From: Dmitry Antipov <dmantipov@yandex.ru>
To: Kalle Valo <kvalo@kernel.org>
Cc: linux-wireless@vger.kernel.org, Dmitry Antipov <dmantipov@yandex.ru>
Subject: [PATCH] wifi: ath10k: convert msecs to jiffies where needed
Date: Mon, 26 Jun 2023 18:14:29 +0300 [thread overview]
Message-ID: <20230626151636.314868-1-dmantipov@yandex.ru> (raw)
Since 'mod_timer()' assumes expire time in jiffies and not milliseconds,
'msecs_to_jiffies()' should be used in 'ath10k_pci_rx_post_pipe()' and
'ath10k_snoc_rx_post_pipe()'.
This patch also introduces a minor refactoring and fixes number of loop
iterations in 'ath10k_pci_rx_post_pipe()' (I assume that the number of
calls of '__ath10k_pci_rx_post_buf()' should be equal to number of buffers
returned by '__ath10k_ce_rx_num_free_bufs()' and not plus one).
Fixes: a6e149a9ff03 ("ath10k: add hif start/stop methods for wcn3990 snoc layer")
Fixes: 728f95eef523 ("ath10k: rework posting pci rx buffers")
Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
---
drivers/net/wireless/ath/ath10k/pci.c | 20 ++++++++++----------
drivers/net/wireless/ath/ath10k/snoc.c | 18 ++++++++++--------
2 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index a7f44f6335fb..18eca7a2154a 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -818,17 +818,17 @@ static void ath10k_pci_rx_post_pipe(struct ath10k_pci_pipe *pipe)
num = __ath10k_ce_rx_num_free_bufs(ce_pipe);
spin_unlock_bh(&ce->ce_lock);
- while (num >= 0) {
+ while (num--) {
ret = __ath10k_pci_rx_post_buf(pipe);
- if (ret) {
- if (ret == -ENOSPC)
- break;
- ath10k_warn(ar, "failed to post pci rx buf: %d\n", ret);
- mod_timer(&ar_pci->rx_post_retry, jiffies +
- ATH10K_PCI_RX_POST_RETRY_MS);
- break;
- }
- num--;
+ if (unlikely(ret))
+ goto err;
+ }
+ return;
+err:
+ if (ret != -ENOSPC) {
+ ath10k_warn(ar, "failed to post pci rx buf: %d\n", ret);
+ mod_timer(&ar_pci->rx_post_retry, jiffies +
+ msecs_to_jiffies(ATH10K_PCI_RX_POST_RETRY_MS));
}
}
diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c
index 26214c00cd0d..9d180d02cc7c 100644
--- a/drivers/net/wireless/ath/ath10k/snoc.c
+++ b/drivers/net/wireless/ath/ath10k/snoc.c
@@ -544,16 +544,18 @@ static void ath10k_snoc_rx_post_pipe(struct ath10k_snoc_pipe *pipe)
spin_lock_bh(&ce->ce_lock);
num = __ath10k_ce_rx_num_free_bufs(ce_pipe);
spin_unlock_bh(&ce->ce_lock);
+
while (num--) {
ret = __ath10k_snoc_rx_post_buf(pipe);
- if (ret) {
- if (ret == -ENOSPC)
- break;
- ath10k_warn(ar, "failed to post rx buf: %d\n", ret);
- mod_timer(&ar_snoc->rx_post_retry, jiffies +
- ATH10K_SNOC_RX_POST_RETRY_MS);
- break;
- }
+ if (unlikely(ret))
+ goto err;
+ }
+ return;
+err:
+ if (ret != -ENOSPC) {
+ ath10k_warn(ar, "failed to post rx buf: %d\n", ret);
+ mod_timer(&ar_snoc->rx_post_retry, jiffies +
+ msecs_to_jiffies(ATH10K_SNOC_RX_POST_RETRY_MS));
}
}
--
2.41.0
next reply other threads:[~2023-06-26 15:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-26 15:14 Dmitry Antipov [this message]
2023-10-03 14:16 ` [PATCH] wifi: ath10k: convert msecs to jiffies where needed 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=20230626151636.314868-1-dmantipov@yandex.ru \
--to=dmantipov@yandex.ru \
--cc=kvalo@kernel.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).