From 47c1ec75a2e606767763f42064f3828d5072ef6f Mon Sep 17 00:00:00 2001 From: Rakesh Pillai Date: Thu, 18 May 2023 07:17:31 -0700 Subject: [PATCH] qcacmn: FISA ini movement Move the non-converged INIs related to FISA out of cmn DP. Change-Id: I8b0419a753b3e11d4318f9ddab4dd975ef22786b CRs-Fixed: 3512036 --- wlan_cfg/cfg_dp.h | 44 -------------------------------------------- wlan_cfg/wlan_cfg.c | 29 ----------------------------- wlan_cfg/wlan_cfg.h | 22 ---------------------- 3 files changed, 95 deletions(-) diff --git a/wlan_cfg/cfg_dp.h b/wlan_cfg/cfg_dp.h index 7332d5418e..22fa532704 100644 --- a/wlan_cfg/cfg_dp.h +++ b/wlan_cfg/cfg_dp.h @@ -1417,48 +1417,6 @@ 0, 63, 0, \ CFG_VALUE_OR_DEFAULT, "RX pointer update entries number threshold") -/* - * - * dp_rx_fisa_enable - Control Rx datapath FISA - * @Min: 0 - * @Max: 1 - * @Default: 1 - * - * This ini is used to enable DP Rx FISA feature - * - * Related: dp_rx_flow_search_table_size - * - * Supported Feature: STA,P2P and SAP IPA disabled terminating - * - * Usage: Internal - * - * - */ -#define CFG_DP_RX_FISA_ENABLE \ - CFG_INI_BOOL("dp_rx_fisa_enable", true, \ - "Enable/Disable DP Rx FISA") - -/* - * - * dp_rx_fisa_lru_del_enable - Control Rx datapath FISA - * @Min: 0 - * @Max: 1 - * @Default: 1 - * - * This ini is used to enable DP Rx FISA lru deletion feature - * - * Related: dp_rx_fisa_enable - * - * Supported Feature: STA,P2P and SAP IPA disabled terminating - * - * Usage: Internal - * - * - */ -#define CFG_DP_RX_FISA_LRU_DEL_ENABLE \ - CFG_INI_BOOL("dp_rx_fisa_lru_del_enable", true, \ - "Enable/Disable DP Rx FISA LRU deletion") - #define CFG_DP_RXDMA_MONITOR_RX_DROP_THRESHOLD \ CFG_INI_UINT("mon_drop_thresh", \ WLAN_CFG_RXDMA_MONITOR_RX_DROP_THRESH_SIZE_MIN, \ @@ -2067,8 +2025,6 @@ CFG(CFG_DP_RX_MON_PROTOCOL_FLOW_TAG_ENABLE) \ CFG(CFG_DP_RXDMA_MONITOR_RX_DROP_THRESHOLD) \ CFG(CFG_DP_PKTLOG_BUFFER_SIZE) \ - CFG(CFG_DP_RX_FISA_ENABLE) \ - CFG(CFG_DP_RX_FISA_LRU_DEL_ENABLE) \ CFG(CFG_DP_FULL_MON_MODE) \ CFG(CFG_DP_REO_RINGS_MAP) \ CFG(CFG_DP_PEER_EXT_STATS) \ diff --git a/wlan_cfg/wlan_cfg.c b/wlan_cfg/wlan_cfg.c index 9ecaca5dd1..971bbcc20d 100644 --- a/wlan_cfg/wlan_cfg.c +++ b/wlan_cfg/wlan_cfg.c @@ -3407,7 +3407,6 @@ void wlan_set_srng_cfg(struct wlan_srng_cfg **wlan_cfg) } #endif - static const uint8_t rx_fst_toeplitz_key[WLAN_CFG_RX_FST_TOEPLITZ_KEYLEN] = { 0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2, 0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0, @@ -4088,9 +4087,6 @@ wlan_cfg_soc_attach(struct cdp_ctrl_objmgr_psoc *psoc) cfg_get(psoc, CFG_DP_RX_MON_PROTOCOL_FLOW_TAG_ENABLE); wlan_cfg_ctx->mon_drop_thresh = cfg_get(psoc, CFG_DP_RXDMA_MONITOR_RX_DROP_THRESHOLD); - wlan_cfg_ctx->is_rx_fisa_enabled = cfg_get(psoc, CFG_DP_RX_FISA_ENABLE); - wlan_cfg_ctx->is_rx_fisa_lru_del_enabled = - cfg_get(psoc, CFG_DP_RX_FISA_LRU_DEL_ENABLE); /* TODO: add INI item for RX RINGS MAPPING in RHINE */ wlan_cfg_ctx->rx_rings_mapping = 0x7; wlan_cfg_ctx->pext_stats_enabled = cfg_get(psoc, CFG_DP_PEER_EXT_STATS); @@ -4312,9 +4308,6 @@ wlan_cfg_soc_attach(struct cdp_ctrl_objmgr_psoc *psoc) cfg_get(psoc, CFG_DP_RX_MON_PROTOCOL_FLOW_TAG_ENABLE); wlan_cfg_ctx->mon_drop_thresh = cfg_get(psoc, CFG_DP_RXDMA_MONITOR_RX_DROP_THRESHOLD); - wlan_cfg_ctx->is_rx_fisa_enabled = cfg_get(psoc, CFG_DP_RX_FISA_ENABLE); - wlan_cfg_ctx->is_rx_fisa_lru_del_enabled = - cfg_get(psoc, CFG_DP_RX_FISA_LRU_DEL_ENABLE); wlan_cfg_ctx->reo_rings_mapping = cfg_get(psoc, CFG_DP_REO_RINGS_MAP); wlan_cfg_ctx->pext_stats_enabled = cfg_get(psoc, CFG_DP_PEER_EXT_STATS); wlan_cfg_ctx->jitter_stats_enabled = @@ -5351,28 +5344,6 @@ bool wlan_cfg_is_rx_flow_tag_enabled(struct wlan_cfg_dp_soc_ctxt *cfg) qdf_export_symbol(wlan_cfg_is_rx_flow_tag_enabled); -#ifdef WLAN_SUPPORT_RX_FISA -bool wlan_cfg_is_rx_fisa_enabled(struct wlan_cfg_dp_soc_ctxt *cfg) -{ - return (bool)(cfg->is_rx_fisa_enabled); -} - -bool wlan_cfg_is_rx_fisa_lru_del_enabled(struct wlan_cfg_dp_soc_ctxt *cfg) -{ - return cfg->is_rx_fisa_lru_del_enabled; -} -#else -bool wlan_cfg_is_rx_fisa_enabled(struct wlan_cfg_dp_soc_ctxt *cfg) -{ - return false; -} - -bool wlan_cfg_is_rx_fisa_lru_del_enabled(struct wlan_cfg_dp_soc_ctxt *cfg) -{ - return false; -} -#endif - bool wlan_cfg_is_poll_mode_enabled(struct wlan_cfg_dp_soc_ctxt *cfg) { return (bool)(cfg->is_poll_mode_enabled); diff --git a/wlan_cfg/wlan_cfg.h b/wlan_cfg/wlan_cfg.h index 22723d547d..8631e84923 100644 --- a/wlan_cfg/wlan_cfg.h +++ b/wlan_cfg/wlan_cfg.h @@ -467,8 +467,6 @@ struct wlan_cfg_dp_soc_ctxt { uint16_t rx_flow_max_search; uint8_t *rx_toeplitz_hash_key; uint8_t pktlog_buffer_size; - uint8_t is_rx_fisa_enabled; - bool is_rx_fisa_lru_del_enabled; bool is_tso_desc_attach_defer; uint32_t delayed_replenish_entries; uint32_t reo_rings_mapping; @@ -1977,26 +1975,6 @@ void wlan_cfg_fill_interrupt_mask(struct wlan_cfg_dp_soc_ctxt *wlan_cfg_ctx, bool is_monitor_mode, bool ppeds_attached, bool umac_reset_support); -/** - * wlan_cfg_is_rx_fisa_enabled() - Get Rx FISA enabled flag - * - * - * @cfg: soc configuration context - * - * Return: true if enabled, false otherwise. - */ -bool wlan_cfg_is_rx_fisa_enabled(struct wlan_cfg_dp_soc_ctxt *cfg); - -/** - * wlan_cfg_is_rx_fisa_lru_del_enabled() - Get Rx FISA LRU del enabled flag - * - * - * @cfg: soc configuration context - * - * Return: true if enabled, false otherwise. - */ -bool wlan_cfg_is_rx_fisa_lru_del_enabled(struct wlan_cfg_dp_soc_ctxt *cfg); - /** * wlan_cfg_is_rx_buffer_pool_enabled() - Get RX buffer pool enabled flag *