qcacld-3.0: Add INI to configure SIFS burst mode

To pass WFA 11N 4.2.25 case, it's needed to enable legacy mode
SIFS burst. So add INI to make SIFS burst mode configurable.

Change-Id: I740fe33a7ae0d9b558aa3b3aeee434f482ed24cb
CRs-Fixed: 2486171

components/fw_offload/core/inc/wlan_fw_offload_main.h

@@ -162,6 +162,7 @@ struct wlan_fwol_neighbor_report_cfg {
  * @neighbor_report_cfg: 11K neighbor report config
  * @ani_enabled: ANI enable/disable
  * @enable_rts_sifsbursting: Enable RTS SIFS Bursting
+ * @enable_sifs_burst: Enable SIFS burst
  * @max_mpdus_inampdu: Max number of MPDUS
  * @arp_ac_category: ARP AC category
  * @enable_phy_reg_retention: Enable PHY reg retention
@@ -197,6 +198,7 @@ struct wlan_fwol_cfg {
 	struct wlan_fwol_neighbor_report_cfg neighbor_report_cfg;
 	bool ani_enabled;
 	bool enable_rts_sifsbursting;
+	uint8_t enable_sifs_burst;
 	uint8_t max_mpdus_inampdu;
 	uint32_t arp_ac_category;
 	uint8_t enable_phy_reg_retention;

components/fw_offload/core/src/wlan_fw_offload_main.c

@@ -500,6 +500,7 @@ QDF_STATUS fwol_cfg_on_psoc_enable(struct wlan_objmgr_psoc *psoc)
 	fwol_cfg->ani_enabled = cfg_get(psoc, CFG_ENABLE_ANI);
 	fwol_cfg->enable_rts_sifsbursting =
 				cfg_get(psoc, CFG_SET_RTS_FOR_SIFS_BURSTING);
+	fwol_cfg->enable_sifs_burst = cfg_get(psoc, CFG_SET_SIFS_BURST);
 	fwol_cfg->max_mpdus_inampdu = cfg_get(psoc, CFG_MAX_MPDUS_IN_AMPDU);
 	fwol_cfg->arp_ac_category = cfg_get(psoc, CFG_ARP_AC_CATEGORY);
 	fwol_cfg->enable_phy_reg_retention = cfg_get(psoc, CFG_ENABLE_PHY_REG);

components/fw_offload/dispatcher/inc/cfg_fwol_generic.h

@@ -65,6 +65,38 @@
 		0, \
 		"Set rts for sifs bursting")
 
+/*
+ * <ini>
+ * sifs_burst_mask - Set sifs burst mask
+ * @Min: 0
+ * @Max: 3
+ * @Default: 1
+ *
+ * This ini is used to set 11n and legacy(non 11n/wmm)
+ * sifs burst. Especially under running multi stream
+ * traffic test case, it can be useful to let the low
+ * priority AC, or legacy mode device, or the specified
+ * AC to aggressively contend air medium, then have a
+ * obvious improvement of throughput. Bit0 is the switch
+ * of sifs burst, it must be set if want to enable sifs
+ * burst, Bit1 is for legacy mode.
+ * Supported configuration:
+ * 0: disabled
+ * 1: enabled, but disabled for legacy mode
+ * 3: all enabled
+ *
+ * Usage: External
+ *
+ * </ini>
+ */
+#define CFG_SET_SIFS_BURST CFG_INI_UINT( \
+		"sifs_burst_mask", \
+		0, \
+		3, \
+		1, \
+		CFG_VALUE_OR_DEFAULT, \
+		"Set SIFS burst mask")
+
 /*
  * <ini>
  * gMaxMPDUsInAMPDU - max mpdus in ampdu
@@ -706,6 +738,7 @@
 	CFG_FWOL_DHCP \
 	CFG(CFG_ENABLE_ANI) \
 	CFG(CFG_SET_RTS_FOR_SIFS_BURSTING) \
+	CFG(CFG_SET_SIFS_BURST) \
 	CFG(CFG_MAX_MPDUS_IN_AMPDU) \
 	CFG(CFG_ARP_AC_CATEGORY) \
 	CFG(CFG_ENABLE_PHY_REG) \

components/fw_offload/dispatcher/inc/wlan_fwol_ucfg_api.h

@@ -158,6 +158,16 @@ QDF_STATUS ucfg_fwol_get_ani_enabled(struct wlan_objmgr_psoc *psoc,
 QDF_STATUS ucfg_get_enable_rts_sifsbursting(struct wlan_objmgr_psoc *psoc,
 					    bool *enable_rts_sifsbursting);
 
+/**
+ * ucfg_get_enable_sifs_burst() - Get the enable_sifs_burst value
+ * @psoc: pointer to the psoc object
+ * @enable_sifs_burst: pointer to return enable_sifs_burst value
+ *
+ * Return: QDF Status
+ */
+QDF_STATUS ucfg_get_enable_sifs_burst(struct wlan_objmgr_psoc *psoc,
+				      uint8_t *enable_sifs_burst);
+
 /**
  * ucfg_get_max_mpdus_inampdu() - Assigns the max_mpdus_inampdu value
  * @psoc: pointer to the psoc object

components/fw_offload/dispatcher/src/wlan_fwol_ucfg_api.c

@@ -290,6 +290,21 @@ QDF_STATUS ucfg_get_enable_rts_sifsbursting(struct wlan_objmgr_psoc *psoc,
 	return QDF_STATUS_SUCCESS;
 }
 
+QDF_STATUS ucfg_get_enable_sifs_burst(struct wlan_objmgr_psoc *psoc,
+				      uint8_t *enable_sifs_burst)
+{
+	struct wlan_fwol_psoc_obj *fwol_obj;
+
+	fwol_obj = fwol_get_psoc_obj(psoc);
+	if (!fwol_obj) {
+		fwol_err("Failed to get FWOL obj");
+		return QDF_STATUS_E_FAILURE;
+	}
+
+	*enable_sifs_burst = fwol_obj->cfg.enable_sifs_burst;
+	return QDF_STATUS_SUCCESS;
+}
+
 QDF_STATUS ucfg_get_max_mpdus_inampdu(struct wlan_objmgr_psoc *psoc,
 				      uint8_t *max_mpdus_inampdu)
 {

core/hdd/inc/wlan_hdd_main.h

@@ -344,7 +344,6 @@ enum hdd_driver_flags {
 #define HDD_MIN_TX_POWER (-100) /* minimum tx power */
 #define HDD_MAX_TX_POWER (+100) /* maximum tx power */
 
