From 3aa01be35aa97475c16f716c218c5fd28bca27f5 Mon Sep 17 00:00:00 2001 From: Dundi Raviteja Date: Mon, 21 May 2018 18:58:59 +0530 Subject: [PATCH] qcacld-3.0: Remove ini and iwpriv support for changing SIFS burst mode Remove support for enabling/disabling SIFS burst mode, SAP DFS channel SIFS burst and SIFS burst duration through ini parameter as well as through IOCTL Change-Id: I3d43afa3c0c85eef470a29b9e7ad812079666278 CRs-Fixed: 2238175 --- core/hdd/inc/wlan_hdd_cfg.h | 45 --------- core/hdd/inc/wlan_hdd_main.h | 4 +- core/hdd/src/wlan_hdd_cfg.c | 23 ----- core/hdd/src/wlan_hdd_hostapd.c | 17 +--- core/hdd/src/wlan_hdd_main.c | 11 +-- core/hdd/src/wlan_hdd_nan_datapath.c | 2 +- core/hdd/src/wlan_hdd_wext.c | 139 --------------------------- core/wma/inc/wma.h | 5 - core/wma/src/wma_main.c | 18 ---- 9 files changed, 4 insertions(+), 260 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index a1d333bd847c..aea2bef0965c 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -8116,11 +8116,6 @@ enum hdd_link_speed_rpt_type { #define CFG_IGNORE_CAC_MAX (1) #define CFG_IGNORE_CAC_DEFAULT (0) -#define CFG_ENABLE_SAP_DFS_CH_SIFS_BURST_NAME "gEnableSAPDfsChSifsBurst" -#define CFG_ENABLE_SAP_DFS_CH_SIFS_BURST_MIN (0) -#define CFG_ENABLE_SAP_DFS_CH_SIFS_BURST_MAX (1) -#define CFG_ENABLE_SAP_DFS_CH_SIFS_BURST_DEFAULT (1) - #define CFG_DFS_RADAR_PRI_MULTIPLIER_NAME "gDFSradarMappingPriMultiplier" #define CFG_DFS_RADAR_PRI_MULTIPLIER_DEFAULT (4) #define CFG_DFS_RADAR_PRI_MULTIPLIER_MIN (0) @@ -8185,32 +8180,6 @@ enum hdd_link_speed_rpt_type { #define CFG_WLAN_LOGGING_CONSOLE_SUPPORT_DEFAULT (1) #endif /* WLAN_LOGGING_SOCK_SVC_ENABLE */ -/* - * - * gEnableSifsBurst - Enables Sifs Burst - * @Min: 0 - * @Max: 3 - * @Default: 0 - * - * Sifs burst mode configuration - * 0) disabled - * 1) enabled, but disabled for legacy mode - * 3) enabled - * - * Related: None - * - * Supported Feature: STA - * - * Usage: Internal/External - * - * - */ - -#define CFG_ENABLE_SIFS_BURST "gEnableSifsBurst" -#define CFG_ENABLE_SIFS_BURST_MIN (0) -#define CFG_ENABLE_SIFS_BURST_MAX (3) -#define CFG_ENABLE_SIFS_BURST_DEFAULT (0) - #ifdef WLAN_FEATURE_LPSS #define CFG_ENABLE_LPASS_SUPPORT "gEnableLpassSupport" #define CFG_ENABLE_LPASS_SUPPORT_DEFAULT (0) @@ -10111,15 +10080,6 @@ enum dot11p_mode { #define CFG_FILTER_MULTICAST_REPLAY_MAX (1) #define CFG_FILTER_MULTICAST_REPLAY_DEFAULT (1) -/* - * This parameter will control SIFS burst duration in FW from 0 to 12 ms. - * Default value is set to 8ms. - */ -#define CFG_SIFS_BURST_DURATION_NAME "g_sifs_burst_duration" -#define CFG_SIFS_BURST_DURATION_MIN (0) -#define CFG_SIFS_BURST_DURATION_MAX (12) -#define CFG_SIFS_BURST_DURATION_DEFAULT (8) - /* Optimize channel avoidance indication coming from firmware */ #define CFG_OPTIMIZE_CA_EVENT_NAME "goptimize_chan_avoid_event" #define CFG_OPTIMIZE_CA_EVENT_DISABLE (0) @@ -14663,7 +14623,6 @@ struct hdd_config { uint8_t gMaxConcurrentActiveSessions; uint8_t ignoreCAC; - bool IsSapDfsChSifsBurstEnabled; /* Flag to indicate crash inject enabled or not */ bool crash_inject_enabled; @@ -14687,8 +14646,6 @@ struct hdd_config { bool wlan_logging_to_console; #endif /* WLAN_LOGGING_SOCK_SVC_ENABLE */ - uint8_t enableSifsBurst; - #ifdef WLAN_FEATURE_LPSS bool enable_lpass_support; #endif @@ -14867,8 +14824,6 @@ struct hdd_config { bool go_force_11n_for_11ac; uint16_t sap_tx_leakage_threshold; bool multicast_replay_filter; - /* parameter for indicating sifs burst duration to fw */ - uint8_t sifs_burst_duration; bool goptimize_chan_avoid_event; bool enable_go_cts2self_for_sta; uint32_t tx_aggregation_size; diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index d407328a5379..9c358792aa8d 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -354,9 +354,7 @@ static inline bool in_compat_syscall(void) { return is_compat_task(); } #define HDD_MIN_TX_POWER (-100) /* minimum tx power */ #define HDD_MAX_TX_POWER (+100) /* maximum tx power */ -/* FW expects burst duration in 1020*ms */ -#define SIFS_BURST_DUR_MULTIPLIER 1020 -#define SIFS_BURST_DUR_MAX 12240 +#define HDD_ENABLE_SIFS_BURST_DEFAULT (0) /* If IPA UC data path is enabled, target should reserve extra tx descriptors * for IPA data path. diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 62e50e858033..d29031c2132b 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -3107,13 +3107,6 @@ struct reg_table_entry g_registry_table[] = { CFG_IGNORE_CAC_MIN, CFG_IGNORE_CAC_MAX), - REG_VARIABLE(CFG_ENABLE_SAP_DFS_CH_SIFS_BURST_NAME, WLAN_PARAM_Integer, - struct hdd_config, IsSapDfsChSifsBurstEnabled, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_ENABLE_SAP_DFS_CH_SIFS_BURST_DEFAULT, - CFG_ENABLE_SAP_DFS_CH_SIFS_BURST_MIN, - CFG_ENABLE_SAP_DFS_CH_SIFS_BURST_MAX), - REG_VARIABLE(CFG_DFS_RADAR_PRI_MULTIPLIER_NAME, WLAN_PARAM_Integer, struct hdd_config, dfsRadarPriMultiplier, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -3172,13 +3165,6 @@ struct reg_table_entry g_registry_table[] = { CFG_WLAN_LOGGING_CONSOLE_SUPPORT_ENABLE), #endif /* WLAN_LOGGING_SOCK_SVC_ENABLE */ - REG_VARIABLE(CFG_ENABLE_SIFS_BURST, WLAN_PARAM_Integer, - struct hdd_config, enableSifsBurst, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_ENABLE_SIFS_BURST_DEFAULT, - CFG_ENABLE_SIFS_BURST_MIN, - CFG_ENABLE_SIFS_BURST_MAX), - #ifdef WLAN_FEATURE_LPSS REG_VARIABLE(CFG_ENABLE_LPASS_SUPPORT, WLAN_PARAM_Integer, struct hdd_config, enable_lpass_support, @@ -4203,13 +4189,6 @@ struct reg_table_entry g_registry_table[] = { CFG_FILTER_MULTICAST_REPLAY_MIN, CFG_FILTER_MULTICAST_REPLAY_MAX), - REG_VARIABLE(CFG_SIFS_BURST_DURATION_NAME, WLAN_PARAM_Integer, - struct hdd_config, sifs_burst_duration, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_SIFS_BURST_DURATION_DEFAULT, - CFG_SIFS_BURST_DURATION_MIN, - CFG_SIFS_BURST_DURATION_MAX), - REG_VARIABLE(CFG_ENABLE_PHY_REG, WLAN_PARAM_HexInteger, struct hdd_config, enable_phy_reg_retention, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -6763,8 +6742,6 @@ void hdd_cfg_print(struct hdd_context *hdd_ctx) hdd_debug("Name = [isRoamOffloadEnabled] Value = [%u]", hdd_ctx->config->isRoamOffloadEnabled); #endif - hdd_debug("Name = [gEnableSifsBurst] Value = [%u]", - hdd_ctx->config->enableSifsBurst); #ifdef WLAN_FEATURE_LPSS hdd_debug("Name = [gEnableLpassSupport] Value = [%u] ", diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 3a329b57c0ed..5511a639860c 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -1747,21 +1747,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, } } - if ((CHANNEL_STATE_DFS == wlan_reg_get_channel_state( - hdd_ctx->hdd_pdev, - ap_ctx->operating_channel)) - && (hdd_ctx->config->IsSapDfsChSifsBurstEnabled == 0)) { - - hdd_debug("Set SIFS Burst disable for DFS channel %d", - ap_ctx->operating_channel); - - if (wma_cli_set_command(adapter->session_id, - WMI_PDEV_PARAM_BURST_ENABLE, - 0, PDEV_CMD)) { - hdd_err("Failed to Set SIFS Burst channel: %d", - ap_ctx->operating_channel); - } - } /* Fill the params for sending IWEVCUSTOM Event * with SOFTAP.enabled */ @@ -6083,7 +6068,7 @@ QDF_STATUS hdd_init_ap_mode(struct hdd_adapter *adapter, bool reinit) ret = wma_cli_set_command(adapter->session_id, WMI_PDEV_PARAM_BURST_ENABLE, - hdd_ctx->config->enableSifsBurst, + HDD_ENABLE_SIFS_BURST_DEFAULT, PDEV_CMD); if (0 != ret) diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index bad0f37749c3..c7a493bb9694 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -4024,7 +4024,7 @@ QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter) ret_val = sme_cli_set_command(adapter->session_id, WMI_PDEV_PARAM_BURST_ENABLE, - hdd_ctx->config->enableSifsBurst, + HDD_ENABLE_SIFS_BURST_DEFAULT, PDEV_CMD); if (ret_val) hdd_err("WMI_PDEV_PARAM_BURST_ENABLE set failed %d", ret_val); @@ -10179,15 +10179,6 @@ int hdd_configure_cds(struct hdd_context *hdd_ctx) uint32_t num_11ag_tx_chains = 0; struct policy_mgr_dp_cbacks dp_cbs = {0}; - if (hdd_ctx->config->sifs_burst_duration) { - set_value = (SIFS_BURST_DUR_MULTIPLIER) * - hdd_ctx->config->sifs_burst_duration; - - if ((set_value > 0) && (set_value <= SIFS_BURST_DUR_MAX)) - sme_cli_set_command(0, (int)WMI_PDEV_PARAM_BURST_DUR, - set_value, PDEV_CMD); - } - if (hdd_ctx->config->is_force_1x1) sme_cli_set_command(0, (int)WMI_PDEV_PARAM_SET_IOT_PATTERN, 1, PDEV_CMD); diff --git a/core/hdd/src/wlan_hdd_nan_datapath.c b/core/hdd/src/wlan_hdd_nan_datapath.c index ffa5c44d31f7..a5262fcd215e 100644 --- a/core/hdd/src/wlan_hdd_nan_datapath.c +++ b/core/hdd/src/wlan_hdd_nan_datapath.c @@ -446,7 +446,7 @@ int hdd_init_nan_data_mode(struct hdd_adapter *adapter) ret_val = wma_cli_set_command((int)adapter->session_id, (int)WMI_PDEV_PARAM_BURST_ENABLE, - (int)hdd_ctx->config->enableSifsBurst, + (int)HDD_ENABLE_SIFS_BURST_DEFAULT, PDEV_CMD); if (0 != ret_val) hdd_err("WMI_PDEV_PARAM_BURST_ENABLE set failed %d", ret_val); diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 37967862c060..98de25a4c222 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -621,44 +621,6 @@ #define WE_SET_QPOWER_MAX_TX_BEFORE_WAKE 57 #define WE_SET_QPOWER_SPEC_PSPOLL_WAKE_INTERVAL 58 #define WE_SET_QPOWER_SPEC_MAX_SPEC_NODATA_PSPOLL 59 -/* - * - * burst_enable - Enables or disables the burst feature - * - * @INPUT: 0-Disable, 1-Enable - * - * @OUTPUT: None - * - * This IOCTL enables or disables the burst feature. - * - * @E.g: iwpriv wlan0 burst_enable 0 - * - * Supported Feature: STA - * - * Usage: Internal/External - * - * - */ -#define WE_SET_BURST_ENABLE 60 -/* - * - * burst_dur - Enables or disables the burst feature - * - * @INPUT: int 1…..int 8191 in microseconds - * - * @OUTPUT: None - * - * This IOCTL sets the burst duration. - * - * @E.g: iwpriv wlan0 burst_dur - * - * Supported Feature: STA - * - * Usage: Internal/External - * - * - */ -#define WE_SET_BURST_DUR 61 /* GTX Commands */ /* * @@ -1598,47 +1560,6 @@ #define WE_GET_QPOWER_MAX_TX_BEFORE_WAKE 42 #define WE_GET_QPOWER_SPEC_PSPOLL_WAKE_INTERVAL 43 #define WE_GET_QPOWER_SPEC_MAX_SPEC_NODATA_PSPOLL 44 -/* - * - * get_burst_en - Enables or disables the burst feature - * - * @INPUT: None - * - * @OUTPUT: Enable/disable of burst feature - * wlan0 get_burst_en:1 - * - * This IOCTL enables or disables the burst feature - * - * @E.g: iwpriv wlan0 get_burst_en - * - * Supported Feature:STA - * - * Usage: Internal/External - * - * - */ -#define WE_GET_BURST_ENABLE 45 -/* - * - * get_burst_dur - Get the burst duration - * - * @INPUT: None - * - * @OUTPUT: Duration in microseconds - * wlan0 get_burst_dur:8160 - * - * This IOCTL gets the burst duration - * This command is useful if setting burst enable - * - * @E.g: iwpriv wlan0 get_burst_dur - * - * Supported Feature: STA - * - * Usage: Internal/External - * - * - */ -#define WE_GET_BURST_DUR 46 /* GTX Commands */ /* * @@ -4732,29 +4653,6 @@ static int __iw_setint_getnone(struct net_device *dev, break; } - case WE_SET_BURST_ENABLE: - { - hdd_debug("SET Burst enable val %d", set_value); - if ((set_value == 0) || (set_value == 1) || (set_value == 3)) { - ret = wma_cli_set_command(adapter->session_id, - WMI_PDEV_PARAM_BURST_ENABLE, - set_value, PDEV_CMD); - } else - ret = -EINVAL; - break; - } - case WE_SET_BURST_DUR: - { - hdd_debug("SET Burst duration val %d", set_value); - if ((set_value > 0) && (set_value <= 102400)) - ret = wma_cli_set_command(adapter->session_id, - WMI_PDEV_PARAM_BURST_DUR, - set_value, PDEV_CMD); - else - ret = -EINVAL; - break; - } - case WE_SET_TX_CHAINMASK: { hdd_debug("WMI_PDEV_PARAM_TX_CHAIN_MASK val %d", @@ -5853,23 +5751,6 @@ static int __iw_setnone_getint(struct net_device *dev, break; } - case WE_GET_BURST_ENABLE: - { - hdd_debug("GET Burst enable value"); - *value = wma_cli_get_command(adapter->session_id, - WMI_PDEV_PARAM_BURST_ENABLE, - PDEV_CMD); - break; - } - case WE_GET_BURST_DUR: - { - hdd_debug("GET Burst Duration value"); - *value = wma_cli_get_command(adapter->session_id, - WMI_PDEV_PARAM_BURST_DUR, - PDEV_CMD); - break; - } - case WE_GET_TX_CHAINMASK: { hdd_debug("GET WMI_PDEV_PARAM_TX_CHAIN_MASK"); @@ -9361,16 +9242,6 @@ static const struct iw_priv_args we_private_args[] = { 0, "amsdu"}, - {WE_SET_BURST_ENABLE, - IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, - 0, - "burst_enable"}, - - {WE_SET_BURST_DUR, - IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, - 0, - "burst_dur"}, - {WE_SET_TXPOW_2G, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, @@ -9732,16 +9603,6 @@ static const struct iw_priv_args we_private_args[] = { IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_amsdu"}, - {WE_GET_BURST_ENABLE, - 0, - IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, - "get_burst_en"}, - - {WE_GET_BURST_DUR, - 0, - IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, - "get_burst_dur"}, - {WE_GET_TXPOW_2G, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index da29e4ff6f3b..bdfef0e0ea33 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -393,7 +393,6 @@ enum ds_mode { #define WMA_DEFAULT_QPOWER_MAX_PSPOLL_BEFORE_WAKE 1 #define WMA_DEFAULT_QPOWER_TX_WAKE_THRESHOLD 2 -#define WMA_DEFAULT_SIFS_BURST_DURATION 8160 #define WMA_VHT_PPS_PAID_MATCH 1 #define WMA_VHT_PPS_GID_MATCH 2 @@ -791,8 +790,6 @@ typedef struct { * @rxchainmask: rx chain mask * @txpow2g: tx power limit for 2GHz * @txpow5g: tx power limit for 5GHz - * @burst_enable: is burst enable/disable - * @burst_dur: burst duration * * This structure stores pdev parameters. * Some of these parameters are set in fw and some @@ -810,8 +807,6 @@ typedef struct { uint32_t rxchainmask; uint32_t txpow2g; uint32_t txpow5g; - uint32_t burst_enable; - uint32_t burst_dur; } pdev_cli_config_t; /** diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index ab3b820753e1..61138c79cca9 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -436,12 +436,6 @@ int wma_cli_get_command(int vdev_id, int param_id, int vpdev) case WMI_PDEV_PARAM_TXPOWER_LIMIT5G: ret = wma->pdevconfig.txpow5g; break; - case WMI_PDEV_PARAM_BURST_ENABLE: - ret = wma->pdevconfig.burst_enable; - break; - case WMI_PDEV_PARAM_BURST_DUR: - ret = wma->pdevconfig.burst_dur; - break; default: WMA_LOGE("Invalid cli_get pdev command/Not yet implemented 0x%x", param_id); @@ -1668,18 +1662,6 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, case WMI_PDEV_PARAM_RX_CHAIN_MASK: wma->pdevconfig.rxchainmask = privcmd->param_value; break; - case WMI_PDEV_PARAM_BURST_ENABLE: - wma->pdevconfig.burst_enable = privcmd->param_value; - if ((wma->pdevconfig.burst_enable == 1) && - (wma->pdevconfig.burst_dur == 0)) - wma->pdevconfig.burst_dur = - WMA_DEFAULT_SIFS_BURST_DURATION; - else if (wma->pdevconfig.burst_enable == 0) - wma->pdevconfig.burst_dur = 0; - break; - case WMI_PDEV_PARAM_BURST_DUR: - wma->pdevconfig.burst_dur = privcmd->param_value; - break; case WMI_PDEV_PARAM_TXPOWER_LIMIT2G: wma->pdevconfig.txpow2g = privcmd->param_value; if ((pMac->roam.configParam.bandCapability ==