qcacld-3.0: Add ini to get wifi features from fw

Based on new requirement add an INI to enable/disable
get wifi features support.

Change-Id: I45ec54ac781724c2eaffa657f203db3abae2b74e
CRs-Fixed: 3266164

core/cds/inc/cds_config.h

@@ -92,6 +92,7 @@ struct wlan_cds_feature_set {
  * Structure for holding cds ini parameters.
  * @num_vdevs: Configured max number of VDEVs can be supported in the stack.
  * @cds_feature_set: CDS feature set structure.
+ * @get_wifi_features: Get wifi features from fw
  */
 
 struct cds_config_info {
@@ -126,6 +127,7 @@ struct cds_config_info {
 	bool enable_tx_compl_tsf64;
 #ifdef FEATURE_SET
 	struct wlan_cds_feature_set cds_feature_set;
+	bool get_wifi_features;
 #endif
 };
 #endif /* !defined( __CDS_CONFIG_H ) */

core/hdd/inc/hdd_config.h

@@ -133,6 +133,33 @@ enum hdd_dot11_mode {
 			CFG_VALUE_OR_DEFAULT, \
 			"dot11 mode")
 
+#ifdef FEATURE_SET
+  /*
+   * <ini>
+   * get_wifi_features  - Get wifi features info from fw
+   * @Min: 0
+   * @Max: 1
+   * @Default: 0
+   *
+   * This ini is used to enable feature to get wifi supported features from fw
+   *
+   * Related: None
+   *
+   * Supported Feature: All
+   *
+   * Usage: External
+   *
+   * </ini>
+   */
+#define CFG_GET_WIFI_FEATURES CFG_INI_BOOL( \
+		"get_wifi_features", \
+		0, \
+		"Get wifi features")
+#define CFG_GET_WIFI_FEATURES_ALL CFG(CFG_GET_WIFI_FEATURES)
+#else
+#define CFG_GET_WIFI_FEATURES_ALL
+#endif
+
 #ifdef QCA_WIFI_EMULATION
 #define CFG_INTERFACE_CHANGE_WAIT_DEFAULT	300000
 #else
@@ -1944,5 +1971,6 @@ enum host_log_level {
 	CFG(CFG_READ_MAC_ADDR_FROM_MAC_FILE) \
 	CFG(CFG_SAR_CONVERSION) \
 	CFG(CFG_ENABLE_HOST_MODULE_LOG_LEVEL) \
-	SAR_SAFETY_FEATURE_ALL
+	SAR_SAFETY_FEATURE_ALL \
+	CFG_GET_WIFI_FEATURES_ALL
 #endif

core/hdd/inc/wlan_hdd_cfg.h

@@ -204,6 +204,9 @@ struct hdd_config {
 	uint32_t sta_stats_cache_expiry_time;
 #endif
 	bool read_mac_addr_from_mac_file;
+#ifdef FEATURE_SET
+	bool get_wifi_features;
+#endif
 };
 
 /**

core/hdd/src/wlan_hdd_main.c

@@ -12390,6 +12390,26 @@ static void hdd_sar_cfg_update(struct hdd_config *config,
 }
 #endif
 
+#ifdef FEATURE_SET
+/**
+ * hdd_get_wifi_features_cfg_update() - Initialize get wifi features cfg
+ * @config: Pointer to HDD config
+ * @psoc: psoc pointer
+ *
+ * Return: None
+ */
+static void hdd_get_wifi_features_cfg_update(struct hdd_config *config,
+					     struct wlan_objmgr_psoc *psoc)
+{
+	config->get_wifi_features = cfg_get(psoc, CFG_GET_WIFI_FEATURES);
+}
+#else
+static void hdd_get_wifi_features_cfg_update(struct hdd_config *config,
+					     struct wlan_objmgr_psoc *psoc)
+{
+}
+#endif
+
 /**
  * hdd_cfg_params_init() - Initialize hdd params in hdd_config strucuture
  * @hdd_ctx - Pointer to HDD context
@@ -12511,6 +12531,8 @@ static void hdd_cfg_params_init(struct hdd_context *hdd_ctx)
 	hdd_club_ll_stats_in_get_sta_cfg_update(config, psoc);
 	config->read_mac_addr_from_mac_file =
 			cfg_get(psoc, CFG_READ_MAC_ADDR_FROM_MAC_FILE);
+
+	hdd_get_wifi_features_cfg_update(config, psoc);
 }
 
 #ifdef CONNECTION_ROAMING_CFG
@@ -13023,6 +13045,7 @@ static void hdd_populate_feature_set_cds_config(struct cds_config_info *cds_cfg,
 
 	psoc = hdd_ctx->psoc;
 
+	cds_cfg->get_wifi_features = hdd_ctx->config->get_wifi_features;
 	cds_cfg->cds_feature_set.wifi_standard = hdd_get_wifi_standard(hdd_ctx);
 
 	status = ucfg_mlme_get_band_capability(hdd_ctx->psoc, &band_capability);

core/wma/src/wma_main.c

@@ -507,8 +507,29 @@ static void wma_send_feature_set_cmd(tp_wma_handle wma_handle)
  */
 static bool wma_is_feature_set_supported(tp_wma_handle wma_handle)
 {
-	return wmi_service_enabled(wma_handle->wmi_handle,
-				   wmi_service_feature_set_event_support);
+	struct cds_context *cds_ctx =
+		(struct cds_context *)(wma_handle->cds_context);
+	bool is_feature_enabled_from_fw;
+
+	if (!cds_ctx) {
+		wma_err("Invalid cds context");
+		return false;
+	}
+
+	if (!cds_ctx->cds_cfg) {
+		wma_err("Invalid cds config");
+		return false;
+	}
+
+	is_feature_enabled_from_fw =
+		wmi_service_enabled(wma_handle->wmi_handle,
+				    wmi_service_feature_set_event_support);
+
+	if (!is_feature_enabled_from_fw)
+		wma_debug("Get wifi feature is disabled from fw");
+
+	return (is_feature_enabled_from_fw &&
+		cds_ctx->cds_cfg->get_wifi_features);
 }
 #else
 static inline void wma_send_feature_set_cmd(tp_wma_handle wma_handle)