| Message ID | 1566903707-27536-5-git-send-email-wgong@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ath10k: improve throughout of tcp/udp TX/RX of sdio | expand |
> -----Original Message----- > From: ath10k <ath10k-bounces@lists.infradead.org> On Behalf Of Wen Gong > Sent: Tuesday, August 27, 2019 7:02 PM > To: ath10k@lists.infradead.org > Cc: linux-wireless@vger.kernel.org > Subject: [EXT] [PATCH v2 4/7] ath10k: disable TX complete indication of htt > for sdio v2: change some code style > > _______________________________________________ > ath10k mailing list > ath10k@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/ath10k
On Tue, Aug 27, 2019 at 7:02 PM Wen Gong <wgong@codeaurora.org> wrote: > > Tx complete message from firmware cost bus bandwidth of sdio, and bus > bandwidth is the bollteneck of throughput, it will effect the bandwidth > occupancy of data packet of TX and RX. > > This patch disable TX complete indication from firmware for htt data > packet, it results in significant performance improvement on TX path. > > The downside of this patch is ath10k will not know the TX status of > the data packet for poor signal situation. Although upper network stack > or application layer have retry mechanism, the retry will be later than > ath10k get the TX fail status if not disable TX complete. > > This patch only effect sdio chip, it will not effect PCI, SNOC etc. > > 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/core.c | 6 ++++++ > drivers/net/wireless/ath/ath10k/hif.h | 9 ++++++++ > drivers/net/wireless/ath/ath10k/htc.c | 10 +++++++++ > drivers/net/wireless/ath/ath10k/htc.h | 3 +++ > drivers/net/wireless/ath/ath10k/htt.c | 5 +++++ > drivers/net/wireless/ath/ath10k/htt.h | 13 +++++++++++- > drivers/net/wireless/ath/ath10k/htt_rx.c | 35 +++++++++++++++++++++++++++++++- > drivers/net/wireless/ath/ath10k/htt_tx.c | 30 +++++++++++++++++++++++++++ > drivers/net/wireless/ath/ath10k/hw.h | 2 +- > drivers/net/wireless/ath/ath10k/sdio.c | 28 +++++++++++++++++++++++++ > 10 files changed, 138 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c > index dc45d16..762bba0 100644 > --- a/drivers/net/wireless/ath/ath10k/core.c > +++ b/drivers/net/wireless/ath/ath10k/core.c > @@ -30,6 +30,7 @@ > > static unsigned int ath10k_cryptmode_param; > static bool uart_print; > +static bool disable_tx_comp = true; So you don't like my feedback to call this enable_tx_comp? That's ok, but please let me know why ,-) > static bool skip_otp; > static bool rawmode; > static bool fw_diag_log; > @@ -41,6 +42,9 @@ > module_param_named(debug_mask, ath10k_debug_mask, uint, 0644); > module_param_named(cryptmode, ath10k_cryptmode_param, uint, 0644); > module_param(uart_print, bool, 0644); > + > +/* If upper layer need the TX complete status, it can enable tx complete */ > +module_param(disable_tx_comp, bool, 0644); > module_param(skip_otp, bool, 0644); > module_param(rawmode, bool, 0644); > module_param(fw_diag_log, bool, 0644); > @@ -689,6 +693,8 @@ static void ath10k_init_sdio(struct ath10k *ar, enum ath10k_firmware_mode mode) > * is used for SDIO. disable it until fixed > */ > param &= ~HI_ACS_FLAGS_SDIO_REDUCE_TX_COMPL_SET; > + if (disable_tx_comp) > + param |= HI_ACS_FLAGS_SDIO_REDUCE_TX_COMPL_SET; if (disable) param |= ..; else param &= ~..; > > /* Alternate credit size of 1544 as used by SDIO firmware is > * not big enough for mac80211 / native wifi frames. disable it > diff --git a/drivers/net/wireless/ath/ath10k/hif.h b/drivers/net/wireless/ath/ath10k/hif.h > index 496ee34..0dd8973 100644 > --- a/drivers/net/wireless/ath/ath10k/hif.h > +++ b/drivers/net/wireless/ath/ath10k/hif.h > @@ -56,6 +56,8 @@ struct ath10k_hif_ops { > > int (*swap_mailbox)(struct ath10k *ar); > > + int (*get_htt_tx_complete)(struct ath10k *ar); > + > int (*map_service_to_pipe)(struct ath10k *ar, u16 service_id, > u8 *ul_pipe, u8 *dl_pipe); > > @@ -144,6 +146,13 @@ static inline int ath10k_hif_swap_mailbox(struct ath10k *ar) > return 0; > } > > +static inline int ath10k_hif_get_htt_tx_complete(struct ath10k *ar) > +{ > + if (ar->hif.ops->get_htt_tx_complete) > + return ar->hif.ops->get_htt_tx_complete(ar); > + return 0; > +} > + > static inline int ath10k_hif_map_service_to_pipe(struct ath10k *ar, > u16 service_id, > u8 *ul_pipe, u8 *dl_pipe) > diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c > index 1d4d1a1..4c6cdc2 100644 > --- a/drivers/net/wireless/ath/ath10k/htc.c > +++ b/drivers/net/wireless/ath/ath10k/htc.c > @@ -660,6 +660,16 @@ int ath10k_htc_wait_target(struct ath10k_htc *htc) > return 0; > } > > +void ath10k_htc_change_tx_credit_flow(struct ath10k_htc *htc, > + enum ath10k_htc_ep_id eid, > + bool enable) > +{ > + struct ath10k *ar = htc->ar; > + struct ath10k_htc_ep *ep = &ar->htc.endpoint[eid]; > + > + ep->tx_credit_flow_enabled = enable; > +} > + > int ath10k_htc_connect_service(struct ath10k_htc *htc, > struct ath10k_htc_svc_conn_req *conn_req, > struct ath10k_htc_svc_conn_resp *conn_resp) > diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h > index 8a07da0..3c09fe8 100644 > --- a/drivers/net/wireless/ath/ath10k/htc.h > +++ b/drivers/net/wireless/ath/ath10k/htc.h > @@ -371,6 +371,9 @@ struct ath10k_htc { > int ath10k_htc_connect_service(struct ath10k_htc *htc, > struct ath10k_htc_svc_conn_req *conn_req, > struct ath10k_htc_svc_conn_resp *conn_resp); > +void ath10k_htc_change_tx_credit_flow(struct ath10k_htc *htc, > + enum ath10k_htc_ep_id eid, > + bool enable); > int ath10k_htc_send(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); > diff --git a/drivers/net/wireless/ath/ath10k/htt.c b/drivers/net/wireless/ath/ath10k/htt.c > index 7b75200..4354bf2 100644 > --- a/drivers/net/wireless/ath/ath10k/htt.c > +++ b/drivers/net/wireless/ath/ath10k/htt.c > @@ -10,6 +10,7 @@ > #include "htt.h" > #include "core.h" > #include "debug.h" > +#include "hif.h" > > static const enum htt_t2h_msg_type htt_main_t2h_msg_types[] = { > [HTT_MAIN_T2H_MSG_TYPE_VERSION_CONF] = HTT_T2H_MSG_TYPE_VERSION_CONF, > @@ -153,6 +154,10 @@ int ath10k_htt_connect(struct ath10k_htt *htt) > > htt->eid = conn_resp.eid; > > + 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); > + > return 0; > } > > diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h > index 30c0800..889bf9f 100644 > --- a/drivers/net/wireless/ath/ath10k/htt.h > +++ b/drivers/net/wireless/ath/ath10k/htt.h > @@ -150,9 +150,19 @@ enum htt_data_tx_desc_flags1 { > HTT_DATA_TX_DESC_FLAGS1_MORE_IN_BATCH = 1 << 12, > HTT_DATA_TX_DESC_FLAGS1_CKSUM_L3_OFFLOAD = 1 << 13, > HTT_DATA_TX_DESC_FLAGS1_CKSUM_L4_OFFLOAD = 1 << 14, > - HTT_DATA_TX_DESC_FLAGS1_RSVD1 = 1 << 15 > + HTT_DATA_TX_DESC_FLAGS1_TX_COMPLETE = 1 << 15 > }; > > +#define HTT_TX_CREDIT_DELTA_ABS_M 0xffff0000 > +#define HTT_TX_CREDIT_DELTA_ABS_S 16 > +#define HTT_TX_CREDIT_DELTA_ABS_GET(word) \ > + (((word) & HTT_TX_CREDIT_DELTA_ABS_M) >> HTT_TX_CREDIT_DELTA_ABS_S) > + > +#define HTT_TX_CREDIT_SIGN_BIT_M 0x00000100 > +#define HTT_TX_CREDIT_SIGN_BIT_S 8 > +#define HTT_TX_CREDIT_SIGN_BIT_GET(word) \ > + (((word) & HTT_TX_CREDIT_SIGN_BIT_M) >> HTT_TX_CREDIT_SIGN_BIT_S) > + > enum htt_data_tx_ext_tid { > HTT_DATA_TX_EXT_TID_NON_QOS_MCAST_BCAST = 16, > HTT_DATA_TX_EXT_TID_MGMT = 17, > @@ -2019,6 +2029,7 @@ struct ath10k_htt { > bool tx_mem_allocated; > const struct ath10k_htt_tx_ops *tx_ops; > const struct ath10k_htt_rx_ops *rx_ops; > + bool disable_tx_comp; > }; > > struct ath10k_htt_tx_ops { > diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c > index 83a7fb6..9990da7 100644 > --- a/drivers/net/wireless/ath/ath10k/htt_rx.c > +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c > @@ -3691,6 +3691,9 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb) > } > case HTT_T2H_MSG_TYPE_MGMT_TX_COMPLETION: { > struct htt_tx_done tx_done = {}; > + struct ath10k_htt *htt = &ar->htt; > + struct ath10k_htc *htc = &ar->htc; > + struct ath10k_htc_ep *ep = &ar->htc.endpoint[htt->eid]; > int status = __le32_to_cpu(resp->mgmt_tx_completion.status); > int info = __le32_to_cpu(resp->mgmt_tx_completion.info); > > @@ -3716,6 +3719,12 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb) > break; > } > > + if (htt->disable_tx_comp) { > + spin_lock_bh(&htc->tx_lock); > + ep->tx_credits++; > + spin_unlock_bh(&htc->tx_lock); > + } > + > status = ath10k_txrx_tx_unref(htt, &tx_done); > if (!status) { > spin_lock_bh(&htt->tx_lock); > @@ -3790,8 +3799,32 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb) > skb_queue_tail(&htt->rx_in_ord_compl_q, skb); > return false; > } > - case HTT_T2H_MSG_TYPE_TX_CREDIT_UPDATE_IND: > + case HTT_T2H_MSG_TYPE_TX_CREDIT_UPDATE_IND: { > + struct ath10k_htt *htt = &ar->htt; > + struct ath10k_htc *htc = &ar->htc; > + struct ath10k_htc_ep *ep = &ar->htc.endpoint[htt->eid]; > + __le32 *msg = (__le32 *)resp; > + u32 msg_word = __le32_to_cpu(*msg); Merge these 2 in one line. > + int htt_credit_delta; > + > + htt_credit_delta = HTT_TX_CREDIT_DELTA_ABS_GET(msg_word); > + if (HTT_TX_CREDIT_SIGN_BIT_GET(msg_word)) > + htt_credit_delta = -htt_credit_delta; > + > + ath10k_dbg(ar, ATH10K_DBG_HTT, > + "credit update: delta:%d\n", > + htt_credit_delta); > + > + if (htt->disable_tx_comp) { > + spin_lock_bh(&htc->tx_lock); > + ep->tx_credits += htt_credit_delta; > + spin_unlock_bh(&htc->tx_lock); > + ath10k_dbg(ar, ATH10K_DBG_HTT, > + "credit total:%d\n", > + ep->tx_credits); > + } > break; > + } > case HTT_T2H_MSG_TYPE_CHAN_CHANGE: { > u32 phymode = __le32_to_cpu(resp->chan_change.phymode); > u32 freq = __le32_to_cpu(resp->chan_change.freq); > diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c > index 2ef717f1..8da5545 100644 > --- a/drivers/net/wireless/ath/ath10k/htt_tx.c > +++ b/drivers/net/wireless/ath/ath10k/htt_tx.c > @@ -543,7 +543,33 @@ void ath10k_htt_tx_free(struct ath10k_htt *htt) > > void ath10k_htt_htc_tx_complete(struct ath10k *ar, struct sk_buff *skb) > { > + struct ath10k_htt *htt = &ar->htt; > + struct htt_tx_done tx_done = {0}; > + struct htt_cmd_hdr *htt_hdr; > + struct htt_data_tx_desc *desc_hdr; > + u16 flags1; > + > dev_kfree_skb_any(skb); > + > + if (htt->disable_tx_comp) { You can help reduce indentation in this function by doing: if (!htt->disable_tx_comp) return; Then if (htt_hdr->msg_type != HTT_H2T_MSG_TYPE_TX_FRM) return; > + htt_hdr = (struct htt_cmd_hdr *)skb->data; > + if (htt_hdr->msg_type == HTT_H2T_MSG_TYPE_TX_FRM) { > + desc_hdr = (struct htt_data_tx_desc *) > + (skb->data + sizeof(*htt_hdr)); > + flags1 = __le16_to_cpu(desc_hdr->flags1); > + > + ath10k_dbg(ar, ATH10K_DBG_HTT, > + "ath10k_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) > + return; > + > + tx_done.status = HTT_TX_COMPL_STATE_ACK; > + tx_done.msdu_id = __le16_to_cpu(desc_hdr->id); > + ath10k_txrx_tx_unref(&ar->htt, &tx_done); > + } > + } > } > > void ath10k_htt_hif_tx_complete(struct ath10k *ar, struct sk_buff *skb) > @@ -1260,6 +1286,10 @@ static int ath10k_htt_tx_hl(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txm > case ATH10K_HW_TXRX_MGMT: > flags0 |= SM(ATH10K_HW_TXRX_MGMT, > HTT_DATA_TX_DESC_FLAGS0_PKT_TYPE); > + > + if (htt->disable_tx_comp) > + flags1 |= HTT_DATA_TX_DESC_FLAGS1_TX_COMPLETE; > + Move this below, so that you first fully update flags0, then flags1? > flags0 |= HTT_DATA_TX_DESC_FLAGS0_MAC_HDR_PRESENT; > break; > } > diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h > index 2ae57c1..6349665 100644 > --- a/drivers/net/wireless/ath/ath10k/hw.h > +++ b/drivers/net/wireless/ath/ath10k/hw.h > @@ -759,7 +759,7 @@ struct ath10k_hw_ops { > #define TARGET_TLV_NUM_TDLS_VDEVS 1 > #define TARGET_TLV_NUM_TIDS ((TARGET_TLV_NUM_PEERS) * 2) > #define TARGET_TLV_NUM_MSDU_DESC (1024 + 32) > -#define TARGET_TLV_NUM_MSDU_DESC_HL 64 > +#define TARGET_TLV_NUM_MSDU_DESC_HL 1024 > #define TARGET_TLV_NUM_WOW_PATTERNS 22 > #define TARGET_TLV_MGMT_NUM_MSDU_DESC (50) > > diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c > index 5363a37..a302eda 100644 > --- a/drivers/net/wireless/ath/ath10k/sdio.c > +++ b/drivers/net/wireless/ath/ath10k/sdio.c > @@ -1790,6 +1790,33 @@ static int ath10k_sdio_hif_swap_mailbox(struct ath10k *ar) > return 0; > } > > +static int ath10k_sdio_get_htt_tx_complete(struct ath10k *ar) > +{ > + u32 addr, val; > + int ret; > + > + addr = host_interest_item_address(HI_ITEM(hi_acs_flags)); > + > + ret = ath10k_sdio_hif_diag_read32(ar, addr, &val); > + if (ret) { > + ath10k_warn(ar, > + "unable to read hi_acs_flags for htt tx comple : %d\n", ret); tx complete? > + return ret; > + } > + Is this a bit better? ret = (val & HI_ACS_FLAGS_SDIO_REDUCE_TX_COMPL_FW_ACK); if (ret) ... else ... return ret; Or even replace the if/else with: ath10k_dbg(ar, ATH10K_DBG_SDIO, "sdio reduce tx complete fw%sack\n", ret ? "" : " not "); > + if (val & HI_ACS_FLAGS_SDIO_REDUCE_TX_COMPL_FW_ACK) { > + ath10k_dbg(ar, ATH10K_DBG_SDIO, > + "sdio reduce tx comple fw ack\n"); > + ret = 1; > + } else { > + ath10k_dbg(ar, ATH10K_DBG_SDIO, > + "sdio reduce tx comple fw not ack\n"); > + ret = 0; > + } > + > + return ret; > +} > + > /* HIF start/stop */ > > static int ath10k_sdio_hif_start(struct ath10k *ar) > @@ -2073,6 +2100,7 @@ static void ath10k_sdio_hif_send_complete_check(struct ath10k *ar, > .start = ath10k_sdio_hif_start, > .stop = ath10k_sdio_hif_stop, > .swap_mailbox = ath10k_sdio_hif_swap_mailbox, > + .get_htt_tx_complete = ath10k_sdio_get_htt_tx_complete, > .map_service_to_pipe = ath10k_sdio_hif_map_service_to_pipe, > .get_default_pipe = ath10k_sdio_hif_get_default_pipe, > .send_complete_check = ath10k_sdio_hif_send_complete_check, > -- > 1.9.1 >
> -----Original Message----- > From: ath10k <ath10k-bounces@lists.infradead.org> On Behalf Of Nicolas > Boichat > Sent: Wednesday, August 28, 2019 1:27 PM > To: Wen Gong <wgong@codeaurora.org> > Cc: open list:NETWORKING DRIVERS (WIRELESS) <linux- > wireless@vger.kernel.org>; ath10k@lists.infradead.org > Subject: [EXT] Re: [PATCH v2 4/7] ath10k: disable TX complete indication of > htt for sdio > > static unsigned int ath10k_cryptmode_param; > > static bool uart_print; > > +static bool disable_tx_comp = true; > > So you don't like my feedback to call this enable_tx_comp? That's ok, > but please let me know why ,-) Since tx complete is enabled by default, so disable_tx_comp will be a Make sense word per my understand. > > _______________________________________________ > ath10k mailing list > ath10k@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/ath10k
> -----Original Message----- > From: ath10k <ath10k-bounces@lists.infradead.org> On Behalf Of Wen Gong > Sent: Wednesday, August 28, 2019 9:00 PM > To: Nicolas Boichat <drinkcat@chromium.org>; Wen Gong > <wgong@codeaurora.org> > Cc: open list:NETWORKING DRIVERS (WIRELESS) <linux- > wireless@vger.kernel.org>; ath10k@lists.infradead.org > Subject: [EXT] RE: [PATCH v2 4/7] ath10k: disable TX complete indication of > htt for sdio Changed and V3 sent, https://patchwork.kernel.org/patch/11122177/ > > _______________________________________________ > ath10k mailing list > ath10k@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/ath10k
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index dc45d16..762bba0 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -30,6 +30,7 @@ static unsigned int ath10k_cryptmode_param; static bool uart_print; +static bool disable_tx_comp = true; static bool skip_otp; static bool rawmode; static bool fw_diag_log; @@ -41,6 +42,9 @@ module_param_named(debug_mask, ath10k_debug_mask, uint, 0644); module_param_named(cryptmode, ath10k_cryptmode_param, uint, 0644); module_param(uart_print, bool, 0644); + +/* If upper layer need the TX complete status, it can enable tx complete */ +module_param(disable_tx_comp, bool, 0644); module_param(skip_otp, bool, 0644); module_param(rawmode, bool, 0644); module_param(fw_diag_log, bool, 0644); @@ -689,6 +693,8 @@ static void ath10k_init_sdio(struct ath10k *ar, enum ath10k_firmware_mode mode) * is used for SDIO. disable it until fixed */ param &= ~HI_ACS_FLAGS_SDIO_REDUCE_TX_COMPL_SET; + if (disable_tx_comp) + param |= HI_ACS_FLAGS_SDIO_REDUCE_TX_COMPL_SET; /* Alternate credit size of 1544 as used by SDIO firmware is * not big enough for mac80211 / native wifi frames. disable it diff --git a/drivers/net/wireless/ath/ath10k/hif.h b/drivers/net/wireless/ath/ath10k/hif.h index 496ee34..0dd8973 100644 --- a/drivers/net/wireless/ath/ath10k/hif.h +++ b/drivers/net/wireless/ath/ath10k/hif.h @@ -56,6 +56,8 @@ struct ath10k_hif_ops { int (*swap_mailbox)(struct ath10k *ar); + int (*get_htt_tx_complete)(struct ath10k *ar); + int (*map_service_to_pipe)(struct ath10k *ar, u16 service_id, u8 *ul_pipe, u8 *dl_pipe); @@ -144,6 +146,13 @@ static inline int ath10k_hif_swap_mailbox(struct ath10k *ar) return 0; } +static inline int ath10k_hif_get_htt_tx_complete(struct ath10k *ar) +{ + if (ar->hif.ops->get_htt_tx_complete) + return ar->hif.ops->get_htt_tx_complete(ar); + return 0; +} + static inline int ath10k_hif_map_service_to_pipe(struct ath10k *ar, u16 service_id, u8 *ul_pipe, u8 *dl_pipe) diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c index 1d4d1a1..4c6cdc2 100644 --- a/drivers/net/wireless/ath/ath10k/htc.c +++ b/drivers/net/wireless/ath/ath10k/htc.c @@ -660,6 +660,16 @@ int ath10k_htc_wait_target(struct ath10k_htc *htc) return 0; } +void ath10k_htc_change_tx_credit_flow(struct ath10k_htc *htc, + enum ath10k_htc_ep_id eid, + bool enable) +{ + struct ath10k *ar = htc->ar; + struct ath10k_htc_ep *ep = &ar->htc.endpoint[eid]; + + ep->tx_credit_flow_enabled = enable; +} + int ath10k_htc_connect_service(struct ath10k_htc *htc, struct ath10k_htc_svc_conn_req *conn_req, struct ath10k_htc_svc_conn_resp *conn_resp) diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h index 8a07da0..3c09fe8 100644 --- a/drivers/net/wireless/ath/ath10k/htc.h +++ b/drivers/net/wireless/ath/ath10k/htc.h @@ -371,6 +371,9 @@ struct ath10k_htc { int ath10k_htc_connect_service(struct ath10k_htc *htc, struct ath10k_htc_svc_conn_req *conn_req, struct ath10k_htc_svc_conn_resp *conn_resp); +void ath10k_htc_change_tx_credit_flow(struct ath10k_htc *htc, + enum ath10k_htc_ep_id eid, + bool enable); int ath10k_htc_send(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); diff --git a/drivers/net/wireless/ath/ath10k/htt.c b/drivers/net/wireless/ath/ath10k/htt.c index 7b75200..4354bf2 100644 --- a/drivers/net/wireless/ath/ath10k/htt.c +++ b/drivers/net/wireless/ath/ath10k/htt.c @@ -10,6 +10,7 @@ #include "htt.h" #include "core.h" #include "debug.h" +#include "hif.h" static const enum htt_t2h_msg_type htt_main_t2h_msg_types[] = { [HTT_MAIN_T2H_MSG_TYPE_VERSION_CONF] = HTT_T2H_MSG_TYPE_VERSION_CONF, @@ -153,6 +154,10 @@ int ath10k_htt_connect(struct ath10k_htt *htt) htt->eid = conn_resp.eid; + 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); + return 0; } diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h index 30c0800..889bf9f 100644 --- a/drivers/net/wireless/ath/ath10k/htt.h +++ b/drivers/net/wireless/ath/ath10k/htt.h @@ -150,9 +150,19 @@ enum htt_data_tx_desc_flags1 { HTT_DATA_TX_DESC_FLAGS1_MORE_IN_BATCH = 1 << 12, HTT_DATA_TX_DESC_FLAGS1_CKSUM_L3_OFFLOAD = 1 << 13, HTT_DATA_TX_DESC_FLAGS1_CKSUM_L4_OFFLOAD = 1 << 14, - HTT_DATA_TX_DESC_FLAGS1_RSVD1 = 1 << 15 + HTT_DATA_TX_DESC_FLAGS1_TX_COMPLETE = 1 << 15 }; +#define HTT_TX_CREDIT_DELTA_ABS_M 0xffff0000 +#define HTT_TX_CREDIT_DELTA_ABS_S 16 +#define HTT_TX_CREDIT_DELTA_ABS_GET(word) \ + (((word) & HTT_TX_CREDIT_DELTA_ABS_M) >> HTT_TX_CREDIT_DELTA_ABS_S) + +#define HTT_TX_CREDIT_SIGN_BIT_M 0x00000100 +#define HTT_TX_CREDIT_SIGN_BIT_S 8 +#define HTT_TX_CREDIT_SIGN_BIT_GET(word) \ + (((word) & HTT_TX_CREDIT_SIGN_BIT_M) >> HTT_TX_CREDIT_SIGN_BIT_S) + enum htt_data_tx_ext_tid { HTT_DATA_TX_EXT_TID_NON_QOS_MCAST_BCAST = 16, HTT_DATA_TX_EXT_TID_MGMT = 17, @@ -2019,6 +2029,7 @@ struct ath10k_htt { bool tx_mem_allocated; const struct ath10k_htt_tx_ops *tx_ops; const struct ath10k_htt_rx_ops *rx_ops; + bool disable_tx_comp; }; struct ath10k_htt_tx_ops { diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c index 83a7fb6..9990da7 100644 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c @@ -3691,6 +3691,9 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb) } case HTT_T2H_MSG_TYPE_MGMT_TX_COMPLETION: { struct htt_tx_done tx_done = {}; + struct ath10k_htt *htt = &ar->htt; + struct ath10k_htc *htc = &ar->htc; + struct ath10k_htc_ep *ep = &ar->htc.endpoint[htt->eid]; int status = __le32_to_cpu(resp->mgmt_tx_completion.status); int info = __le32_to_cpu(resp->mgmt_tx_completion.info); @@ -3716,6 +3719,12 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb) break; } + if (htt->disable_tx_comp) { + spin_lock_bh(&htc->tx_lock); + ep->tx_credits++; + spin_unlock_bh(&htc->tx_lock); + } + status = ath10k_txrx_tx_unref(htt, &tx_done); if (!status) { spin_lock_bh(&htt->tx_lock); @@ -3790,8 +3799,32 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb) skb_queue_tail(&htt->rx_in_ord_compl_q, skb); return false; } - case HTT_T2H_MSG_TYPE_TX_CREDIT_UPDATE_IND: + case HTT_T2H_MSG_TYPE_TX_CREDIT_UPDATE_IND: { + struct ath10k_htt *htt = &ar->htt; + struct ath10k_htc *htc = &ar->htc; + struct ath10k_htc_ep *ep = &ar->htc.endpoint[htt->eid]; + __le32 *msg = (__le32 *)resp; + u32 msg_word = __le32_to_cpu(*msg); + int htt_credit_delta; + + htt_credit_delta = HTT_TX_CREDIT_DELTA_ABS_GET(msg_word); + if (HTT_TX_CREDIT_SIGN_BIT_GET(msg_word)) + htt_credit_delta = -htt_credit_delta; + + ath10k_dbg(ar, ATH10K_DBG_HTT, + "credit update: delta:%d\n", + htt_credit_delta); + + if (htt->disable_tx_comp) { + spin_lock_bh(&htc->tx_lock); + ep->tx_credits += htt_credit_delta; + spin_unlock_bh(&htc->tx_lock); + ath10k_dbg(ar, ATH10K_DBG_HTT, + "credit total:%d\n", + ep->tx_credits); + } break; + } case HTT_T2H_MSG_TYPE_CHAN_CHANGE: { u32 phymode = __le32_to_cpu(resp->chan_change.phymode); u32 freq = __le32_to_cpu(resp->chan_change.freq); diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c index 2ef717f1..8da5545 100644 --- a/drivers/net/wireless/ath/ath10k/htt_tx.c +++ b/drivers/net/wireless/ath/ath10k/htt_tx.c @@ -543,7 +543,33 @@ void ath10k_htt_tx_free(struct ath10k_htt *htt) void ath10k_htt_htc_tx_complete(struct ath10k *ar, struct sk_buff *skb) { + struct ath10k_htt *htt = &ar->htt; + struct htt_tx_done tx_done = {0}; + struct htt_cmd_hdr *htt_hdr; + struct htt_data_tx_desc *desc_hdr; + u16 flags1; + dev_kfree_skb_any(skb); + + if (htt->disable_tx_comp) { + htt_hdr = (struct htt_cmd_hdr *)skb->data; + if (htt_hdr->msg_type == HTT_H2T_MSG_TYPE_TX_FRM) { + desc_hdr = (struct htt_data_tx_desc *) + (skb->data + sizeof(*htt_hdr)); + flags1 = __le16_to_cpu(desc_hdr->flags1); + + ath10k_dbg(ar, ATH10K_DBG_HTT, + "ath10k_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) + return; + + tx_done.status = HTT_TX_COMPL_STATE_ACK; + tx_done.msdu_id = __le16_to_cpu(desc_hdr->id); + ath10k_txrx_tx_unref(&ar->htt, &tx_done); + } + } } void ath10k_htt_hif_tx_complete(struct ath10k *ar, struct sk_buff *skb) @@ -1260,6 +1286,10 @@ static int ath10k_htt_tx_hl(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txm case ATH10K_HW_TXRX_MGMT: flags0 |= SM(ATH10K_HW_TXRX_MGMT, HTT_DATA_TX_DESC_FLAGS0_PKT_TYPE); + + if (htt->disable_tx_comp) + flags1 |= HTT_DATA_TX_DESC_FLAGS1_TX_COMPLETE; + flags0 |= HTT_DATA_TX_DESC_FLAGS0_MAC_HDR_PRESENT; break; } diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h index 2ae57c1..6349665 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -759,7 +759,7 @@ struct ath10k_hw_ops { #define TARGET_TLV_NUM_TDLS_VDEVS 1 #define TARGET_TLV_NUM_TIDS ((TARGET_TLV_NUM_PEERS) * 2) #define TARGET_TLV_NUM_MSDU_DESC (1024 + 32) -#define TARGET_TLV_NUM_MSDU_DESC_HL 64 +#define TARGET_TLV_NUM_MSDU_DESC_HL 1024 #define TARGET_TLV_NUM_WOW_PATTERNS 22 #define TARGET_TLV_MGMT_NUM_MSDU_DESC (50) diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c index 5363a37..a302eda 100644 --- a/drivers/net/wireless/ath/ath10k/sdio.c +++ b/drivers/net/wireless/ath/ath10k/sdio.c @@ -1790,6 +1790,33 @@ static int ath10k_sdio_hif_swap_mailbox(struct ath10k *ar) return 0; } +static int ath10k_sdio_get_htt_tx_complete(struct ath10k *ar) +{ + u32 addr, val; + int ret; + + addr = host_interest_item_address(HI_ITEM(hi_acs_flags)); + + ret = ath10k_sdio_hif_diag_read32(ar, addr, &val); + if (ret) { + ath10k_warn(ar, + "unable to read hi_acs_flags for htt tx comple : %d\n", ret); + return ret; + } + + if (val & HI_ACS_FLAGS_SDIO_REDUCE_TX_COMPL_FW_ACK) { + ath10k_dbg(ar, ATH10K_DBG_SDIO, + "sdio reduce tx comple fw ack\n"); + ret = 1; + } else { + ath10k_dbg(ar, ATH10K_DBG_SDIO, + "sdio reduce tx comple fw not ack\n"); + ret = 0; + } + + return ret; +} + /* HIF start/stop */ static int ath10k_sdio_hif_start(struct ath10k *ar) @@ -2073,6 +2100,7 @@ static void ath10k_sdio_hif_send_complete_check(struct ath10k *ar, .start = ath10k_sdio_hif_start, .stop = ath10k_sdio_hif_stop, .swap_mailbox = ath10k_sdio_hif_swap_mailbox, + .get_htt_tx_complete = ath10k_sdio_get_htt_tx_complete, .map_service_to_pipe = ath10k_sdio_hif_map_service_to_pipe, .get_default_pipe = ath10k_sdio_hif_get_default_pipe, .send_complete_check = ath10k_sdio_hif_send_complete_check,
Tx complete message from firmware cost bus bandwidth of sdio, and bus bandwidth is the bollteneck of throughput, it will effect the bandwidth occupancy of data packet of TX and RX. This patch disable TX complete indication from firmware for htt data packet, it results in significant performance improvement on TX path. The downside of this patch is ath10k will not know the TX status of the data packet for poor signal situation. Although upper network stack or application layer have retry mechanism, the retry will be later than ath10k get the TX fail status if not disable TX complete. This patch only effect sdio chip, it will not effect PCI, SNOC etc. 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/core.c | 6 ++++++ drivers/net/wireless/ath/ath10k/hif.h | 9 ++++++++ drivers/net/wireless/ath/ath10k/htc.c | 10 +++++++++ drivers/net/wireless/ath/ath10k/htc.h | 3 +++ drivers/net/wireless/ath/ath10k/htt.c | 5 +++++ drivers/net/wireless/ath/ath10k/htt.h | 13 +++++++++++- drivers/net/wireless/ath/ath10k/htt_rx.c | 35 +++++++++++++++++++++++++++++++- drivers/net/wireless/ath/ath10k/htt_tx.c | 30 +++++++++++++++++++++++++++ drivers/net/wireless/ath/ath10k/hw.h | 2 +- drivers/net/wireless/ath/ath10k/sdio.c | 28 +++++++++++++++++++++++++ 10 files changed, 138 insertions(+), 3 deletions(-)