-#define HDD_ENABLE_SIFS_BURST_DEFAULT	(1)
 /* If IPA UC data path is enabled, target should reserve extra tx descriptors
  * for IPA data path.
  * Then host data path should allow less TX packet pumping in case

core/hdd/src/wlan_hdd_hostapd.c

@@ -3292,6 +3292,7 @@ QDF_STATUS hdd_init_ap_mode(struct hdd_adapter *adapter, bool reinit)
 	int ret;
 	enum dfs_mode acs_dfs_mode;
 	bool acs_with_more_param = 0;
+	uint8_t enable_sifs_burst = 0;
 
 	hdd_enter();
 
@@ -3364,11 +3365,14 @@ QDF_STATUS hdd_init_ap_mode(struct hdd_adapter *adapter, bool reinit)
 
 	set_bit(WMM_INIT_DONE, &adapter->event_flags);
 
+	status = ucfg_get_enable_sifs_burst(hdd_ctx->psoc, &enable_sifs_burst);
+	if (!QDF_IS_STATUS_SUCCESS(status))
+		hdd_err("Failed to get sifs burst value, use default");
+
 	ret = wma_cli_set_command(adapter->vdev_id,
 				  WMI_PDEV_PARAM_BURST_ENABLE,
-				  HDD_ENABLE_SIFS_BURST_DEFAULT,
+				  enable_sifs_burst,
 				  PDEV_CMD);
-
 	if (0 != ret)
 		hdd_err("WMI_PDEV_PARAM_BURST_ENABLE set failed: %d", ret);
 

core/hdd/src/wlan_hdd_main.c

@@ -4663,6 +4663,7 @@ QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter)
 	int ret_val;
 	mac_handle_t mac_handle;
 	bool bval = false;
+	uint8_t enable_sifs_burst = 0;
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	mac_handle = hdd_ctx->mac_handle;
@@ -4713,9 +4714,13 @@ QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter)
 
 	set_bit(WMM_INIT_DONE, &adapter->event_flags);
 
+	status = ucfg_get_enable_sifs_burst(hdd_ctx->psoc, &enable_sifs_burst);
+	if (!QDF_IS_STATUS_SUCCESS(status))
+		hdd_err("Failed to get sifs burst value, use default");
+
 	ret_val = sme_cli_set_command(adapter->vdev_id,
 				      WMI_PDEV_PARAM_BURST_ENABLE,
-				      HDD_ENABLE_SIFS_BURST_DEFAULT,
+				      enable_sifs_burst,
 				      PDEV_CMD);
 	if (ret_val)
 		hdd_err("WMI_PDEV_PARAM_BURST_ENABLE set failed %d", ret_val);

core/hdd/src/wlan_hdd_nan_datapath.c

@@ -41,6 +41,7 @@
 #include "wlan_mlme_ucfg_api.h"
 #include "qdf_util.h"
 #include <cdp_txrx_misc.h>
+#include "wlan_fwol_ucfg_api.h"
 
 /**
  * hdd_nan_datapath_target_config() - Configure NAN datapath features
@@ -439,6 +440,7 @@ int hdd_init_nan_data_mode(struct hdd_adapter *adapter)
 	int32_t ret_val;
 	mac_handle_t mac_handle;
 	bool bval = false;
+	uint8_t enable_sifs_burst = 0;
 
 	ret_val = hdd_vdev_create(adapter, hdd_sme_roam_callback, adapter);
 	if (ret_val) {
@@ -479,10 +481,14 @@ int hdd_init_nan_data_mode(struct hdd_adapter *adapter)
 
 	set_bit(WMM_INIT_DONE, &adapter->event_flags);
 
+	status = ucfg_get_enable_sifs_burst(hdd_ctx->psoc, &enable_sifs_burst);
+	if (!QDF_IS_STATUS_SUCCESS(status))
+		hdd_err("Failed to get sifs burst value, use default");
+
 	ret_val = wma_cli_set_command((int)adapter->vdev_id,
-			(int)WMI_PDEV_PARAM_BURST_ENABLE,
-			(int)HDD_ENABLE_SIFS_BURST_DEFAULT,
-			PDEV_CMD);
+				      (int)WMI_PDEV_PARAM_BURST_ENABLE,
+				      enable_sifs_burst,
+				      PDEV_CMD);
 	if (0 != ret_val)
 		hdd_err("WMI_PDEV_PARAM_BURST_ENABLE set failed %d", ret_val);