qcacld-3.0: Update PCL config in FW after roaming

If STA + STA concurrency is in DBS then irrespective of
primary interface configuration, DUT should meet below
expectations:
1. Roaming should get enabled on both the STAs interfaces.
2. Host should ensure that roaming bands are restricted to
   maintain only DBS

Change-Id: Ib28cb232650893e46da0dd8e7d47d3876546a1a1
CRs-Fixed: 3056820

components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_fw_sync.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -927,6 +928,9 @@ QDF_STATUS cm_fw_roam_complete(struct cnx_mgr *cm_ctx, void *data)
 	policy_mgr_check_n_start_opportunistic_timer(psoc);
 
 	policy_mgr_check_concurrent_intf_and_restart_sap(psoc);
+
+	wlan_cm_handle_sta_sta_roaming_enablement(psoc, vdev_id);
+
 	if (roam_synch_data->auth_status == ROAM_AUTH_STATUS_AUTHENTICATED)
 		wlan_cm_roam_state_change(pdev, vdev_id,
 					  WLAN_ROAM_RSO_ENABLED,

components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload.c

@@ -43,6 +43,7 @@
 #include "connection_mgr/core/src/wlan_cm_sm.h"
 #include "wlan_reg_ucfg_api.h"
 #include "wlan_connectivity_logging.h"
+#include "wlan_if_mgr_roam.h"
 
 #ifdef WLAN_FEATURE_SAE
 #define CM_IS_FW_FT_SAE_SUPPORTED(fw_akm_bitmap) \
@@ -3216,6 +3217,69 @@ static QDF_STATUS cm_is_rso_allowed(struct wlan_objmgr_psoc *psoc,
 	return status;
 }
 
+void cm_handle_sta_sta_roaming_enablement(struct wlan_objmgr_psoc *psoc,
+					  uint8_t curr_vdev_id)
+{
+	struct wlan_objmgr_vdev *vdev;
+	struct wlan_objmgr_pdev *pdev;
+	uint32_t sta_count, conn_idx = 0;
+	struct dual_sta_policy *dual_sta_policy;
+	struct wlan_mlme_psoc_ext_obj *mlme_obj;
+	uint8_t temp_vdev_id;
+	uint8_t vdev_id_list[MAX_NUMBER_OF_CONC_CONNECTIONS];
+
+	mlme_obj = mlme_get_psoc_ext_obj(psoc);
+	if (!mlme_obj)
+		return;
+
+	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, curr_vdev_id,
+						    WLAN_MLME_CM_ID);
+	if (!vdev) {
+		mlme_debug("vdev object is NULL");
+		return;
+	}
+
+	pdev = wlan_vdev_get_pdev(vdev);
+	if (!pdev)
+		goto rel_ref;
+
+	dual_sta_policy = &mlme_obj->cfg.gen.dual_sta_policy;
+	sta_count = policy_mgr_get_mode_specific_conn_info(psoc, NULL,
+							   vdev_id_list,
+							   PM_STA_MODE);
+
+	if (!(wlan_mlme_get_dual_sta_roaming_enabled(psoc) && sta_count == 2)) {
+		mlme_debug("Dual sta roaming is not enabled or count:%d",
+			   sta_count);
+		goto rel_ref;
+	}
+
+	if (!(policy_mgr_current_concurrency_is_mcc(psoc) ||
+	    policy_mgr_current_concurrency_is_scc(psoc))) {
+		mlme_debug("After roam on vdev_id:%d, STA + STA concurrency is in DBS:%d",
+			   curr_vdev_id, sta_count);
+		for (conn_idx = 0; conn_idx < sta_count; conn_idx++) {
+			temp_vdev_id = vdev_id_list[conn_idx];
+			if (temp_vdev_id == curr_vdev_id) {
+				wlan_cm_roam_activate_pcl_per_vdev(psoc,
+								   curr_vdev_id,
+								   true);
+				/* Set PCL after sending roam complete */
+				policy_mgr_set_pcl_for_existing_combo(psoc,
+								PM_STA_MODE,
+								curr_vdev_id);
+			} else {
+				/* Enable roaming on secondary vdev */
+				if_mgr_enable_roaming(pdev, vdev, RSO_SET_PCL);
+			}
+		}
+	} else {
+		mlme_debug("After roam STA + STA concurrency is in MCC/SCC");
+	}
+rel_ref:
+	wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_CM_ID);
+}
+
 QDF_STATUS cm_roam_send_rso_cmd(struct wlan_objmgr_psoc *psoc,
 				uint8_t vdev_id, uint8_t rso_command,
 				uint8_t reason)
