From 2446f8ed54a804aad72d3b2a17fd3497b19481a0 Mon Sep 17 00:00:00 2001 From: Yu Tian Date: Thu, 18 Nov 2021 11:36:03 +0800 Subject: [PATCH] qcacmn: Clean up force BA64 ini config This force use BA64 ini config is no longer needed, because another gRxAggregationSize can do the same settings and more flexible. Change is used to remove this config. Change-Id: Ie780489849f8b701481a628a9bca2b4112460bd8 CRs-Fixed: 3076982 --- dp/wifi3.0/dp_peer.c | 16 ++++++---------- wlan_cfg/cfg_dp.h | 19 ------------------- wlan_cfg/wlan_cfg.c | 7 ------- wlan_cfg/wlan_cfg.h | 10 ---------- 4 files changed, 6 insertions(+), 46 deletions(-) diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c index 98388c309a..3cbb9bf238 100644 --- a/dp/wifi3.0/dp_peer.c +++ b/dp/wifi3.0/dp_peer.c @@ -4218,10 +4218,12 @@ int dp_addba_requestprocess_wifi3(struct cdp_soc_t *cdp_soc, { QDF_STATUS status = QDF_STATUS_SUCCESS; struct dp_rx_tid *rx_tid = NULL; - struct dp_soc *soc = (struct dp_soc *)cdp_soc; - struct dp_peer *peer = dp_peer_get_tgt_peer_hash_find(soc, peer_mac, - 0, vdev_id, - DP_MOD_ID_CDP); + struct dp_peer *peer; + + peer = dp_peer_get_tgt_peer_hash_find((struct dp_soc *)cdp_soc, + peer_mac, + 0, vdev_id, + DP_MOD_ID_CDP); if (!peer) { dp_peer_debug("%pK: Peer is NULL!\n", cdp_soc); @@ -4245,12 +4247,6 @@ int dp_addba_requestprocess_wifi3(struct cdp_soc_t *cdp_soc, goto fail; } - if (wlan_cfg_is_dp_force_rx_64_ba(soc->wlan_cfg_ctx)) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, - "force use BA64 scheme"); - buffersize = qdf_min((uint16_t)64, buffersize); - } - if (rx_tid->rx_ba_win_size_override == DP_RX_BA_SESSION_DISABLE) { dp_peer_info("%pK: disable BA session", cdp_soc); diff --git a/wlan_cfg/cfg_dp.h b/wlan_cfg/cfg_dp.h index 70a1b3635b..31372fb7d3 100644 --- a/wlan_cfg/cfg_dp.h +++ b/wlan_cfg/cfg_dp.h @@ -1195,24 +1195,6 @@ CFG_INI_BOOL("delay_mon_replenish", \ true, "Delay Monitor Replenish") -/* - * - * gForceRX64BA - enable force 64 blockack mode for RX - * @Min: 0 - * @Max: 1 - * @Default: 0 - * - * This ini is used to control DP Software to use 64 blockack - * for RX direction forcibly - * - * Usage: Internal - * - * - */ -#define CFG_FORCE_RX_64_BA \ - CFG_INI_BOOL("gForceRX64BA", \ - false, "Enable/Disable force 64 blockack in RX side") - /* * * ghw_cc_enable - enable HW cookie conversion by register @@ -1477,7 +1459,6 @@ CFG(CFG_DP_RX_RADIO_2_DEFAULT_REO) \ CFG(CFG_DP_WOW_CHECK_RX_PENDING) \ CFG(CFG_DP_HW_CC_ENABLE) \ - CFG(CFG_FORCE_RX_64_BA) \ CFG(CFG_DP_DELAY_MON_REPLENISH) \ CFG(CFG_DP_TX_MONITOR_BUF_RING) \ CFG(CFG_DP_TX_MONITOR_DST_RING) \ diff --git a/wlan_cfg/wlan_cfg.c b/wlan_cfg/wlan_cfg.c index 8e0ce2878d..1cbeb3989e 100644 --- a/wlan_cfg/wlan_cfg.c +++ b/wlan_cfg/wlan_cfg.c @@ -1828,8 +1828,6 @@ wlan_cfg_soc_attach(struct cdp_ctrl_objmgr_psoc *psoc) CFG_DP_RXDMA_ERR_DST_RING); wlan_cfg_ctx->enable_data_stall_detection = cfg_get(psoc, CFG_DP_ENABLE_DATA_STALL_DETECTION); - wlan_cfg_ctx->enable_force_rx_64_ba = - cfg_get(psoc, CFG_FORCE_RX_64_BA); wlan_cfg_ctx->tx_flow_start_queue_offset = cfg_get(psoc, CFG_DP_TX_FLOW_START_QUEUE_OFFSET); wlan_cfg_ctx->tx_flow_stop_queue_threshold = @@ -2855,11 +2853,6 @@ void wlan_cfg_set_rxdma1_enable(struct wlan_cfg_dp_soc_ctxt *cfg) cfg->rxdma1_enable = true; } -bool wlan_cfg_is_dp_force_rx_64_ba(struct wlan_cfg_dp_soc_ctxt *cfg) -{ - return cfg->enable_force_rx_64_ba; -} - void wlan_cfg_set_delay_mon_replenish(struct wlan_cfg_dp_soc_ctxt *cfg, bool val) diff --git a/wlan_cfg/wlan_cfg.h b/wlan_cfg/wlan_cfg.h index 3f90b9438e..f25cc76184 100644 --- a/wlan_cfg/wlan_cfg.h +++ b/wlan_cfg/wlan_cfg.h @@ -185,7 +185,6 @@ struct wlan_srng_cfg { * @rxdma_err_dst_ring: rxdma error detination ring size * @raw_mode_war: enable/disable raw mode war * @enable_data_stall_detection: flag to enable data stall detection - * @enable_force_rx_64_ba: flag to enable force 64 blockack in RX * @disable_intra_bss_fwd: flag to disable intra bss forwarding * @rxdma1_enable: flag to indicate if rxdma1 is enabled * @delay_mon_replenish: delay monitor buffer replenish @@ -317,7 +316,6 @@ struct wlan_cfg_dp_soc_ctxt { uint32_t per_pkt_trace; bool raw_mode_war; bool enable_data_stall_detection; - bool enable_force_rx_64_ba; bool disable_intra_bss_fwd; bool rxdma1_enable; bool delay_mon_replenish; @@ -1709,14 +1707,6 @@ bool wlan_cfg_is_fst_in_cmem_enabled(struct wlan_cfg_dp_soc_ctxt *cfg); */ bool wlan_cfg_is_swlm_enabled(struct wlan_cfg_dp_soc_ctxt *cfg); -/** - * wlan_cfg_is_dp_force_rx_64_ba() - Get force use 64 BA flag - * @cfg: config context - * - * Return: force use 64 BA flag - */ -bool wlan_cfg_is_dp_force_rx_64_ba(struct wlan_cfg_dp_soc_ctxt *cfg); - #ifdef IPA_OFFLOAD /* * wlan_cfg_ipa_tx_ring_size - Get Tx DMA ring size (TCL Data Ring)