qcacld-3.0: Don’t consider pcl weightage for STA conn

If there is more than one STA iface concurrently active
and one of them is marked as a primary iface. The host
received CONCURRENT_DUAL_STA_POLICY vendor command with
policy PREFER_PRIMARY. Then Don’t consider PCL weightage
for an STA connection. Due to this host/fw allows a new
connection either in DBS, SCC or in MCC.

Change-Id: I400165f8dd3ab7b94b2cb808f8b34b34d6d42fee
CRs-Fixed: 2929015

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -491,6 +491,19 @@ uint32_t policy_mgr_get_concurrency_mode(struct wlan_objmgr_psoc *psoc);
 bool policy_mgr_is_chnl_in_diff_band(struct wlan_objmgr_psoc *psoc,
 				     uint32_t ch_freq);
 
+/**
+ * policy_mgr_is_pcl_weightage_required() - to check that PCL weightage req or
+ * not
+ * @psoc: pointer to psoc
+ *
+ * This API will check that whether PCL weightage need to consider in best
+ * candidate selection or not. If some APs are in PCL list, those AP will get
+ * additional weightage.
+ *
+ * Return: true if pcl weightage is not required
+ */
+bool policy_mgr_is_pcl_weightage_required(struct wlan_objmgr_psoc *psoc);
+
 /**
  * policy_mgr_check_for_session_conc() - Check if concurrency is
  * allowed for a session

components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c

@@ -1070,6 +1070,29 @@ bool policy_mgr_is_hw_dbs_capable(struct wlan_objmgr_psoc *psoc)
 	return true;
 }
 
+bool policy_mgr_is_pcl_weightage_required(struct wlan_objmgr_psoc *psoc)
+{
+	struct wlan_mlme_psoc_ext_obj *mlme_obj;
+	struct dual_sta_policy *dual_sta_policy;
+
+	mlme_obj = mlme_get_psoc_ext_obj(psoc);
+	if (!mlme_obj)
+		return true;
+
+	dual_sta_policy = &mlme_obj->cfg.gen.dual_sta_policy;
+
+	if (dual_sta_policy->concurrent_sta_policy  ==
+		QCA_WLAN_CONCURRENT_STA_POLICY_PREFER_PRIMARY &&
+		dual_sta_policy->primary_vdev_id != WLAN_UMAC_VDEV_ID_MAX) {
+		policy_mgr_debug("dual_sta_policy : %d, primary_vdev_id:%d",
+			dual_sta_policy->concurrent_sta_policy,
+			dual_sta_policy->primary_vdev_id);
+		return false;
+	}
+
+	return true;
+}
+
 bool policy_mgr_is_interband_mcc_supported(struct wlan_objmgr_psoc *psoc)
 {
 	struct policy_mgr_psoc_priv_obj *pm_ctx;

components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h

@@ -1980,7 +1980,6 @@ QDF_STATUS ucfg_mlme_set_primary_interface(struct wlan_objmgr_psoc *psoc,
 	return wlan_mlme_set_primary_interface(psoc, value);
 }
 
-
 /**
  * ucfg_mlme_set_enable_bcast_probe_rsp() - Set enable bcast probe resp info
  * @psoc: pointer to psoc object

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

@@ -920,11 +920,14 @@ static void cm_update_score_params(struct wlan_objmgr_psoc *psoc,
 	struct weight_cfg *weight_config;
 	struct psoc_mlme_obj *mlme_psoc_obj;
 	struct scoring_cfg *score_config;
+	struct dual_sta_policy *dual_sta_policy;
 
 	mlme_psoc_obj = wlan_psoc_mlme_get_cmpt_obj(psoc);
 	if (!mlme_psoc_obj)
 		return;
 
+	dual_sta_policy = &mlme_obj->cfg.gen.dual_sta_policy;
+
 	score_config = &mlme_psoc_obj->psoc_cfg.score_config;
 	roam_score_params = &mlme_obj->cfg.roam_scoring;
 	weight_config = &score_config->weight_config;
@@ -944,8 +947,14 @@ static void cm_update_score_params(struct wlan_objmgr_psoc *psoc,
 		weight_config->channel_congestion_weightage;
 	req_score_params->beamforming_weightage =
 		weight_config->beamforming_cap_weightage;
-	req_score_params->pcl_weightage =
-		weight_config->pcl_weightage;
+
+	/*
+	 * Don’t consider pcl weightage for STA connection,
+	 * if primary interface is configured.
+	 */
+	if (policy_mgr_is_pcl_weightage_required(psoc))
+		req_score_params->pcl_weightage = weight_config->pcl_weightage;
+
 	req_score_params->oce_wan_weightage = weight_config->oce_wan_weightage;
 	req_score_params->oce_ap_tx_pwr_weightage =
 		weight_config->oce_ap_tx_pwr_weightage;