@@ -3579,6 +3643,8 @@ cm_roam_switch_to_rso_enable(struct wlan_objmgr_pdev *pdev,
 	control_bitmap = mlme_get_operations_bitmap(psoc, vdev_id);
 
 	cur_state = mlme_get_roam_state(psoc, vdev_id);
+	mlme_debug("CM_RSO: vdev%d: cur_state : %d", vdev_id, cur_state);
+
 	switch (cur_state) {
 	case WLAN_ROAM_INIT:
 	case WLAN_ROAM_RSO_STOPPED:

components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -116,6 +117,23 @@ cm_roam_state_change(struct wlan_objmgr_pdev *pdev,
 		     enum roam_offload_state requested_state,
 		     uint8_t reason);
 
+/**
+ * cm_handle_sta_sta_roaming_enablement() - To handle roaming in case
+ * of STA + STA
+ * @psoc: psoc common object
+ * @curr_vdev_id: Vdev id
+ *
+ * This function is to process STA + STA concurrency scenarios after roaming
+ * and take care of following:
+ * 1. Set PCL to vdev/pdev as per DBS, SCC or MCC
+ * 2. Enable/disable roaming based on the concurrency (DBS vs SCC/MCC) after
+ * roaming
+ *
+ * Return: none
+ */
+void cm_handle_sta_sta_roaming_enablement(struct wlan_objmgr_psoc *psoc,
+					  uint8_t curr_vdev_id);
+
 /**
  * cm_roam_send_rso_cmd() - send rso command
  * @psoc: psoc pointer

components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_api.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -59,6 +60,19 @@ QDF_STATUS wlan_cm_roam_send_rso_cmd(struct wlan_objmgr_psoc *psoc,
 				     uint8_t vdev_id, uint8_t rso_command,
 				     uint8_t reason);
 
+/*
+ * wlan_cm_handle_sta_sta_roaming_enablement() - Handle roaming in case
+ * of STA + STA
+ * @psoc: psoc common object
+ * @vdev_id: Vdev id
+ *
+ * Wrapper function to cm_handle_sta_sta_roaming_enablement
+ *
+ * Return: none
+ */
+void wlan_cm_handle_sta_sta_roaming_enablement(struct wlan_objmgr_psoc *psoc,
+					       uint8_t vdev_id);
+
 /**
  * wlan_cm_roam_state_change() - Post roam state change to roam state machine
  * @pdev: pdev pointer
@@ -113,6 +127,12 @@ QDF_STATUS wlan_cm_roam_send_rso_cmd(struct wlan_objmgr_psoc *psoc,
 	return QDF_STATUS_E_NOSUPPORT;
 }
 
+static inline void
+wlan_cm_handle_sta_sta_roaming_enablement(struct wlan_objmgr_psoc *psoc,
+					  uint8_t vdev_id)
+{
+}
+
 static inline QDF_STATUS
 wlan_roam_update_cfg(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
 		     uint8_t reason)

components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_api.c

@@ -103,6 +103,12 @@ QDF_STATUS wlan_cm_roam_send_rso_cmd(struct wlan_objmgr_psoc *psoc,
 	return cm_roam_send_rso_cmd(psoc, vdev_id, rso_command, reason);
 }
 
+void wlan_cm_handle_sta_sta_roaming_enablement(struct wlan_objmgr_psoc *psoc,
+					       uint8_t vdev_id)
+{
+	return cm_handle_sta_sta_roaming_enablement(psoc, vdev_id);
+}
+
 QDF_STATUS
 wlan_roam_update_cfg(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
 		     uint8_t reason)