From: Wen Gong <wgong@codeaurora.org>
To: ath10k@lists.infradead.org
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH v2 2/7] ath10k: change max RX bundle size from 8 to 32 for sdio
Date: Tue, 27 Aug 2019 19:01:42 +0800 [thread overview]
Message-ID: <1566903707-27536-3-git-send-email-wgong@codeaurora.org> (raw)
In-Reply-To: <1566903707-27536-1-git-send-email-wgong@codeaurora.org>
The max bundle size support by firmware is 32, change it from 8 to 32
will help performance. This results in significant performance
improvement on RX path.
Tested with QCA6174 SDIO with firmware
WLAN.RMH.4.4.1-00007-QCARMSWP-1.
Signed-off-by: Wen Gong <wgong@codeaurora.org>
---
drivers/net/wireless/ath/ath10k/htc.h | 6 +++++-
drivers/net/wireless/ath/ath10k/sdio.c | 6 +++---
drivers/net/wireless/ath/ath10k/sdio.h | 4 ++--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
index f55d3ca..8a07da0 100644
--- a/drivers/net/wireless/ath/ath10k/htc.h
+++ b/drivers/net/wireless/ath/ath10k/htc.h
@@ -39,7 +39,7 @@
* 4-byte aligned.
*/
-#define HTC_HOST_MAX_MSG_PER_RX_BUNDLE 8
+#define HTC_HOST_MAX_MSG_PER_RX_BUNDLE 32
enum ath10k_htc_tx_flags {
ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE = 0x01,
@@ -52,6 +52,10 @@ enum ath10k_htc_rx_flags {
ATH10K_HTC_FLAG_BUNDLE_MASK = 0xF0
};
+#define HTC_GET_BUNDLE_COUNT(flags) \
+ (FIELD_GET(ATH10K_HTC_FLAG_BUNDLE_MASK, (flags)) + \
+ (FIELD_GET(GENMASK(3, 2), (flags)) << 4))
+
struct ath10k_htc_hdr {
u8 eid; /* @enum ath10k_htc_ep_id */
u8 flags; /* @enum ath10k_htc_tx_flags, ath10k_htc_rx_flags */
diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c
index eacb4d5..e5c365e 100644
--- a/drivers/net/wireless/ath/ath10k/sdio.c
+++ b/drivers/net/wireless/ath/ath10k/sdio.c
@@ -24,8 +24,8 @@
#include "trace.h"
#include "sdio.h"
-#define ATH10K_SDIO_DMA_BUF_SIZE (32 * 1024)
-#define ATH10K_SDIO_VSG_BUF_SIZE (32 * 1024)
+#define ATH10K_SDIO_DMA_BUF_SIZE (64 * 1024)
+#define ATH10K_SDIO_VSG_BUF_SIZE (64 * 1024)
/* inlined helper functions */
@@ -495,7 +495,7 @@ static int ath10k_sdio_mbox_alloc_bundle(struct ath10k *ar,
{
int ret, i;
- *bndl_cnt = FIELD_GET(ATH10K_HTC_FLAG_BUNDLE_MASK, htc_hdr->flags);
+ *bndl_cnt = HTC_GET_BUNDLE_COUNT(htc_hdr->flags);
if (*bndl_cnt > HTC_HOST_MAX_MSG_PER_RX_BUNDLE) {
ath10k_warn(ar,
diff --git a/drivers/net/wireless/ath/ath10k/sdio.h b/drivers/net/wireless/ath/ath10k/sdio.h
index 4896eca..3ca76c7 100644
--- a/drivers/net/wireless/ath/ath10k/sdio.h
+++ b/drivers/net/wireless/ath/ath10k/sdio.h
@@ -89,10 +89,10 @@
* to the maximum value (HTC_HOST_MAX_MSG_PER_RX_BUNDLE).
*
* in this case the driver must allocate
- * (HTC_HOST_MAX_MSG_PER_RX_BUNDLE * HTC_HOST_MAX_MSG_PER_RX_BUNDLE) skb's.
+ * (HTC_HOST_MAX_MSG_PER_RX_BUNDLE * 2) skb's.
*/
#define ATH10K_SDIO_MAX_RX_MSGS \
- (HTC_HOST_MAX_MSG_PER_RX_BUNDLE * HTC_HOST_MAX_MSG_PER_RX_BUNDLE)
+ (HTC_HOST_MAX_MSG_PER_RX_BUNDLE * 2)
#define ATH10K_FIFO_TIMEOUT_AND_CHIP_CONTROL 0x00000868u
#define ATH10K_FIFO_TIMEOUT_AND_CHIP_CONTROL_DISABLE_SLEEP_OFF 0xFFFEFFFF
--
1.9.1
next prev parent reply other threads:[~2019-08-27 11:02 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-27 11:01 [PATCH v2 0/7] ath10k: improve throughout of tcp/udp TX/RX of sdio Wen Gong
2019-08-27 11:01 ` [PATCH v2 1/7] ath10k: enable RX bundle receive for sdio Wen Gong
2019-08-27 11:23 ` Nicolas Boichat
2019-08-28 4:28 ` Wen Gong
2019-08-28 5:09 ` Nicolas Boichat
2019-08-30 2:48 ` Wen Gong
2019-08-27 11:01 ` Wen Gong [this message]
2019-08-28 4:28 ` [PATCH v2 2/7] ath10k: change max RX bundle size from 8 to 32 " Wen Gong
2019-08-28 5:13 ` Nicolas Boichat
2019-08-30 2:48 ` Wen Gong
2019-08-27 11:01 ` [PATCH v2 3/7] ath10k: add workqueue for RX path of sdio Wen Gong
2019-08-28 5:16 ` Nicolas Boichat
2019-08-30 2:49 ` Wen Gong
2019-08-27 11:01 ` [PATCH v2 4/7] ath10k: disable TX complete indication of htt for sdio Wen Gong
2019-08-28 4:29 ` Wen Gong
2019-08-28 5:27 ` Nicolas Boichat
2019-08-28 12:59 ` Wen Gong
2019-08-30 2:50 ` Wen Gong
2019-08-27 11:01 ` [PATCH v2 5/7] ath10k: add htt TX bundle " Wen Gong
2019-08-28 5:36 ` Nicolas Boichat
2019-08-28 13:03 ` Wen Gong
2019-08-30 2:51 ` Wen Gong
2019-08-27 11:01 ` [PATCH v2 6/7] ath10k: enable alt data of TX path " Wen Gong
2019-08-28 5:38 ` Nicolas Boichat
2019-08-30 2:52 ` Wen Gong
2019-08-27 11:01 ` [PATCH v2 7/7] ath10k: enable napi on RX " Wen Gong
2019-08-28 5:39 ` Nicolas Boichat
2019-08-30 2:52 ` Wen Gong
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=1566903707-27536-3-git-send-email-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