qcacmn: Fix BSS scoring params

Currently the driver calculates the nss score
based upon the max capability of the AP, and not the
hw_mde config which would be there after connection
for example, the driver calculates the score for a
2x2 11n AP, and 1x1 VHT (11ac) AP, it connects to the
11n AP in 1x1 mode, if a concurrent connection is
present, which affects throughput

Fix is to check whether the current AP channel results
in DBS or not, if yes then change the NSS to 1 instead of
2

Change-Id: I80e2af00044b760325eb1a51b09a45189d58a417
CRs-Fixed: 2271976

umac/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -125,6 +125,20 @@ uint8_t policy_mgr_search_and_check_for_session_conc(
 		struct wlan_objmgr_psoc *psoc,
 		uint8_t session_id, void *roam_profile);
 
+/**
+ * policy_mgr_is_chnl_in_diff_band() - to check that given channel
+ * is in diff band from existing channel or not
+ * @psoc: pointer to psoc
+ * @channel: given channel
+ *
+ * This API will check that if the passed channel is in diff band than the
+ * already existing connections or not.
+ *
+ * Return: true if channel is in diff band
+ */
+bool policy_mgr_is_chnl_in_diff_band(struct wlan_objmgr_psoc *psoc,
+					    uint8_t channel);
+
 /**
  * policy_mgr_check_for_session_conc() - Check if concurrency is
  * allowed for a session

umac/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c

@@ -444,7 +444,7 @@ bool policy_mgr_is_dbs_allowed_for_concurrency(
 	return ret;
 }
 
-static bool policy_mgr_is_chnl_in_diff_band(struct wlan_objmgr_psoc *psoc,
+bool policy_mgr_is_chnl_in_diff_band(struct wlan_objmgr_psoc *psoc,
 					    uint8_t channel)
 {
 	uint8_t i, pm_chnl;

umac/scan/core/src/wlan_scan_bss_score.c

@@ -25,6 +25,7 @@
 #ifdef WLAN_POLICY_MGR_ENABLE
 #include "wlan_policy_mgr_api.h"
 #endif
+#include "wlan_reg_services_api.h"
 
 #define SCM_20MHZ_BW_INDEX                  0
 #define SCM_40MHZ_BW_INDEX                  1
@@ -549,13 +550,11 @@ static int32_t scm_calculate_congestion_score(
  */
 static int32_t scm_calculate_nss_score(struct wlan_objmgr_psoc *psoc,
 	struct scoring_config *score_config, uint8_t ap_nss,
-	uint8_t prorated_pct)
+	uint8_t prorated_pct, uint32_t sta_nss)
 {
 	uint8_t nss;
 	uint8_t score_pct;
-	uint8_t sta_nss;
 
-	sta_nss = score_config->nss;
 	nss = ap_nss;
 	if (sta_nss < nss)
 		nss = sta_nss;
@@ -629,6 +628,40 @@ static int32_t scm_calculate_oce_wan_score(
 			&score_params->oce_wan_scoring);
 }
 
+#ifdef WLAN_POLICY_MGR_ENABLE
+
+static uint32_t scm_get_sta_nss(struct wlan_objmgr_psoc *psoc,
+			uint8_t bss_channel,
+			uint8_t vdev_nss_2g,
+			uint8_t vdev_nss_5g)
+{
+	/*
+	 * If station support nss as 2*2 but AP support NSS as 1*1,
+	 * this AP will be given half weight compare to AP which are having
+	 * NSS as 2*2.
+	 */
+
+	if (policy_mgr_is_chnl_in_diff_band(psoc, bss_channel) &&
+	    policy_mgr_is_hw_dbs_capable(psoc) &&
+	    !(policy_mgr_is_hw_dbs_2x2_capable(psoc)))
+		return 1;
+
+	return (WLAN_REG_IS_24GHZ_CH(bss_channel) ?
+		vdev_nss_2g :
+		vdev_nss_5g);
+}
+#else
+static uint32_t scm_get_sta_nss(struct wlan_objmgr_psoc *psoc,
+			uint8_t bss_channel,
+			uint8_t vdev_nss_2g,
+			uint8_t vdev_nss_5g)
+{
+	return (WLAN_REG_IS_24GHZ_CH(bss_channel) ?
+		vdev_nss_2g :
+		vdev_nss_5g);
+}
+#endif
+
 int scm_calculate_bss_score(struct wlan_objmgr_psoc *psoc,
 		struct scan_default_params *params,
 		struct scan_cache_entry *entry,
@@ -656,6 +689,7 @@ int scm_calculate_bss_score(struct wlan_objmgr_psoc *psoc,
 	struct scoring_config *score_config;
 	struct weight_config *weight_config;
 	struct wlan_scan_obj *scan_obj;
+	uint32_t sta_nss;
 
 	scan_obj = wlan_psoc_get_scan_obj(psoc);
 	if (!scan_obj) {
@@ -747,13 +781,17 @@ int scm_calculate_bss_score(struct wlan_objmgr_psoc *psoc,
 	congestion_score = scm_calculate_congestion_score(entry, score_config);
 	score += congestion_score;
 
+	sta_nss = scm_get_sta_nss(psoc, entry->channel.chan_idx,
+				  score_config->vdev_nss_24g,
+				  score_config->vdev_nss_5g);
+
 	/*
 	 * If station support nss as 2*2 but AP support NSS as 1*1,
 	 * this AP will be given half weight compare to AP which are having
 	 * NSS as 2*2.
 	 */
 	nss_score = scm_calculate_nss_score(psoc, score_config, entry->nss,
-					    prorated_pcnt);
+					    prorated_pcnt, sta_nss);
 	score += nss_score;
 
 	oce_wan_score = scm_calculate_oce_wan_score(entry, score_config);
@@ -763,7 +801,7 @@ int scm_calculate_bss_score(struct wlan_objmgr_psoc *psoc,
 		  score_config->ht_cap, score_config->vht_cap,
 		  score_config->he_cap,  score_config->vht_24G_cap,
 		  score_config->beamformee_cap, score_config->cb_mode_24G,
-		  score_config->cb_mode_5G, score_config->nss);
+		  score_config->cb_mode_5G, sta_nss);
 
 	scm_debug("Candidate (BSSID: %pM Chan %d) Cap:: rssi=%d HT=%d VHT=%d HE %d su beamformer %d phymode=%d  air time fraction %d qbss load %d NSS %d",
 		  entry->bssid.bytes, entry->channel.chan_idx,

umac/scan/dispatcher/inc/wlan_scan_public_structs.h

@@ -475,7 +475,8 @@ struct scoring_config {
 	uint32_t band_weight_per_index;
 	uint8_t cb_mode_24G;
 	uint8_t cb_mode_5G;
-	uint8_t nss;
+	uint8_t vdev_nss_24g;
+	uint8_t vdev_nss_5g;
 	uint8_t ht_cap:1,
 		vht_cap:1,
 		he_cap:1,