qcacld-3.0: Restore dual sta config after SSR

Save dual sta configuration in hdd context and
restore it after SSR. This allows driver STA + STA
connection in MCC/SCC.

Change-Id: Ia8bb8c845f0f76e7ce41ff32ab0a3bc6d5111018
CRs-Fixed: 2998225

components/mlme/core/src/wlan_mlme_main.c

@@ -2422,16 +2422,18 @@ mlme_init_iot_cfg(struct wlan_objmgr_psoc *psoc,
 }
 
 /**
- * mlme_init_primary_iface - Initialize primary iface
+ * mlme_init_dual_sta_config - Initialize dual sta configuratons
  *
  * @gen: Generic CFG config items
  *
  * Return: None
  */
 static void
-mlme_init_primary_iface(struct wlan_mlme_generic *gen)
+mlme_init_dual_sta_config(struct wlan_mlme_generic *gen)
 {
 	gen->dual_sta_policy.primary_vdev_id = WLAN_UMAC_VDEV_ID_MAX;
+	gen->dual_sta_policy.concurrent_sta_policy =
+				QCA_WLAN_CONCURRENT_STA_POLICY_UNBIASED;
 }
 
 QDF_STATUS mlme_cfg_on_psoc_enable(struct wlan_objmgr_psoc *psoc)
@@ -2488,7 +2490,7 @@ QDF_STATUS mlme_cfg_on_psoc_enable(struct wlan_objmgr_psoc *psoc)
 	mlme_init_roam_score_config(psoc, mlme_cfg);
 	mlme_init_ratemask_cfg(psoc, &mlme_cfg->ratemask_cfg);
 	mlme_init_iot_cfg(psoc, &mlme_cfg->iot);
-	mlme_init_primary_iface(&mlme_cfg->gen);
+	mlme_init_dual_sta_config(&mlme_cfg->gen);
 
 	return status;
 }

components/mlme/dispatcher/src/wlan_mlme_api.c

@@ -244,6 +244,7 @@ QDF_STATUS wlan_mlme_set_dual_sta_policy(struct wlan_objmgr_psoc *psoc,
 
 	mlme_obj->cfg.gen.dual_sta_policy.concurrent_sta_policy =
 								dual_sta_config;
+	mlme_debug("Set dual_sta_config to :%d", dual_sta_config);
 
 	return QDF_STATUS_SUCCESS;
 }

core/hdd/inc/wlan_hdd_main.h

@@ -1826,6 +1826,18 @@ struct hdd_adapter_ops_history {
 	struct hdd_adapter_ops_record entry[WLAN_HDD_ADAPTER_OPS_HISTORY_MAX];
 };
 
+/**
+ * struct hdd_dual_sta_policy - Concurrent STA policy configuration
+ * @dual_sta_policy: Possible values are defined in enum
+ * qca_wlan_concurrent_sta_policy_config
+ * @primary_vdev_id: specified iface is the primary STA iface, say 0 means
+ * vdev 0 is acting as primary interface
+ */
+struct hdd_dual_sta_policy {
+	uint8_t dual_sta_policy;
+	uint8_t primary_vdev_id;
+};
+
 /**
  * struct hdd_context - hdd shared driver and psoc/device context
  * @psoc: object manager psoc context
@@ -1852,6 +1864,7 @@ struct hdd_adapter_ops_history {
  * @is_dual_mac_cfg_updated: indicate whether dual mac cfg has been updated
  * @twt_en_dis_work: work to send twt enable/disable cmd on MCC/SCC concurrency
  * @dump_in_progress: Stores value of dump in progress
+ * @hdd_dual_sta_policy: Concurrent STA policy configuration
  */
 struct hdd_context {
 	struct wlan_objmgr_psoc *psoc;
@@ -2210,6 +2223,7 @@ struct hdd_context {
 	bool is_wifi3_0_target;
 	bool dump_in_progress;
 	qdf_time_t bw_vote_time;
+	struct hdd_dual_sta_policy dual_sta_policy;
 };
 
 /**

core/hdd/src/wlan_hdd_cfg80211.c

@@ -8532,6 +8532,13 @@ static int hdd_set_primary_interface(struct hdd_adapter *adapter,
 		return -EINVAL;
 	}
 
+	/* After SSR, the dual sta configuration is lost. As SSR is hidden from
+	 * userland, this command will not come from userspace after a SSR. To
+	 * restore this configuration, save this in hdd context and restore
+	 * after re-init.
+	 */
+	hdd_ctx->dual_sta_policy.primary_vdev_id = primary_vdev_id;
+
 	count = policy_mgr_mode_specific_connection_count(hdd_ctx->psoc,
 							  PM_STA_MODE, NULL);
 
@@ -12365,6 +12372,13 @@ static int __wlan_hdd_cfg80211_dual_sta_policy(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
+	/* After SSR, the dual sta configuration is lost. As SSR is hidden from
+	 * userland, this command will not come from userspace after a SSR. To
+	 * restore this configuration, save this in hdd context and restore
+	 * after re-init.
+	 */
+	hdd_ctx->dual_sta_policy.dual_sta_policy = dual_sta_config;
+
 	return 0;
 }
 

core/hdd/src/wlan_hdd_power.c

@@ -1703,6 +1703,36 @@ static inline void hdd_wlan_ssr_reinit_event(void)
 }
 #endif
 
+/**
+ * hdd_restore_dual_sta_config() - Restore dual sta configuration
+ * @hdd_ctx: pointer to struct hdd_context
+ *
+ * Return: None
+ */
+static void hdd_restore_dual_sta_config(struct hdd_context *hdd_ctx)
+{
+	QDF_STATUS status;
+	struct hdd_dual_sta_policy *sta_policy;
+
+	sta_policy = &hdd_ctx->dual_sta_policy;
+
+	hdd_debug("Restore dual sta config: Primary vdev_id:%d, sta policy:%d",
+		  sta_policy->primary_vdev_id,
+		  sta_policy->dual_sta_policy);
+
+	status =
+		ucfg_mlme_set_primary_interface(hdd_ctx->psoc,
+						sta_policy->primary_vdev_id);
+	if (QDF_IS_STATUS_ERROR(status))
+		hdd_err("could not set primary interface, %d", status);
+
+	status =
+		ucfg_mlme_set_dual_sta_policy(hdd_ctx->psoc,
+					      sta_policy->dual_sta_policy);
+	if (QDF_IS_STATUS_ERROR(status))
+		hdd_err("failed to set mlme dual sta config");
+}
+
 /**
  * hdd_send_default_scan_ies - send default scan ies to fw
  *
@@ -1854,6 +1884,7 @@ QDF_STATUS hdd_wlan_re_init(void)
 	hdd_restore_sar_config(hdd_ctx);
 
 	hdd_send_default_scan_ies(hdd_ctx);
+	hdd_restore_dual_sta_config(hdd_ctx);
 	hdd_info("WLAN host driver reinitiation completed!");
 
 	ucfg_mlme_get_sap_internal_restart(hdd_ctx->psoc, &value);