qcacld-3.0: Fix DFS channel weight factor issue

If normalize_acs_weight INI setting covers the DFS channel,
the existing DFS channel weight factor will be override.
Fix it by using the minimal weight factor for both setting.

Change-Id: Ie0fa3371bd99ee8d50c7abc81ddc8cd0eb84f9aa
CRs-Fixed: 3196688

core/sap/src/sap_ch_select.c

@@ -637,10 +637,10 @@ static uint32_t sap_weight_channel_noise_floor(struct sap_context *sap_ctx,
 	if (noise_floor_weight > softap_nf_weight_local)
 		noise_floor_weight = softap_nf_weight_local;
 
-	sap_debug("nf=%d, nfwc=%d, nfwl=%d, nfw=%d",
+	sap_debug("nf=%d, nfwc=%d, nfwl=%d, nfw=%d freq=%d",
 		  channel_stat->noise_floor,
 		  softap_nf_weight_cfg, softap_nf_weight_local,
-		  noise_floor_weight);
+		  noise_floor_weight, channel_stat->channelfreq);
 
 	return noise_floor_weight;
 }
@@ -1294,7 +1294,8 @@ static void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams,
 	qdf_list_node_t *cur_lst = NULL, *next_lst = NULL;
 	struct scan_cache_node *cur_node = NULL;
 	uint32_t normalized_weight;
-	uint8_t normalize_factor;
+	uint8_t normalize_factor = 100;
+	uint8_t dfs_normalize_factor;
 	uint32_t chan_freq;
 	struct acs_weight *weight_list =
 				mac->mlme_cfg->acs.normalize_weight_chan;
@@ -1413,23 +1414,14 @@ static void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams,
 
 		chan_freq = pSpectCh->chan_freq;
 
-		if (wlan_reg_is_dfs_for_freq(mac->pdev, chan_freq)) {
-			normalize_factor =
-				MLME_GET_DFS_CHAN_WEIGHT(
-				mac->mlme_cfg->acs.np_chan_weightage);
-			freq_present_in_list = true;
-			sap_debug_rl("DFS channel weightage %d",
-				     normalize_factor);
-		}
-
 		/* Check if the freq is present in range list */
 		for (i = 0; i < mac->mlme_cfg->acs.num_weight_range; i++) {
 			if (chan_freq >= range_list[i].start_freq &&
 			    chan_freq <= range_list[i].end_freq) {
 				normalize_factor =
 					range_list[i].normalize_weight;
-				sap_debug("Range list, freq %d normalize weight factor %d",
-					  chan_freq, normalize_factor);
+				sap_debug_rl("Range list, freq %d normalize weight factor %d",
+					     chan_freq, normalize_factor);
 				freq_present_in_list = true;
 			}
 		}
@@ -1447,6 +1439,21 @@ static void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams,
 			}
 		}
 
+		if (wlan_reg_is_dfs_for_freq(mac->pdev, chan_freq)) {
+			dfs_normalize_factor =
+				MLME_GET_DFS_CHAN_WEIGHT(
+				mac->mlme_cfg->acs.np_chan_weightage);
+			if (freq_present_in_list)
+				normalize_factor =
+					qdf_min(dfs_normalize_factor,
+						normalize_factor);
+			else
+				normalize_factor = dfs_normalize_factor;
+			freq_present_in_list = true;
+			sap_debug_rl("DFS channel weightage %d min %d",
+				     dfs_normalize_factor, normalize_factor);
+		}
+
 		if (freq_present_in_list) {
 			normalized_weight =
 				((SAP_ACS_WEIGHT_MAX - pSpectCh->weight) *
@@ -1463,9 +1470,10 @@ static void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams,
 		pSpectCh->weight_copy = pSpectCh->weight;
 
 debug_info:
-		sap_debug_rl("freq = %d, weight = %d rssi = %d bss count = %d",
+		sap_debug_rl("freq = %d, weight = %d rssi = %d bss count = %d factor %d",
 			     pSpectCh->chan_freq, pSpectCh->weight,
-			     pSpectCh->rssiAgr, pSpectCh->bssCount);
+			     pSpectCh->rssiAgr, pSpectCh->bssCount,
+			     normalize_factor);
 
 		pSpectCh++;
 	}