The bottleneck of throughout on sdio chip is the bus bandwidth, to the
patches are all to increase the use ratio of sdio bus.
udp-rx udp-tx tcp-rx tcp-tx
without patches(Mbps) 320 180 170 151
with patches(Mbps) 450 410 400 320
These patches only affect sdio bus chip, explanation is mentioned in each
patch's commit log.
Alagu Sankar (1):
ath10k: enable RX bundle receive for sdio
v2: fix incorrect skb tail of rx bundle in ath10k_sdio_mbox_rx_process_packet
Wen Gong (6):
ath10k: change max RX bundle size from 8 to 32 for sdio
v2: change macro HTC_GET_BUNDLE_COUNT
ath10k: add workqueue for RX path of sdio
ath10k: disable TX complete indication of htt for sdio
v2: change some code style
ath10k: add htt TX bundle for sdio
ath10k: enable alt data of TX path for sdio
ath10k: enable napi on RX path for sdio
drivers/net/wireless/ath/ath10k/core.c | 36 ++-
drivers/net/wireless/ath/ath10k/core.h | 4 +-
drivers/net/wireless/ath/ath10k/hif.h | 9 +
drivers/net/wireless/ath/ath10k/htc.c | 374 ++++++++++++++++++++++++++++---
drivers/net/wireless/ath/ath10k/htc.h | 41 +++-
drivers/net/wireless/ath/ath10k/htt.c | 15 ++
drivers/net/wireless/ath/ath10k/htt.h | 20 +-
drivers/net/wireless/ath/ath10k/htt_rx.c | 82 ++++++-
drivers/net/wireless/ath/ath10k/htt_tx.c | 37 ++-
drivers/net/wireless/ath/ath10k/hw.h | 2 +-
drivers/net/wireless/ath/ath10k/sdio.c | 292 +++++++++++++++++++++---
drivers/net/wireless/ath/ath10k/sdio.h | 31 ++-
12 files changed, 850 insertions(+), 93 deletions(-)
--
1.9.1
The default credit size is 1792 bytes, but the IP mtu is 1500 bytes,
then it has about 290 bytes's waste for each data packet on sdio
transfer path for TX bundle, it will reduce the transmission utilization
ratio for data packet.
This patch enable the small credit size in firmware, firmware will use
the new credit size 1556 bytes, it will increase the transmission
utilization ratio for data packet on TX patch. It results in significant
performance improvement on TX path.
This patch only effect sdio chip, it will not effect PCI, SNOC etc.
Tested with QCA6174 SDIO with firmware
WLAN.RMH.4.4.1-00017-QCARMSWP-1.
Signed-off-by: Wen Gong <[email protected]>
---
drivers/net/wireless/ath/ath10k/core.c | 16 ++++++++++++++++
drivers/net/wireless/ath/ath10k/htc.c | 11 +++++++++--
drivers/net/wireless/ath/ath10k/htc.h | 11 +++++++++--
3 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 351f4ed..7593d19 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -31,6 +31,7 @@
static unsigned int ath10k_cryptmode_param;
static bool uart_print;
static bool disable_tx_comp = true;
+static bool alt_data = true;
static bool skip_otp;
static bool rawmode;
static bool fw_diag_log;
@@ -45,6 +46,15 @@
/* If upper layer need the TX complete status, it can enable tx complete */
module_param(disable_tx_comp, bool, 0644);
+
+/* alt_data is only used for sdio chip, for previous version of firmware, its
+ * alt data size is 1544 which is not enough for native wifi, so it need to
+ * alt_data for the firmware.
+ * If the firmware has changed alt data size to 1556, then it can enable
+ * alt_data for the firmware.
+ * alt_data will not effect PCI, SNOC etc.
+ */
+module_param(alt_data, bool, 0644);
module_param(skip_otp, bool, 0644);
module_param(rawmode, bool, 0644);
module_param(fw_diag_log, bool, 0644);
@@ -701,6 +711,12 @@ static void ath10k_init_sdio(struct ath10k *ar, enum ath10k_firmware_mode mode)
*/
param &= ~HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE;
+ /* If alternate credit size of 1556 as used by SDIO firmware is
+ * big enough for mac80211 / native wifi frames. enable it
+ */
+ if (alt_data && mode == ATH10K_FIRMWARE_MODE_NORMAL)
+ param |= HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE;
+
if (mode == ATH10K_FIRMWARE_MODE_UTF)
param &= ~HI_ACS_FLAGS_SDIO_SWAP_MAILBOX_SET;
else
diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
index e0eb5f0..5cacab6 100644
--- a/drivers/net/wireless/ath/ath10k/htc.c
+++ b/drivers/net/wireless/ath/ath10k/htc.c
@@ -938,12 +938,15 @@ int ath10k_htc_wait_target(struct ath10k_htc *htc)
*/
if (htc->control_resp_len >=
sizeof(msg->hdr) + sizeof(msg->ready_ext)) {
+ htc->alt_data_credit_size =
+ __le16_to_cpu(msg->ready_ext.reserved) & 0x0fff;
htc->max_msgs_per_htc_bundle =
min_t(u8, msg->ready_ext.max_msgs_per_htc_bundle,
HTC_HOST_MAX_MSG_PER_RX_BUNDLE);
ath10k_dbg(ar, ATH10K_DBG_HTC,
- "Extended ready message. RX bundle size: %d\n",
- htc->max_msgs_per_htc_bundle);
+ "Extended ready message. RX bundle size: %d, alt size:%d\n",
+ htc->max_msgs_per_htc_bundle,
+ htc->alt_data_credit_size);
}
INIT_WORK(&ar->bundle_tx_work, ath10k_htc_bundle_tx_work);
@@ -1095,6 +1098,10 @@ int ath10k_htc_connect_service(struct ath10k_htc *htc,
ep->tx_credits = tx_alloc;
ep->tx_credit_size = htc->target_credit_size;
+ if (conn_req->service_id == ATH10K_HTC_SVC_ID_HTT_DATA_MSG &&
+ htc->alt_data_credit_size != 0)
+ ep->tx_credit_size = htc->alt_data_credit_size;
+
/* copy all the callbacks */
ep->ep_ops = conn_req->ep_ops;
diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
index d805ea5..f0a9e60af 100644
--- a/drivers/net/wireless/ath/ath10k/htc.h
+++ b/drivers/net/wireless/ath/ath10k/htc.h
@@ -139,8 +139,14 @@ struct ath10k_htc_ready_extended {
struct ath10k_htc_ready base;
u8 htc_version; /* @enum ath10k_htc_version */
u8 max_msgs_per_htc_bundle;
- u8 pad0;
- u8 pad1;
+ union {
+ __le16 reserved;
+ struct {
+ u8 pad0;
+ u8 pad1;
+ } __packed;
+ } __packed;
+
} __packed;
struct ath10k_htc_conn_svc {
@@ -377,6 +383,7 @@ struct ath10k_htc {
int total_transmit_credits;
int target_credit_size;
u8 max_msgs_per_htc_bundle;
+ int alt_data_credit_size;
};
int ath10k_htc_init(struct ath10k *ar);
--
1.9.1
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 <[email protected]>
---
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
The transmission utilization ratio for sdio bus for small packet is
slow, because the space and time cost for sdio bus is same for large
length packet and small length packet. So the speed of data for large
length packet is higher than small length.
Test result of different length of data:
data packet(byte) cost time(us) calculated rate(Mbps)
256 28 73
512 33 124
1024 35 234
1792 45 318
14336 168 682
28672 333 688
57344 660 695
This patch change the TX packet from single packet to a large length
bundle packet, max size is 32, it results in significant performance
improvement on TX path.
This patch only effect sdio chip, it will not effect PCI, SNOC etc.
It only enable bundle for sdio chip.
Tested with QCA6174 SDIO with firmware
WLAN.RMH.4.4.1-00007-QCARMSWP-1.
Signed-off-by: Wen Gong <[email protected]>
---
drivers/net/wireless/ath/ath10k/core.c | 14 +-
drivers/net/wireless/ath/ath10k/core.h | 4 +-
drivers/net/wireless/ath/ath10k/htc.c | 353 ++++++++++++++++++++++++++++---
drivers/net/wireless/ath/ath10k/htc.h | 21 +-
drivers/net/wireless/ath/ath10k/htt.c | 8 +
drivers/net/wireless/ath/ath10k/htt.h | 4 +
drivers/net/wireless/ath/ath10k/htt_rx.c | 1 +
drivers/net/wireless/ath/ath10k/htt_tx.c | 9 +-
8 files changed, 376 insertions(+), 38 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 762bba0..351f4ed 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -3194,6 +3194,11 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,
if (!ar->workqueue_aux)
goto err_free_wq;
+ ar->workqueue_tx_complete =
+ create_singlethread_workqueue("ath10k_tx_complete_wq");
+ if (!ar->workqueue_tx_complete)
+ goto err_free_aux_wq;
+
mutex_init(&ar->conf_mutex);
mutex_init(&ar->dump_mutex);
spin_lock_init(&ar->data_lock);
@@ -3219,7 +3224,7 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,
ret = ath10k_coredump_create(ar);
if (ret)
- goto err_free_aux_wq;
+ goto err_free_tx_complete;
ret = ath10k_debug_create(ar);
if (ret)
@@ -3229,12 +3234,12 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,
err_free_coredump:
ath10k_coredump_destroy(ar);
-
+err_free_tx_complete:
+ destroy_workqueue(ar->workqueue_tx_complete);
err_free_aux_wq:
destroy_workqueue(ar->workqueue_aux);
err_free_wq:
destroy_workqueue(ar->workqueue);
-
err_free_mac:
ath10k_mac_destroy(ar);
@@ -3250,6 +3255,9 @@ void ath10k_core_destroy(struct ath10k *ar)
flush_workqueue(ar->workqueue_aux);
destroy_workqueue(ar->workqueue_aux);
+ flush_workqueue(ar->workqueue_tx_complete);
+ destroy_workqueue(ar->workqueue_tx_complete);
+
ath10k_debug_destroy(ar);
ath10k_coredump_destroy(ar);
ath10k_htt_tx_destroy(&ar->htt);
diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index 4d7db07..be9eb37 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -1079,7 +1079,7 @@ struct ath10k {
struct workqueue_struct *workqueue;
/* Auxiliary workqueue */
struct workqueue_struct *workqueue_aux;
-
+ struct workqueue_struct *workqueue_tx_complete;
/* prevents concurrent FW reconfiguration */
struct mutex conf_mutex;
@@ -1120,6 +1120,8 @@ struct ath10k {
struct work_struct register_work;
struct work_struct restart_work;
+ struct work_struct bundle_tx_work;
+ struct work_struct tx_complete_work;
/* cycle count is reported twice for each visited channel during scan.
* access protected by data_lock
diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
index 4c6cdc2..e0eb5f0 100644
--- a/drivers/net/wireless/ath/ath10k/htc.c
+++ b/drivers/net/wireless/ath/ath10k/htc.c
@@ -51,10 +51,12 @@ void ath10k_htc_notify_tx_completion(struct ath10k_htc_ep *ep,
struct sk_buff *skb)
{
struct ath10k *ar = ep->htc->ar;
+ struct ath10k_htc_hdr *hdr;
ath10k_dbg(ar, ATH10K_DBG_HTC, "%s: ep %d skb %pK\n", __func__,
ep->eid, skb);
+ hdr = (struct ath10k_htc_hdr *)skb->data;
ath10k_htc_restore_tx_skb(ep->htc, skb);
if (!ep->ep_ops.ep_tx_complete) {
@@ -63,6 +65,11 @@ void ath10k_htc_notify_tx_completion(struct ath10k_htc_ep *ep,
return;
}
+ if (hdr->flags & ATH10K_HTC_FLAG_SEND_BUNDLE) {
+ dev_kfree_skb_any(skb);
+ return;
+ }
+
ep->ep_ops.ep_tx_complete(ep->htc->ar, skb);
}
EXPORT_SYMBOL(ath10k_htc_notify_tx_completion);
@@ -78,7 +85,7 @@ static void ath10k_htc_prepare_tx_skb(struct ath10k_htc_ep *ep,
hdr->eid = ep->eid;
hdr->len = __cpu_to_le16(skb->len - sizeof(*hdr));
hdr->flags = 0;
- if (ep->tx_credit_flow_enabled)
+ if (ep->tx_credit_flow_enabled && !ep->bundle_tx)
hdr->flags |= ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE;
spin_lock_bh(&ep->htc->tx_lock);
@@ -86,6 +93,59 @@ static void ath10k_htc_prepare_tx_skb(struct ath10k_htc_ep *ep,
spin_unlock_bh(&ep->htc->tx_lock);
}
+static int ath10k_htc_consume_credit(struct ath10k_htc_ep *ep,
+ unsigned int len,
+ bool consume)
+{
+ int credits;
+ struct ath10k_htc *htc = ep->htc;
+ struct ath10k *ar = htc->ar;
+ enum ath10k_htc_ep_id eid = ep->eid;
+
+ if (ep->tx_credit_flow_enabled) {
+ credits = DIV_ROUND_UP(len, ep->tx_credit_size);
+ spin_lock_bh(&htc->tx_lock);
+
+ if (ep->tx_credits < credits) {
+ ath10k_dbg(ar, ATH10K_DBG_HTC,
+ "htc insufficient credits ep %d required %d available %d consume %d\n",
+ eid, credits, ep->tx_credits, consume);
+ spin_unlock_bh(&htc->tx_lock);
+ return -EAGAIN;
+ }
+ if (consume) {
+ ep->tx_credits -= credits;
+ ath10k_dbg(ar, ATH10K_DBG_HTC,
+ "htc ep %d consumed %d credits (total %d)\n",
+ eid, credits, ep->tx_credits);
+ }
+ spin_unlock_bh(&htc->tx_lock);
+ }
+
+ return 0;
+}
+
+static void ath10k_htc_release_credit(struct ath10k_htc_ep *ep, unsigned int len)
+{
+ int credits;
+ struct ath10k_htc *htc = ep->htc;
+ struct ath10k *ar = htc->ar;
+ enum ath10k_htc_ep_id eid = ep->eid;
+
+ if (ep->tx_credit_flow_enabled) {
+ credits = DIV_ROUND_UP(len, ep->tx_credit_size);
+ spin_lock_bh(&htc->tx_lock);
+ ep->tx_credits += credits;
+ ath10k_dbg(ar, ATH10K_DBG_HTC,
+ "htc ep %d reverted %d credits back (total %d)\n",
+ eid, credits, ep->tx_credits);
+ spin_unlock_bh(&htc->tx_lock);
+
+ if (ep->ep_ops.ep_tx_credits)
+ ep->ep_ops.ep_tx_credits(htc->ar);
+ }
+}
+
int ath10k_htc_send(struct ath10k_htc *htc,
enum ath10k_htc_ep_id eid,
struct sk_buff *skb)
@@ -95,8 +155,8 @@ int ath10k_htc_send(struct ath10k_htc *htc,
struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(skb);
struct ath10k_hif_sg_item sg_item;
struct device *dev = htc->ar->dev;
- int credits = 0;
int ret;
+ unsigned int skb_len;
if (htc->ar->state == ATH10K_STATE_WEDGED)
return -ECOMM;
@@ -108,23 +168,10 @@ int ath10k_htc_send(struct ath10k_htc *htc,
skb_push(skb, sizeof(struct ath10k_htc_hdr));
- if (ep->tx_credit_flow_enabled) {
- credits = DIV_ROUND_UP(skb->len, htc->target_credit_size);
- spin_lock_bh(&htc->tx_lock);
- if (ep->tx_credits < credits) {
- ath10k_dbg(ar, ATH10K_DBG_HTC,
- "htc insufficient credits ep %d required %d available %d\n",
- eid, credits, ep->tx_credits);
- spin_unlock_bh(&htc->tx_lock);
- ret = -EAGAIN;
- goto err_pull;
- }
- ep->tx_credits -= credits;
- ath10k_dbg(ar, ATH10K_DBG_HTC,
- "htc ep %d consumed %d credits (total %d)\n",
- eid, credits, ep->tx_credits);
- spin_unlock_bh(&htc->tx_lock);
- }
+ skb_len = skb->len;
+ ret = ath10k_htc_consume_credit(ep, skb_len, true);
+ if (ret)
+ goto err_pull;
ath10k_htc_prepare_tx_skb(ep, skb);
@@ -155,17 +202,7 @@ int ath10k_htc_send(struct ath10k_htc *htc,
if (ar->bus_param.dev_type != ATH10K_DEV_TYPE_HL)
dma_unmap_single(dev, skb_cb->paddr, skb->len, DMA_TO_DEVICE);
err_credits:
- if (ep->tx_credit_flow_enabled) {
- spin_lock_bh(&htc->tx_lock);
- ep->tx_credits += credits;
- ath10k_dbg(ar, ATH10K_DBG_HTC,
- "htc ep %d reverted %d credits back (total %d)\n",
- eid, credits, ep->tx_credits);
- spin_unlock_bh(&htc->tx_lock);
-
- if (ep->ep_ops.ep_tx_credits)
- ep->ep_ops.ep_tx_credits(htc->ar);
- }
+ ath10k_htc_release_credit(ep, skb_len);
err_pull:
skb_pull(skb, sizeof(struct ath10k_htc_hdr));
return ret;
@@ -581,6 +618,258 @@ static u8 ath10k_htc_get_credit_allocation(struct ath10k_htc *htc,
return allocation;
}
+static int ath10k_htc_send_bundle(struct ath10k_htc_ep *ep,
+ struct sk_buff *bundle_skb,
+ struct sk_buff_head *tx_save_head)
+{
+ struct ath10k_hif_sg_item sg_item;
+ struct ath10k_htc *htc = ep->htc;
+ struct ath10k *ar = htc->ar;
+ struct sk_buff *skb;
+ int ret = 0;
+ int cn = 0;
+ unsigned int skb_len;
+
+ ath10k_dbg(ar, ATH10K_DBG_HTC, "bundle skb: len:%d\n", bundle_skb->len);
+ skb_len = bundle_skb->len;
+ ret = ath10k_htc_consume_credit(ep, skb_len, true);
+
+ if (!ret) {
+ sg_item.transfer_id = ep->eid;
+ sg_item.transfer_context = bundle_skb;
+ sg_item.vaddr = bundle_skb->data;
+ sg_item.len = bundle_skb->len;
+
+ ret = ath10k_hif_tx_sg(htc->ar, ep->ul_pipe_id, &sg_item, 1);
+ if (ret)
+ ath10k_htc_release_credit(ep, skb_len);
+ }
+
+ if (ret)
+ dev_kfree_skb_any(bundle_skb);
+
+ while (true) {
+ skb = skb_dequeue_tail(tx_save_head);
+ if (!skb)
+ break;
+
+ cn++;
+ if (ret) {
+ skb_pull(skb, sizeof(struct ath10k_htc_hdr));
+ skb_queue_head(&ep->tx_req_head, skb);
+ } else {
+ skb_queue_tail(&ep->tx_complete_head, skb);
+ }
+ }
+
+ if (!ret)
+ queue_work(ar->workqueue_tx_complete, &ar->tx_complete_work);
+
+ ath10k_dbg(ar, ATH10K_DBG_HTC,
+ "bundle tx status:%d, eid:%d, req count:%d, count:%d, len:%d\n",
+ ret, ep->eid, skb_queue_len(&ep->tx_req_head), cn, bundle_skb->len);
+ return ret;
+}
+
+static void ath10k_htc_send_one_skb(struct ath10k_htc_ep *ep, struct sk_buff *skb)
+{
+ struct ath10k_htc *htc = ep->htc;
+ struct ath10k *ar = htc->ar;
+ int ret;
+
+ ret = ath10k_htc_send(htc, ep->eid, skb);
+
+ if (ret)
+ skb_queue_head(&ep->tx_req_head, skb);
+
+ ath10k_dbg(ar, ATH10K_DBG_HTC, "tx one status:%d, eid:%d, len:%d, pending count:%d\n",
+ ret, ep->eid, skb->len, skb_queue_len(&ep->tx_req_head));
+}
+
+static int ath10k_htc_send_bundle_skbs(struct ath10k_htc_ep *ep)
+{
+ int ret = 0;
+ struct ath10k_htc *htc = ep->htc;
+ struct sk_buff *bundle_skb, *skb;
+ struct sk_buff_head tx_save_head;
+ struct ath10k_htc_hdr *hdr;
+ u8 *bundle_buf;
+ int credit_pad, credit_remainder, trans_len, bundles_left = 0;
+
+ if (htc->ar->state == ATH10K_STATE_WEDGED)
+ return -ECOMM;
+
+ if (ep->tx_credit_flow_enabled &&
+ ep->tx_credits < HTC_HOST_MIN_CREDIT_PER_TX_BUNDLE)
+ return 0;
+
+ bundles_left = HTC_HOST_MAX_MSG_PER_TX_BUNDLE * ep->tx_credit_size;
+ bundle_skb = dev_alloc_skb(bundles_left);
+
+ if (!bundle_skb)
+ return -ENOMEM;
+
+ bundle_buf = bundle_skb->data;
+ skb_queue_head_init(&tx_save_head);
+
+ while (true) {
+ skb = skb_dequeue(&ep->tx_req_head);
+ if (!skb)
+ break;
+
+ credit_pad = 0;
+ trans_len = skb->len + sizeof(*hdr);
+ credit_remainder = trans_len % ep->tx_credit_size;
+
+ if (credit_remainder != 0) {
+ credit_pad = ep->tx_credit_size - credit_remainder;
+ trans_len += credit_pad;
+ }
+
+ ret = ath10k_htc_consume_credit(ep,
+ bundle_buf + trans_len - bundle_skb->data,
+ false);
+ if (ret) {
+ skb_queue_head(&ep->tx_req_head, skb);
+ break;
+ }
+
+ if (bundles_left < trans_len) {
+ bundle_skb->len = bundle_buf - bundle_skb->data;
+ ret = ath10k_htc_send_bundle(ep, bundle_skb, &tx_save_head);
+
+ if (ret) {
+ skb_queue_head(&ep->tx_req_head, skb);
+ return ret;
+ }
+
+ if (skb_queue_len(&ep->tx_req_head) == 0) {
+ ath10k_htc_send_one_skb(ep, skb);
+ return ret;
+ }
+
+ if (ep->tx_credit_flow_enabled &&
+ ep->tx_credits < HTC_HOST_MIN_CREDIT_PER_TX_BUNDLE) {
+ skb_queue_head(&ep->tx_req_head, skb);
+ return 0;
+ }
+
+ bundles_left =
+ HTC_HOST_MAX_MSG_PER_TX_BUNDLE * ep->tx_credit_size;
+ bundle_skb = dev_alloc_skb(bundles_left);
+
+ if (!bundle_skb) {
+ skb_queue_head(&ep->tx_req_head, skb);
+ return -ENOMEM;
+ }
+ bundle_buf = bundle_skb->data;
+ skb_queue_head_init(&tx_save_head);
+ }
+
+ skb_push(skb, sizeof(struct ath10k_htc_hdr));
+ ath10k_htc_prepare_tx_skb(ep, skb);
+
+ memcpy(bundle_buf, skb->data, skb->len);
+ hdr = (struct ath10k_htc_hdr *)bundle_buf;
+ hdr->flags |= ATH10K_HTC_FLAG_SEND_BUNDLE;
+ hdr->pad_len = __cpu_to_le16(credit_pad);
+ bundle_buf += trans_len;
+ bundles_left -= trans_len;
+ skb_queue_tail(&tx_save_head, skb);
+ }
+
+ if (bundle_buf != bundle_skb->data) {
+ bundle_skb->len = bundle_buf - bundle_skb->data;
+ ret = ath10k_htc_send_bundle(ep, bundle_skb, &tx_save_head);
+ } else {
+ dev_kfree_skb_any(bundle_skb);
+ }
+
+ return ret;
+}
+
+static void ath10k_htc_bundle_tx_work(struct work_struct *work)
+{
+ struct ath10k *ar = container_of(work, struct ath10k, bundle_tx_work);
+ int i;
+ struct ath10k_htc_ep *ep;
+ enum ath10k_htc_ep_id eid;
+ struct sk_buff *skb;
+
+ for (i = 0; i < ARRAY_SIZE(ar->htc.endpoint); i++) {
+ ep = &ar->htc.endpoint[i];
+ eid = ep->eid;
+ if (ep->bundle_tx) {
+ ath10k_dbg(ar, ATH10K_DBG_HTC, "bundle tx work, eid:%d, count:%d\n",
+ ep->eid, skb_queue_len(&ep->tx_req_head));
+
+ if (skb_queue_len(&ep->tx_req_head) >=
+ HTC_HOST_MIN_MSG_PER_TX_BUNDLE) {
+ ath10k_htc_send_bundle_skbs(ep);
+ } else {
+ skb = skb_dequeue(&ep->tx_req_head);
+
+ if (!skb)
+ continue;
+ ath10k_htc_send_one_skb(ep, skb);
+ }
+ }
+ }
+}
+
+static void ath10k_htc_tx_complete_work(struct work_struct *work)
+{
+ struct ath10k *ar = container_of(work, struct ath10k, tx_complete_work);
+ int i;
+ struct ath10k_htc_ep *ep;
+ enum ath10k_htc_ep_id eid;
+ struct sk_buff *skb;
+
+ for (i = 0; i < ARRAY_SIZE(ar->htc.endpoint); i++) {
+ ep = &ar->htc.endpoint[i];
+ eid = ep->eid;
+ if (ep->bundle_tx && eid == ar->htt.eid) {
+ ath10k_dbg(ar, ATH10K_DBG_HTC, "bundle tx complete, eid:%d, pending complete count:%d\n",
+ ep->eid, skb_queue_len(&ep->tx_complete_head));
+
+ while (true) {
+ skb = skb_dequeue(&ep->tx_complete_head);
+ if (!skb)
+ break;
+ ath10k_htc_notify_tx_completion(ep, skb);
+ }
+ }
+ }
+}
+
+int ath10k_htc_send_hl(struct ath10k_htc *htc,
+ enum ath10k_htc_ep_id eid,
+ struct sk_buff *skb)
+{
+ struct ath10k_htc_ep *ep = &htc->endpoint[eid];
+ struct ath10k *ar = htc->ar;
+
+ ath10k_dbg(ar, ATH10K_DBG_HTC, "htc send hl: eid:%d, bundle:%d, tx count:%d, len:%d\n",
+ eid, ep->bundle_tx, skb_queue_len(&ep->tx_req_head), skb->len);
+
+ if (ep->bundle_tx) {
+ skb_queue_tail(&ep->tx_req_head, skb);
+ queue_work(ar->workqueue, &ar->bundle_tx_work);
+ return 0;
+ } else {
+ return ath10k_htc_send(htc, eid, skb);
+ }
+}
+
+void ath10k_htc_setup_tx_req(struct ath10k_htc_ep *ep)
+{
+ if (ep->htc->max_msgs_per_htc_bundle >= HTC_HOST_MIN_MSG_PER_TX_BUNDLE) {
+ ep->bundle_tx = true;
+ skb_queue_head_init(&ep->tx_req_head);
+ skb_queue_head_init(&ep->tx_complete_head);
+ }
+}
+
int ath10k_htc_wait_target(struct ath10k_htc *htc)
{
struct ath10k *ar = htc->ar;
@@ -657,6 +946,9 @@ int ath10k_htc_wait_target(struct ath10k_htc *htc)
htc->max_msgs_per_htc_bundle);
}
+ INIT_WORK(&ar->bundle_tx_work, ath10k_htc_bundle_tx_work);
+ INIT_WORK(&ar->tx_complete_work, ath10k_htc_tx_complete_work);
+
return 0;
}
@@ -801,6 +1093,7 @@ int ath10k_htc_connect_service(struct ath10k_htc *htc,
ep->max_tx_queue_depth = conn_req->max_send_queue_depth;
ep->max_ep_message_len = __le16_to_cpu(resp_msg->max_msg_size);
ep->tx_credits = tx_alloc;
+ ep->tx_credit_size = htc->target_credit_size;
/* copy all the callbacks */
ep->ep_ops = conn_req->ep_ops;
diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
index 3c09fe8..d805ea5 100644
--- a/drivers/net/wireless/ath/ath10k/htc.h
+++ b/drivers/net/wireless/ath/ath10k/htc.h
@@ -40,6 +40,9 @@
*/
#define HTC_HOST_MAX_MSG_PER_RX_BUNDLE 32
+#define HTC_HOST_MAX_MSG_PER_TX_BUNDLE 32
+#define HTC_HOST_MIN_MSG_PER_TX_BUNDLE 2
+#define HTC_HOST_MIN_CREDIT_PER_TX_BUNDLE 2
enum ath10k_htc_tx_flags {
ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE = 0x01,
@@ -68,8 +71,14 @@ struct ath10k_htc_hdr {
u8 seq_no; /* for tx */
u8 control_byte1;
} __packed;
- u8 pad0;
- u8 pad1;
+ union {
+ __le16 pad_len;
+ struct {
+ u8 pad0;
+ u8 pad1;
+ } __packed;
+ } __packed;
+
} __packed __aligned(4);
enum ath10k_ath10k_htc_msg_id {
@@ -338,7 +347,12 @@ struct ath10k_htc_ep {
u8 seq_no; /* for debugging */
int tx_credits;
+ int tx_credit_size;
bool tx_credit_flow_enabled;
+ bool bundle_tx;
+ struct sk_buff_head tx_req_head;
+ struct sk_buff_head tx_complete_head;
+
};
struct ath10k_htc_svc_tx_credits {
@@ -367,6 +381,7 @@ struct ath10k_htc {
int ath10k_htc_init(struct ath10k *ar);
int ath10k_htc_wait_target(struct ath10k_htc *htc);
+void ath10k_htc_setup_tx_req(struct ath10k_htc_ep *ep);
int ath10k_htc_start(struct ath10k_htc *htc);
int ath10k_htc_connect_service(struct ath10k_htc *htc,
struct ath10k_htc_svc_conn_req *conn_req,
@@ -376,6 +391,8 @@ void ath10k_htc_change_tx_credit_flow(struct ath10k_htc *htc,
bool enable);
int ath10k_htc_send(struct ath10k_htc *htc, enum ath10k_htc_ep_id eid,
struct sk_buff *packet);
+int ath10k_htc_send_hl(struct ath10k_htc *htc, enum ath10k_htc_ep_id eid,
+ struct sk_buff *packet);
struct sk_buff *ath10k_htc_alloc_skb(struct ath10k *ar, int size);
void ath10k_htc_tx_completion_handler(struct ath10k *ar, struct sk_buff *skb);
void ath10k_htc_rx_completion_handler(struct ath10k *ar, struct sk_buff *skb);
diff --git a/drivers/net/wireless/ath/ath10k/htt.c b/drivers/net/wireless/ath/ath10k/htt.c
index 4354bf2..127b4e4 100644
--- a/drivers/net/wireless/ath/ath10k/htt.c
+++ b/drivers/net/wireless/ath/ath10k/htt.c
@@ -135,6 +135,8 @@ int ath10k_htt_connect(struct ath10k_htt *htt)
{
struct ath10k_htc_svc_conn_req conn_req;
struct ath10k_htc_svc_conn_resp conn_resp;
+ struct ath10k *ar = htt->ar;
+ struct ath10k_htc_ep *ep;
int status;
memset(&conn_req, 0, sizeof(conn_req));
@@ -142,6 +144,7 @@ int ath10k_htt_connect(struct ath10k_htt *htt)
conn_req.ep_ops.ep_tx_complete = ath10k_htt_htc_tx_complete;
conn_req.ep_ops.ep_rx_complete = ath10k_htt_htc_t2h_msg_handler;
+ conn_req.ep_ops.ep_tx_credits = ath10k_htt_op_ep_tx_credits;
/* connect to control service */
conn_req.service_id = ATH10K_HTC_SVC_ID_HTT_DATA_MSG;
@@ -154,6 +157,11 @@ int ath10k_htt_connect(struct ath10k_htt *htt)
htt->eid = conn_resp.eid;
+ if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL) {
+ ep = &ar->htc.endpoint[htt->eid];
+ ath10k_htc_setup_tx_req(ep);
+ }
+
htt->disable_tx_comp = ath10k_hif_get_htt_tx_complete(htt->ar);
if (htt->disable_tx_comp)
ath10k_htc_change_tx_credit_flow(&htt->ar->htc, htt->eid, true);
diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h
index 889bf9f..4851a2e 100644
--- a/drivers/net/wireless/ath/ath10k/htt.h
+++ b/drivers/net/wireless/ath/ath10k/htt.h
@@ -2030,6 +2030,9 @@ struct ath10k_htt {
const struct ath10k_htt_tx_ops *tx_ops;
const struct ath10k_htt_rx_ops *rx_ops;
bool disable_tx_comp;
+ bool bundle_tx;
+ struct sk_buff_head tx_req_head;
+ struct sk_buff_head tx_complete_head;
};
struct ath10k_htt_tx_ops {
@@ -2276,6 +2279,7 @@ int ath10k_htt_tx_fetch_resp(struct ath10k *ar,
__le16 fetch_seq_num,
struct htt_tx_fetch_record *records,
size_t num_records);
+void ath10k_htt_op_ep_tx_credits(struct ath10k *ar);
void ath10k_htt_tx_txq_update(struct ieee80211_hw *hw,
struct ieee80211_txq *txq);
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index 9990da7..e2d8b51 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -3822,6 +3822,7 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)
ath10k_dbg(ar, ATH10K_DBG_HTT,
"credit total:%d\n",
ep->tx_credits);
+ ep->ep_ops.ep_tx_credits(htc->ar);
}
break;
}
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index 8da5545..402ed1b 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -541,6 +541,11 @@ void ath10k_htt_tx_free(struct ath10k_htt *htt)
ath10k_htt_tx_destroy(htt);
}
+void ath10k_htt_op_ep_tx_credits(struct ath10k *ar)
+{
+ queue_work(ar->workqueue, &ar->bundle_tx_work);
+}
+
void ath10k_htt_htc_tx_complete(struct ath10k *ar, struct sk_buff *skb)
{
struct ath10k_htt *htt = &ar->htt;
@@ -559,7 +564,7 @@ void ath10k_htt_htc_tx_complete(struct ath10k *ar, struct sk_buff *skb)
flags1 = __le16_to_cpu(desc_hdr->flags1);
ath10k_dbg(ar, ATH10K_DBG_HTT,
- "ath10k_htt_htc_tx_complete msdu id:%u ,flags1:%x\n",
+ "htt htc tx complete msdu id:%u ,flags1:%x\n",
__le16_to_cpu(desc_hdr->id), flags1);
if (flags1 & HTT_DATA_TX_DESC_FLAGS1_TX_COMPLETE)
@@ -1356,7 +1361,7 @@ static int ath10k_htt_tx_hl(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txm
*/
tx_desc->peerid = __cpu_to_le32(HTT_INVALID_PEERID);
- res = ath10k_htc_send(&htt->ar->htc, htt->eid, msdu);
+ res = ath10k_htc_send_hl(&htt->ar->htc, htt->eid, msdu);
out:
return res;
--
1.9.1
> -----Original Message-----
> From: ath10k <[email protected]> On Behalf Of Wen Gong
> Sent: Tuesday, August 27, 2019 7:02 PM
> To: [email protected]
> Cc: [email protected]
> Subject: [EXT] [PATCH v2 2/7] ath10k: change max RX bundle size from 8 to
> 32 for sdio
v2: change macro HTC_GET_BUNDLE_COUNT
>
> _______________________________________________
> ath10k mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/ath10k
On Tue, Aug 27, 2019 at 7:02 PM Wen Gong <[email protected]> wrote:
>
> 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 <[email protected]>
> ---
For next time, please add changelist between v1 and v2 here.
> 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))
That's not what I meant, I was expecting one more flag in the structure above
ATH10K_HTC_FLAG_BUNDLE_EXTRA_MASK GENMASK = 0x0A
Then:
(FIELD_GET(ATH10K_HTC_FLAG_BUNDLE_EXTRA_MASK, (flags)) << 4))
(I don't mind if you keep this macro anyway)
> +
> 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
>
On Tue, Aug 27, 2019 at 7:03 PM Wen Gong <[email protected]> wrote:
>
> The transmission utilization ratio for sdio bus for small packet is
> slow, because the space and time cost for sdio bus is same for large
> length packet and small length packet. So the speed of data for large
> length packet is higher than small length.
>
> Test result of different length of data:
>
> data packet(byte) cost time(us) calculated rate(Mbps)
> 256 28 73
> 512 33 124
> 1024 35 234
> 1792 45 318
> 14336 168 682
> 28672 333 688
> 57344 660 695
>
> This patch change the TX packet from single packet to a large length
> bundle packet, max size is 32, it results in significant performance
> improvement on TX path.
>
> This patch only effect sdio chip, it will not effect PCI, SNOC etc.
> It only enable bundle for sdio chip.
>
> Tested with QCA6174 SDIO with firmware
> WLAN.RMH.4.4.1-00007-QCARMSWP-1.
>
> Signed-off-by: Wen Gong <[email protected]>
> ---
> drivers/net/wireless/ath/ath10k/core.c | 14 +-
> drivers/net/wireless/ath/ath10k/core.h | 4 +-
> drivers/net/wireless/ath/ath10k/htc.c | 353 ++++++++++++++++++++++++++++---
> drivers/net/wireless/ath/ath10k/htc.h | 21 +-
> drivers/net/wireless/ath/ath10k/htt.c | 8 +
> drivers/net/wireless/ath/ath10k/htt.h | 4 +
> drivers/net/wireless/ath/ath10k/htt_rx.c | 1 +
> drivers/net/wireless/ath/ath10k/htt_tx.c | 9 +-
> 8 files changed, 376 insertions(+), 38 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
> index 762bba0..351f4ed 100644
> --- a/drivers/net/wireless/ath/ath10k/core.c
> +++ b/drivers/net/wireless/ath/ath10k/core.c
> @@ -3194,6 +3194,11 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,
> if (!ar->workqueue_aux)
> goto err_free_wq;
>
> + ar->workqueue_tx_complete =
> + create_singlethread_workqueue("ath10k_tx_complete_wq");
> + if (!ar->workqueue_tx_complete)
> + goto err_free_aux_wq;
> +
> mutex_init(&ar->conf_mutex);
> mutex_init(&ar->dump_mutex);
> spin_lock_init(&ar->data_lock);
> @@ -3219,7 +3224,7 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,
>
> ret = ath10k_coredump_create(ar);
> if (ret)
> - goto err_free_aux_wq;
> + goto err_free_tx_complete;
>
> ret = ath10k_debug_create(ar);
> if (ret)
> @@ -3229,12 +3234,12 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,
>
> err_free_coredump:
> ath10k_coredump_destroy(ar);
> -
> +err_free_tx_complete:
> + destroy_workqueue(ar->workqueue_tx_complete);
> err_free_aux_wq:
> destroy_workqueue(ar->workqueue_aux);
> err_free_wq:
> destroy_workqueue(ar->workqueue);
> -
> err_free_mac:
> ath10k_mac_destroy(ar);
>
> @@ -3250,6 +3255,9 @@ void ath10k_core_destroy(struct ath10k *ar)
> flush_workqueue(ar->workqueue_aux);
> destroy_workqueue(ar->workqueue_aux);
>
> + flush_workqueue(ar->workqueue_tx_complete);
> + destroy_workqueue(ar->workqueue_tx_complete);
> +
> ath10k_debug_destroy(ar);
> ath10k_coredump_destroy(ar);
> ath10k_htt_tx_destroy(&ar->htt);
> diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
> index 4d7db07..be9eb37 100644
> --- a/drivers/net/wireless/ath/ath10k/core.h
> +++ b/drivers/net/wireless/ath/ath10k/core.h
> @@ -1079,7 +1079,7 @@ struct ath10k {
> struct workqueue_struct *workqueue;
> /* Auxiliary workqueue */
> struct workqueue_struct *workqueue_aux;
> -
> + struct workqueue_struct *workqueue_tx_complete;
> /* prevents concurrent FW reconfiguration */
> struct mutex conf_mutex;
>
> @@ -1120,6 +1120,8 @@ struct ath10k {
>
> struct work_struct register_work;
> struct work_struct restart_work;
> + struct work_struct bundle_tx_work;
> + struct work_struct tx_complete_work;
>
> /* cycle count is reported twice for each visited channel during scan.
> * access protected by data_lock
> diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
> index 4c6cdc2..e0eb5f0 100644
> --- a/drivers/net/wireless/ath/ath10k/htc.c
> +++ b/drivers/net/wireless/ath/ath10k/htc.c
> @@ -51,10 +51,12 @@ void ath10k_htc_notify_tx_completion(struct ath10k_htc_ep *ep,
> struct sk_buff *skb)
> {
> struct ath10k *ar = ep->htc->ar;
> + struct ath10k_htc_hdr *hdr;
>
> ath10k_dbg(ar, ATH10K_DBG_HTC, "%s: ep %d skb %pK\n", __func__,
> ep->eid, skb);
>
> + hdr = (struct ath10k_htc_hdr *)skb->data;
> ath10k_htc_restore_tx_skb(ep->htc, skb);
>
> if (!ep->ep_ops.ep_tx_complete) {
> @@ -63,6 +65,11 @@ void ath10k_htc_notify_tx_completion(struct ath10k_htc_ep *ep,
> return;
> }
>
> + if (hdr->flags & ATH10K_HTC_FLAG_SEND_BUNDLE) {
> + dev_kfree_skb_any(skb);
> + return;
> + }
> +
> ep->ep_ops.ep_tx_complete(ep->htc->ar, skb);
> }
> EXPORT_SYMBOL(ath10k_htc_notify_tx_completion);
> @@ -78,7 +85,7 @@ static void ath10k_htc_prepare_tx_skb(struct ath10k_htc_ep *ep,
> hdr->eid = ep->eid;
> hdr->len = __cpu_to_le16(skb->len - sizeof(*hdr));
> hdr->flags = 0;
> - if (ep->tx_credit_flow_enabled)
> + if (ep->tx_credit_flow_enabled && !ep->bundle_tx)
> hdr->flags |= ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE;
>
> spin_lock_bh(&ep->htc->tx_lock);
> @@ -86,6 +93,59 @@ static void ath10k_htc_prepare_tx_skb(struct ath10k_htc_ep *ep,
> spin_unlock_bh(&ep->htc->tx_lock);
> }
>
> +static int ath10k_htc_consume_credit(struct ath10k_htc_ep *ep,
> + unsigned int len,
> + bool consume)
> +{
> + int credits;
> + struct ath10k_htc *htc = ep->htc;
> + struct ath10k *ar = htc->ar;
> + enum ath10k_htc_ep_id eid = ep->eid;
> +
> + if (ep->tx_credit_flow_enabled) {
Decrease indendation with this?
if (!ep->tx_credit_flow_enabled)
return;
Then it's easier to use a goto statement to unlock the spinlock.
> + credits = DIV_ROUND_UP(len, ep->tx_credit_size);
> + spin_lock_bh(&htc->tx_lock);
> +
> + if (ep->tx_credits < credits) {
> + ath10k_dbg(ar, ATH10K_DBG_HTC,
> + "htc insufficient credits ep %d required %d available %d consume %d\n",
> + eid, credits, ep->tx_credits, consume);
> + spin_unlock_bh(&htc->tx_lock);
> + return -EAGAIN;
> + }
> + if (consume) {
> + ep->tx_credits -= credits;
> + ath10k_dbg(ar, ATH10K_DBG_HTC,
> + "htc ep %d consumed %d credits (total %d)\n",
> + eid, credits, ep->tx_credits);
> + }
> + spin_unlock_bh(&htc->tx_lock);
> + }
> +
> + return 0;
> +}
> +
> +static void ath10k_htc_release_credit(struct ath10k_htc_ep *ep, unsigned int len)
> +{
> + int credits;
> + struct ath10k_htc *htc = ep->htc;
> + struct ath10k *ar = htc->ar;
> + enum ath10k_htc_ep_id eid = ep->eid;
> +
> + if (ep->tx_credit_flow_enabled) {
if (!ep->tx_credit_flow_enabled)
return;
> + credits = DIV_ROUND_UP(len, ep->tx_credit_size);
> + spin_lock_bh(&htc->tx_lock);
> + ep->tx_credits += credits;
> + ath10k_dbg(ar, ATH10K_DBG_HTC,
> + "htc ep %d reverted %d credits back (total %d)\n",
> + eid, credits, ep->tx_credits);
> + spin_unlock_bh(&htc->tx_lock);
> +
> + if (ep->ep_ops.ep_tx_credits)
> + ep->ep_ops.ep_tx_credits(htc->ar);
> + }
> +}
> +
> int ath10k_htc_send(struct ath10k_htc *htc,
> enum ath10k_htc_ep_id eid,
> struct sk_buff *skb)
> @@ -95,8 +155,8 @@ int ath10k_htc_send(struct ath10k_htc *htc,
> struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(skb);
> struct ath10k_hif_sg_item sg_item;
> struct device *dev = htc->ar->dev;
> - int credits = 0;
> int ret;
> + unsigned int skb_len;
>
> if (htc->ar->state == ATH10K_STATE_WEDGED)
> return -ECOMM;
> @@ -108,23 +168,10 @@ int ath10k_htc_send(struct ath10k_htc *htc,
>
> skb_push(skb, sizeof(struct ath10k_htc_hdr));
>
> - if (ep->tx_credit_flow_enabled) {
> - credits = DIV_ROUND_UP(skb->len, htc->target_credit_size);
> - spin_lock_bh(&htc->tx_lock);
> - if (ep->tx_credits < credits) {
> - ath10k_dbg(ar, ATH10K_DBG_HTC,
> - "htc insufficient credits ep %d required %d available %d\n",
> - eid, credits, ep->tx_credits);
> - spin_unlock_bh(&htc->tx_lock);
> - ret = -EAGAIN;
> - goto err_pull;
> - }
> - ep->tx_credits -= credits;
> - ath10k_dbg(ar, ATH10K_DBG_HTC,
> - "htc ep %d consumed %d credits (total %d)\n",
> - eid, credits, ep->tx_credits);
> - spin_unlock_bh(&htc->tx_lock);
> - }
> + skb_len = skb->len;
> + ret = ath10k_htc_consume_credit(ep, skb_len, true);
> + if (ret)
> + goto err_pull;
>
> ath10k_htc_prepare_tx_skb(ep, skb);
>
> @@ -155,17 +202,7 @@ int ath10k_htc_send(struct ath10k_htc *htc,
> if (ar->bus_param.dev_type != ATH10K_DEV_TYPE_HL)
> dma_unmap_single(dev, skb_cb->paddr, skb->len, DMA_TO_DEVICE);
> err_credits:
> - if (ep->tx_credit_flow_enabled) {
> - spin_lock_bh(&htc->tx_lock);
> - ep->tx_credits += credits;
> - ath10k_dbg(ar, ATH10K_DBG_HTC,
> - "htc ep %d reverted %d credits back (total %d)\n",
> - eid, credits, ep->tx_credits);
> - spin_unlock_bh(&htc->tx_lock);
> -
> - if (ep->ep_ops.ep_tx_credits)
> - ep->ep_ops.ep_tx_credits(htc->ar);
> - }
> + ath10k_htc_release_credit(ep, skb_len);
> err_pull:
> skb_pull(skb, sizeof(struct ath10k_htc_hdr));
> return ret;
> @@ -581,6 +618,258 @@ static u8 ath10k_htc_get_credit_allocation(struct ath10k_htc *htc,
> return allocation;
> }
>
> +static int ath10k_htc_send_bundle(struct ath10k_htc_ep *ep,
> + struct sk_buff *bundle_skb,
> + struct sk_buff_head *tx_save_head)
> +{
> + struct ath10k_hif_sg_item sg_item;
> + struct ath10k_htc *htc = ep->htc;
> + struct ath10k *ar = htc->ar;
> + struct sk_buff *skb;
> + int ret = 0;
No need to initialize to 0.
> + int cn = 0;
> + unsigned int skb_len;
> +
> + ath10k_dbg(ar, ATH10K_DBG_HTC, "bundle skb: len:%d\n", bundle_skb->len);
> + skb_len = bundle_skb->len;
> + ret = ath10k_htc_consume_credit(ep, skb_len, true);
ret makes me think of some error status, can we find a better name?
Like credit_available or something?
> +
> + if (!ret) {
> + sg_item.transfer_id = ep->eid;
> + sg_item.transfer_context = bundle_skb;
> + sg_item.vaddr = bundle_skb->data;
> + sg_item.len = bundle_skb->len;
> +
> + ret = ath10k_hif_tx_sg(htc->ar, ep->ul_pipe_id, &sg_item, 1);
> + if (ret)
> + ath10k_htc_release_credit(ep, skb_len);
> + }
> +
> + if (ret)
> + dev_kfree_skb_any(bundle_skb);
> +
> + while (true) {
Maybe a for loop?
for (cn = 0; (skb = skb_dequeue_tail(tx_save_head)); cn++) {
}
> + skb = skb_dequeue_tail(tx_save_head);
> + if (!skb)
> + break;
> +
> + cn++;
> + if (ret) {
> + skb_pull(skb, sizeof(struct ath10k_htc_hdr));
> + skb_queue_head(&ep->tx_req_head, skb);
> + } else {
> + skb_queue_tail(&ep->tx_complete_head, skb);
> + }
> + }
> +
> + if (!ret)
> + queue_work(ar->workqueue_tx_complete, &ar->tx_complete_work);
> +
> + ath10k_dbg(ar, ATH10K_DBG_HTC,
> + "bundle tx status:%d, eid:%d, req count:%d, count:%d, len:%d\n",
> + ret, ep->eid, skb_queue_len(&ep->tx_req_head), cn, bundle_skb->len);
> + return ret;
> +}
> +
> +static void ath10k_htc_send_one_skb(struct ath10k_htc_ep *ep, struct sk_buff *skb)
> +{
> + struct ath10k_htc *htc = ep->htc;
> + struct ath10k *ar = htc->ar;
> + int ret;
> +
> + ret = ath10k_htc_send(htc, ep->eid, skb);
> +
> + if (ret)
> + skb_queue_head(&ep->tx_req_head, skb);
> +
> + ath10k_dbg(ar, ATH10K_DBG_HTC, "tx one status:%d, eid:%d, len:%d, pending count:%d\n",
> + ret, ep->eid, skb->len, skb_queue_len(&ep->tx_req_head));
> +}
> +
> +static int ath10k_htc_send_bundle_skbs(struct ath10k_htc_ep *ep)
> +{
> + int ret = 0;
> + struct ath10k_htc *htc = ep->htc;
> + struct sk_buff *bundle_skb, *skb;
> + struct sk_buff_head tx_save_head;
> + struct ath10k_htc_hdr *hdr;
> + u8 *bundle_buf;
> + int credit_pad, credit_remainder, trans_len, bundles_left = 0;
> +
> + if (htc->ar->state == ATH10K_STATE_WEDGED)
> + return -ECOMM;
> +
> + if (ep->tx_credit_flow_enabled &&
> + ep->tx_credits < HTC_HOST_MIN_CREDIT_PER_TX_BUNDLE)
> + return 0;
> +
> + bundles_left = HTC_HOST_MAX_MSG_PER_TX_BUNDLE * ep->tx_credit_size;
> + bundle_skb = dev_alloc_skb(bundles_left);
> +
> + if (!bundle_skb)
> + return -ENOMEM;
> +
> + bundle_buf = bundle_skb->data;
> + skb_queue_head_init(&tx_save_head);
> +
> + while (true) {
> + skb = skb_dequeue(&ep->tx_req_head);
> + if (!skb)
> + break;
> +
> + credit_pad = 0;
> + trans_len = skb->len + sizeof(*hdr);
> + credit_remainder = trans_len % ep->tx_credit_size;
> +
> + if (credit_remainder != 0) {
> + credit_pad = ep->tx_credit_size - credit_remainder;
> + trans_len += credit_pad;
> + }
> +
> + ret = ath10k_htc_consume_credit(ep,
> + bundle_buf + trans_len - bundle_skb->data,
> + false);
> + if (ret) {
> + skb_queue_head(&ep->tx_req_head, skb);
> + break;
> + }
> +
> + if (bundles_left < trans_len) {
> + bundle_skb->len = bundle_buf - bundle_skb->data;
> + ret = ath10k_htc_send_bundle(ep, bundle_skb, &tx_save_head);
> +
> + if (ret) {
> + skb_queue_head(&ep->tx_req_head, skb);
> + return ret;
> + }
> +
> + if (skb_queue_len(&ep->tx_req_head) == 0) {
> + ath10k_htc_send_one_skb(ep, skb);
> + return ret;
> + }
> +
> + if (ep->tx_credit_flow_enabled &&
> + ep->tx_credits < HTC_HOST_MIN_CREDIT_PER_TX_BUNDLE) {
> + skb_queue_head(&ep->tx_req_head, skb);
> + return 0;
> + }
> +
> + bundles_left =
> + HTC_HOST_MAX_MSG_PER_TX_BUNDLE * ep->tx_credit_size;
> + bundle_skb = dev_alloc_skb(bundles_left);
> +
> + if (!bundle_skb) {
> + skb_queue_head(&ep->tx_req_head, skb);
> + return -ENOMEM;
> + }
> + bundle_buf = bundle_skb->data;
> + skb_queue_head_init(&tx_save_head);
> + }
> +
> + skb_push(skb, sizeof(struct ath10k_htc_hdr));
> + ath10k_htc_prepare_tx_skb(ep, skb);
> +
> + memcpy(bundle_buf, skb->data, skb->len);
> + hdr = (struct ath10k_htc_hdr *)bundle_buf;
> + hdr->flags |= ATH10K_HTC_FLAG_SEND_BUNDLE;
> + hdr->pad_len = __cpu_to_le16(credit_pad);
> + bundle_buf += trans_len;
> + bundles_left -= trans_len;
> + skb_queue_tail(&tx_save_head, skb);
> + }
> +
> + if (bundle_buf != bundle_skb->data) {
> + bundle_skb->len = bundle_buf - bundle_skb->data;
> + ret = ath10k_htc_send_bundle(ep, bundle_skb, &tx_save_head);
> + } else {
> + dev_kfree_skb_any(bundle_skb);
> + }
> +
> + return ret;
> +}
> +
> +static void ath10k_htc_bundle_tx_work(struct work_struct *work)
> +{
> + struct ath10k *ar = container_of(work, struct ath10k, bundle_tx_work);
> + int i;
> + struct ath10k_htc_ep *ep;
> + enum ath10k_htc_ep_id eid;
> + struct sk_buff *skb;
> +
> + for (i = 0; i < ARRAY_SIZE(ar->htc.endpoint); i++) {
> + ep = &ar->htc.endpoint[i];
> + eid = ep->eid;
> + if (ep->bundle_tx) {
if (!ep->bundle_tx)
continue;
> + ath10k_dbg(ar, ATH10K_DBG_HTC, "bundle tx work, eid:%d, count:%d\n",
> + ep->eid, skb_queue_len(&ep->tx_req_head));
> +
> + if (skb_queue_len(&ep->tx_req_head) >=
> + HTC_HOST_MIN_MSG_PER_TX_BUNDLE) {
> + ath10k_htc_send_bundle_skbs(ep);
> + } else {
> + skb = skb_dequeue(&ep->tx_req_head);
> +
> + if (!skb)
> + continue;
> + ath10k_htc_send_one_skb(ep, skb);
> + }
> + }
> + }
> +}
> +
> +static void ath10k_htc_tx_complete_work(struct work_struct *work)
> +{
> + struct ath10k *ar = container_of(work, struct ath10k, tx_complete_work);
> + int i;
> + struct ath10k_htc_ep *ep;
> + enum ath10k_htc_ep_id eid;
> + struct sk_buff *skb;
> +
> + for (i = 0; i < ARRAY_SIZE(ar->htc.endpoint); i++) {
> + ep = &ar->htc.endpoint[i];
> + eid = ep->eid;
> + if (ep->bundle_tx && eid == ar->htt.eid) {
> + ath10k_dbg(ar, ATH10K_DBG_HTC, "bundle tx complete, eid:%d, pending complete count:%d\n",
> + ep->eid, skb_queue_len(&ep->tx_complete_head));
> +
> + while (true) {
> + skb = skb_dequeue(&ep->tx_complete_head);
> + if (!skb)
> + break;
> + ath10k_htc_notify_tx_completion(ep, skb);
> + }
> + }
> + }
> +}
> +
> +int ath10k_htc_send_hl(struct ath10k_htc *htc,
> + enum ath10k_htc_ep_id eid,
> + struct sk_buff *skb)
> +{
> + struct ath10k_htc_ep *ep = &htc->endpoint[eid];
> + struct ath10k *ar = htc->ar;
> +
> + ath10k_dbg(ar, ATH10K_DBG_HTC, "htc send hl: eid:%d, bundle:%d, tx count:%d, len:%d\n",
> + eid, ep->bundle_tx, skb_queue_len(&ep->tx_req_head), skb->len);
> +
> + if (ep->bundle_tx) {
> + skb_queue_tail(&ep->tx_req_head, skb);
> + queue_work(ar->workqueue, &ar->bundle_tx_work);
> + return 0;
> + } else {
> + return ath10k_htc_send(htc, eid, skb);
> + }
> +}
> +
> +void ath10k_htc_setup_tx_req(struct ath10k_htc_ep *ep)
> +{
> + if (ep->htc->max_msgs_per_htc_bundle >= HTC_HOST_MIN_MSG_PER_TX_BUNDLE) {
> + ep->bundle_tx = true;
> + skb_queue_head_init(&ep->tx_req_head);
> + skb_queue_head_init(&ep->tx_complete_head);
> + }
> +}
> +
> int ath10k_htc_wait_target(struct ath10k_htc *htc)
> {
> struct ath10k *ar = htc->ar;
> @@ -657,6 +946,9 @@ int ath10k_htc_wait_target(struct ath10k_htc *htc)
> htc->max_msgs_per_htc_bundle);
> }
>
> + INIT_WORK(&ar->bundle_tx_work, ath10k_htc_bundle_tx_work);
> + INIT_WORK(&ar->tx_complete_work, ath10k_htc_tx_complete_work);
> +
> return 0;
> }
>
> @@ -801,6 +1093,7 @@ int ath10k_htc_connect_service(struct ath10k_htc *htc,
> ep->max_tx_queue_depth = conn_req->max_send_queue_depth;
> ep->max_ep_message_len = __le16_to_cpu(resp_msg->max_msg_size);
> ep->tx_credits = tx_alloc;
> + ep->tx_credit_size = htc->target_credit_size;
>
> /* copy all the callbacks */
> ep->ep_ops = conn_req->ep_ops;
> diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
> index 3c09fe8..d805ea5 100644
> --- a/drivers/net/wireless/ath/ath10k/htc.h
> +++ b/drivers/net/wireless/ath/ath10k/htc.h
> @@ -40,6 +40,9 @@
> */
>
> #define HTC_HOST_MAX_MSG_PER_RX_BUNDLE 32
> +#define HTC_HOST_MAX_MSG_PER_TX_BUNDLE 32
> +#define HTC_HOST_MIN_MSG_PER_TX_BUNDLE 2
> +#define HTC_HOST_MIN_CREDIT_PER_TX_BUNDLE 2
>
> enum ath10k_htc_tx_flags {
> ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE = 0x01,
> @@ -68,8 +71,14 @@ struct ath10k_htc_hdr {
> u8 seq_no; /* for tx */
> u8 control_byte1;
> } __packed;
> - u8 pad0;
> - u8 pad1;
> + union {
> + __le16 pad_len;
> + struct {
> + u8 pad0;
> + u8 pad1;
> + } __packed;
> + } __packed;
> +
> } __packed __aligned(4);
>
> enum ath10k_ath10k_htc_msg_id {
> @@ -338,7 +347,12 @@ struct ath10k_htc_ep {
>
> u8 seq_no; /* for debugging */
> int tx_credits;
> + int tx_credit_size;
> bool tx_credit_flow_enabled;
> + bool bundle_tx;
> + struct sk_buff_head tx_req_head;
> + struct sk_buff_head tx_complete_head;
> +
> };
>
> struct ath10k_htc_svc_tx_credits {
> @@ -367,6 +381,7 @@ struct ath10k_htc {
>
> int ath10k_htc_init(struct ath10k *ar);
> int ath10k_htc_wait_target(struct ath10k_htc *htc);
> +void ath10k_htc_setup_tx_req(struct ath10k_htc_ep *ep);
> int ath10k_htc_start(struct ath10k_htc *htc);
> int ath10k_htc_connect_service(struct ath10k_htc *htc,
> struct ath10k_htc_svc_conn_req *conn_req,
> @@ -376,6 +391,8 @@ void ath10k_htc_change_tx_credit_flow(struct ath10k_htc *htc,
> bool enable);
> int ath10k_htc_send(struct ath10k_htc *htc, enum ath10k_htc_ep_id eid,
> struct sk_buff *packet);
> +int ath10k_htc_send_hl(struct ath10k_htc *htc, enum ath10k_htc_ep_id eid,
> + struct sk_buff *packet);
> struct sk_buff *ath10k_htc_alloc_skb(struct ath10k *ar, int size);
> void ath10k_htc_tx_completion_handler(struct ath10k *ar, struct sk_buff *skb);
> void ath10k_htc_rx_completion_handler(struct ath10k *ar, struct sk_buff *skb);
> diff --git a/drivers/net/wireless/ath/ath10k/htt.c b/drivers/net/wireless/ath/ath10k/htt.c
> index 4354bf2..127b4e4 100644
> --- a/drivers/net/wireless/ath/ath10k/htt.c
> +++ b/drivers/net/wireless/ath/ath10k/htt.c
> @@ -135,6 +135,8 @@ int ath10k_htt_connect(struct ath10k_htt *htt)
> {
> struct ath10k_htc_svc_conn_req conn_req;
> struct ath10k_htc_svc_conn_resp conn_resp;
> + struct ath10k *ar = htt->ar;
> + struct ath10k_htc_ep *ep;
> int status;
>
> memset(&conn_req, 0, sizeof(conn_req));
> @@ -142,6 +144,7 @@ int ath10k_htt_connect(struct ath10k_htt *htt)
>
> conn_req.ep_ops.ep_tx_complete = ath10k_htt_htc_tx_complete;
> conn_req.ep_ops.ep_rx_complete = ath10k_htt_htc_t2h_msg_handler;
> + conn_req.ep_ops.ep_tx_credits = ath10k_htt_op_ep_tx_credits;
>
> /* connect to control service */
> conn_req.service_id = ATH10K_HTC_SVC_ID_HTT_DATA_MSG;
> @@ -154,6 +157,11 @@ int ath10k_htt_connect(struct ath10k_htt *htt)
>
> htt->eid = conn_resp.eid;
>
> + if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL) {
> + ep = &ar->htc.endpoint[htt->eid];
> + ath10k_htc_setup_tx_req(ep);
> + }
> +
> htt->disable_tx_comp = ath10k_hif_get_htt_tx_complete(htt->ar);
> if (htt->disable_tx_comp)
> ath10k_htc_change_tx_credit_flow(&htt->ar->htc, htt->eid, true);
> diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h
> index 889bf9f..4851a2e 100644
> --- a/drivers/net/wireless/ath/ath10k/htt.h
> +++ b/drivers/net/wireless/ath/ath10k/htt.h
> @@ -2030,6 +2030,9 @@ struct ath10k_htt {
> const struct ath10k_htt_tx_ops *tx_ops;
> const struct ath10k_htt_rx_ops *rx_ops;
> bool disable_tx_comp;
> + bool bundle_tx;
> + struct sk_buff_head tx_req_head;
> + struct sk_buff_head tx_complete_head;
> };
>
> struct ath10k_htt_tx_ops {
> @@ -2276,6 +2279,7 @@ int ath10k_htt_tx_fetch_resp(struct ath10k *ar,
> __le16 fetch_seq_num,
> struct htt_tx_fetch_record *records,
> size_t num_records);
> +void ath10k_htt_op_ep_tx_credits(struct ath10k *ar);
>
> void ath10k_htt_tx_txq_update(struct ieee80211_hw *hw,
> struct ieee80211_txq *txq);
> diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
> index 9990da7..e2d8b51 100644
> --- a/drivers/net/wireless/ath/ath10k/htt_rx.c
> +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
> @@ -3822,6 +3822,7 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)
> ath10k_dbg(ar, ATH10K_DBG_HTT,
> "credit total:%d\n",
> ep->tx_credits);
> + ep->ep_ops.ep_tx_credits(htc->ar);
> }
> break;
> }
> diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
> index 8da5545..402ed1b 100644
> --- a/drivers/net/wireless/ath/ath10k/htt_tx.c
> +++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
> @@ -541,6 +541,11 @@ void ath10k_htt_tx_free(struct ath10k_htt *htt)
> ath10k_htt_tx_destroy(htt);
> }
>
> +void ath10k_htt_op_ep_tx_credits(struct ath10k *ar)
> +{
> + queue_work(ar->workqueue, &ar->bundle_tx_work);
> +}
> +
> void ath10k_htt_htc_tx_complete(struct ath10k *ar, struct sk_buff *skb)
> {
> struct ath10k_htt *htt = &ar->htt;
> @@ -559,7 +564,7 @@ void ath10k_htt_htc_tx_complete(struct ath10k *ar, struct sk_buff *skb)
> flags1 = __le16_to_cpu(desc_hdr->flags1);
>
> ath10k_dbg(ar, ATH10K_DBG_HTT,
> - "ath10k_htt_htc_tx_complete msdu id:%u ,flags1:%x\n",
> + "htt htc tx complete msdu id:%u ,flags1:%x\n",
> __le16_to_cpu(desc_hdr->id), flags1);
>
> if (flags1 & HTT_DATA_TX_DESC_FLAGS1_TX_COMPLETE)
> @@ -1356,7 +1361,7 @@ static int ath10k_htt_tx_hl(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txm
> */
> tx_desc->peerid = __cpu_to_le32(HTT_INVALID_PEERID);
>
> - res = ath10k_htc_send(&htt->ar->htc, htt->eid, msdu);
> + res = ath10k_htc_send_hl(&htt->ar->htc, htt->eid, msdu);
>
> out:
> return res;
> --
> 1.9.1
>
On Tue, Aug 27, 2019 at 7:02 PM Wen Gong <[email protected]> wrote:
>
> The default credit size is 1792 bytes, but the IP mtu is 1500 bytes,
> then it has about 290 bytes's waste for each data packet on sdio
> transfer path for TX bundle, it will reduce the transmission utilization
> ratio for data packet.
>
> This patch enable the small credit size in firmware, firmware will use
> the new credit size 1556 bytes, it will increase the transmission
> utilization ratio for data packet on TX patch. It results in significant
> performance improvement on TX path.
>
> This patch only effect sdio chip, it will not effect PCI, SNOC etc.
>
> Tested with QCA6174 SDIO with firmware
> WLAN.RMH.4.4.1-00017-QCARMSWP-1.
>
> Signed-off-by: Wen Gong <[email protected]>
> ---
> drivers/net/wireless/ath/ath10k/core.c | 16 ++++++++++++++++
> drivers/net/wireless/ath/ath10k/htc.c | 11 +++++++++--
> drivers/net/wireless/ath/ath10k/htc.h | 11 +++++++++--
> 3 files changed, 34 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
> index 351f4ed..7593d19 100644
> --- a/drivers/net/wireless/ath/ath10k/core.c
> +++ b/drivers/net/wireless/ath/ath10k/core.c
> @@ -31,6 +31,7 @@
> static unsigned int ath10k_cryptmode_param;
> static bool uart_print;
> static bool disable_tx_comp = true;
> +static bool alt_data = true;
> static bool skip_otp;
> static bool rawmode;
> static bool fw_diag_log;
> @@ -45,6 +46,15 @@
>
> /* If upper layer need the TX complete status, it can enable tx complete */
> module_param(disable_tx_comp, bool, 0644);
> +
> +/* alt_data is only used for sdio chip, for previous version of firmware, its
> + * alt data size is 1544 which is not enough for native wifi, so it need to
> + * alt_data for the firmware.
> + * If the firmware has changed alt data size to 1556, then it can enable
> + * alt_data for the firmware.
> + * alt_data will not effect PCI, SNOC etc.
> + */
> +module_param(alt_data, bool, 0644);
> module_param(skip_otp, bool, 0644);
> module_param(rawmode, bool, 0644);
> module_param(fw_diag_log, bool, 0644);
> @@ -701,6 +711,12 @@ static void ath10k_init_sdio(struct ath10k *ar, enum ath10k_firmware_mode mode)
> */
> param &= ~HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE;
>
> + /* If alternate credit size of 1556 as used by SDIO firmware is
> + * big enough for mac80211 / native wifi frames. enable it
> + */
> + if (alt_data && mode == ATH10K_FIRMWARE_MODE_NORMAL)
> + param |= HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE;
else
param &= ~HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE;
(and remove the mask above)
> +
> if (mode == ATH10K_FIRMWARE_MODE_UTF)
> param &= ~HI_ACS_FLAGS_SDIO_SWAP_MAILBOX_SET;
> else
> diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
> index e0eb5f0..5cacab6 100644
> --- a/drivers/net/wireless/ath/ath10k/htc.c
> +++ b/drivers/net/wireless/ath/ath10k/htc.c
> @@ -938,12 +938,15 @@ int ath10k_htc_wait_target(struct ath10k_htc *htc)
> */
> if (htc->control_resp_len >=
> sizeof(msg->hdr) + sizeof(msg->ready_ext)) {
> + htc->alt_data_credit_size =
> + __le16_to_cpu(msg->ready_ext.reserved) & 0x0fff;
Please define 0x0fff as a macro.
> htc->max_msgs_per_htc_bundle =
> min_t(u8, msg->ready_ext.max_msgs_per_htc_bundle,
> HTC_HOST_MAX_MSG_PER_RX_BUNDLE);
> ath10k_dbg(ar, ATH10K_DBG_HTC,
> - "Extended ready message. RX bundle size: %d\n",
> - htc->max_msgs_per_htc_bundle);
> + "Extended ready message. RX bundle size: %d, alt size:%d\n",
> + htc->max_msgs_per_htc_bundle,
> + htc->alt_data_credit_size);
> }
>
> INIT_WORK(&ar->bundle_tx_work, ath10k_htc_bundle_tx_work);
> @@ -1095,6 +1098,10 @@ int ath10k_htc_connect_service(struct ath10k_htc *htc,
> ep->tx_credits = tx_alloc;
> ep->tx_credit_size = htc->target_credit_size;
>
> + if (conn_req->service_id == ATH10K_HTC_SVC_ID_HTT_DATA_MSG &&
> + htc->alt_data_credit_size != 0)
> + ep->tx_credit_size = htc->alt_data_credit_size;
> +
> /* copy all the callbacks */
> ep->ep_ops = conn_req->ep_ops;
>
> diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
> index d805ea5..f0a9e60af 100644
> --- a/drivers/net/wireless/ath/ath10k/htc.h
> +++ b/drivers/net/wireless/ath/ath10k/htc.h
> @@ -139,8 +139,14 @@ struct ath10k_htc_ready_extended {
> struct ath10k_htc_ready base;
> u8 htc_version; /* @enum ath10k_htc_version */
> u8 max_msgs_per_htc_bundle;
> - u8 pad0;
> - u8 pad1;
> + union {
> + __le16 reserved;
> + struct {
> + u8 pad0;
> + u8 pad1;
> + } __packed;
> + } __packed;
> +
> } __packed;
>
> struct ath10k_htc_conn_svc {
> @@ -377,6 +383,7 @@ struct ath10k_htc {
> int total_transmit_credits;
> int target_credit_size;
> u8 max_msgs_per_htc_bundle;
> + int alt_data_credit_size;
> };
>
> int ath10k_htc_init(struct ath10k *ar);
> --
> 1.9.1
>
> -----Original Message-----
> From: ath10k <[email protected]> On Behalf Of Nicolas
> Boichat
> Sent: Wednesday, August 28, 2019 1:36 PM
> To: Wen Gong <[email protected]>
> Cc: open list:NETWORKING DRIVERS (WIRELESS) <linux-
> [email protected]>; [email protected]
> Subject: [EXT] Re: [PATCH v2 5/7] ath10k: add htt TX bundle for sdio
>
>
> > + int cn = 0;
> > + unsigned int skb_len;
> > +
> > + ath10k_dbg(ar, ATH10K_DBG_HTC, "bundle skb: len:%d\n",
> bundle_skb->len);
> > + skb_len = bundle_skb->len;
> > + ret = ath10k_htc_consume_credit(ep, skb_len, true);
>
> ret makes me think of some error status, can we find a better name?
> Like credit_available or something?
If consume fail, it mean a error status(-EAGAIN), then it mean fail for this tx.
> _______________________________________________
> ath10k mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/ath10k
-----Original Message-----
From: ath10k <[email protected]> On Behalf Of Nicolas Boichat
Sent: Wednesday, August 28, 2019 1:14 PM
To: Wen Gong <[email protected]>
Cc: open list:NETWORKING DRIVERS (WIRELESS) <[email protected]>; [email protected]
Subject: [EXT] Re: [PATCH v2 2/7] ath10k: change max RX bundle size from 8 to 32 for sdio
Changed and V3 sent, https://patchwork.kernel.org/patch/11122175/
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
> -----Original Message-----
> From: ath10k <[email protected]> On Behalf Of Wen Gong
> Sent: Wednesday, August 28, 2019 9:03 PM
> To: Nicolas Boichat <[email protected]>; Wen Gong
> <[email protected]>
> Cc: open list:NETWORKING DRIVERS (WIRELESS) <linux-
> [email protected]>; [email protected]
> Subject: [EXT] RE: [PATCH v2 5/7] ath10k: add htt TX bundle for sdio
>
Changed and V3 sent, https://patchwork.kernel.org/patch/11121539/
> _______________________________________________
> ath10k mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/ath10k
> -----Original Message-----
> From: ath10k <[email protected]> On Behalf Of Nicolas
> Boichat
> Sent: Wednesday, August 28, 2019 1:38 PM
> To: Wen Gong <[email protected]>
> Cc: open list:NETWORKING DRIVERS (WIRELESS) <linux-
> [email protected]>; [email protected]
> Subject: [EXT] Re: [PATCH v2 6/7] ath10k: enable alt data of TX path for sdio
>
Changed and V3 sent, https://patchwork.kernel.org/patch/11122141/
>
> _______________________________________________
> ath10k mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/ath10k