Переглянути джерело

qcacld-3.0: Optimize logs in policy_mgr_is_concurrency_allowed

Optimize logs in policy_mgr_is_concurrency_allowed.

Change-Id: I299ea6ec8252d52786d08630e1a5fb1987bce9db
CRs-Fixed: 2633500
Abhishek Singh 5 роки тому
батько
коміт
5c4790677d

+ 3 - 3
components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c

@@ -912,7 +912,7 @@ policy_mgr_current_connections_update(struct wlan_objmgr_psoc *psoc,
 	QDF_STATUS status;
 
 	if (!policy_mgr_is_hw_dbs_capable(psoc)) {
-		policy_mgr_err("driver isn't dbs capable, no further action needed");
+		policy_mgr_rl_debug("driver isn't dbs capable, no further action needed");
 		return QDF_STATUS_E_NOSUPPORT;
 	}
 
@@ -1041,7 +1041,7 @@ QDF_STATUS policy_mgr_next_actions(
 	enum policy_mgr_conc_next_action next_action;
 
 	if (policy_mgr_is_hw_dbs_capable(psoc) == false) {
-		policy_mgr_err("driver isn't dbs capable, no further action needed");
+		policy_mgr_rl_debug("driver isn't dbs capable, no further action needed");
 		return QDF_STATUS_E_NOSUPPORT;
 	}
 	status = policy_mgr_validate_unsupported_action(psoc, action);
@@ -2365,7 +2365,7 @@ QDF_STATUS policy_mgr_set_hw_mode_on_channel_switch(
 	enum policy_mgr_conc_next_action action;
 
 	if (!policy_mgr_is_hw_dbs_capable(psoc)) {
-		policy_mgr_err("PM/DBS is disabled");
+		policy_mgr_rl_debug("PM/DBS is disabled");
 		return status;
 	}
 

+ 8 - 8
components/cmn_services/policy_mgr/src/wlan_policy_mgr_core.c

@@ -2700,7 +2700,7 @@ bool policy_mgr_allow_new_home_channel(
 		  (IEEE80211_CHAN_DFS | IEEE80211_CHAN_DFS_CFREQ2)) ||
 		 (pm_conc_connection_list[1].ch_flagext &
 		  (IEEE80211_CHAN_DFS | IEEE80211_CHAN_DFS_CFREQ2)))) {
-			policy_mgr_err("Existing DFS connection, new 3-port DFS connection is not allowed");
+			policy_mgr_rl_debug("Existing DFS connection, new 3-port DFS connection is not allowed");
 			status = false;
 
 		} else if (((pm_conc_connection_list[0].freq !=
@@ -2714,7 +2714,7 @@ bool policy_mgr_allow_new_home_channel(
 				    pm_conc_connection_list[0].freq &&
 				    ch_freq !=
 				    pm_conc_connection_list[1].freq) {
-					policy_mgr_err("don't allow 3rd home channel on same MAC");
+					policy_mgr_rl_debug("don't allow 3rd home channel on same MAC");
 					status = false;
 				}
 			} else if ((pm_conc_connection_list[0].mode ==
@@ -2742,7 +2742,7 @@ bool policy_mgr_allow_new_home_channel(
 				   (pm_conc_connection_list[0].freq)) &&
 				   (WLAN_REG_IS_5GHZ_CH_FREQ
 				   (pm_conc_connection_list[1].freq)))) {
-				policy_mgr_err("don't allow 3rd home channel on same MAC");
+				policy_mgr_rl_debug("don't allow 3rd home channel on same MAC");
 				status = false;
 			}
 		} else if (pm_conc_connection_list[0].mac ==
@@ -2750,8 +2750,8 @@ bool policy_mgr_allow_new_home_channel(
 			/* Existing two connections are SCC */
 			if (policy_mgr_is_hw_dbs_capable(psoc) == false) {
 				/* keep legacy chip "allow" as it is */
-				policy_mgr_debug("allow 2 intf SCC + new intf ch %d for legacy hw",
-						 ch_freq);
+				policy_mgr_rl_debug("allow 2 intf SCC + new intf ch %d for legacy hw",
+						    ch_freq);
 			} else if ((pm_conc_connection_list[0].mode ==
 							    PM_NAN_DISC_MODE &&
 				    pm_conc_connection_list[1].mode ==
@@ -2772,7 +2772,7 @@ bool policy_mgr_allow_new_home_channel(
 					pm_conc_connection_list[0].mode,
 					pm_conc_connection_list[1].mode,
 					mode)) {
-				policy_mgr_err("don't allow 3rd home channel on same MAC - sta existing");
+				policy_mgr_rl_debug("don't allow 3rd home channel on same MAC - sta existing");
 				status = false;
 			}
 		}
@@ -2783,7 +2783,7 @@ bool policy_mgr_allow_new_home_channel(
 		(pm_conc_connection_list[0].ch_flagext &
 		 (IEEE80211_CHAN_DFS | IEEE80211_CHAN_DFS_CFREQ2))) {
 
-		policy_mgr_err("Existing DFS connection, new 2-port DFS connection is not allowed");
+		policy_mgr_rl_debug("Existing DFS connection, new 2-port DFS connection is not allowed");
 		status = false;
 	}
 	qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);
@@ -3001,7 +3001,7 @@ QDF_STATUS policy_mgr_complete_action(struct wlan_objmgr_psoc *psoc,
 	enum policy_mgr_band downgrade_band;
 
 	if (policy_mgr_is_hw_dbs_capable(psoc) == false) {
-		policy_mgr_err("driver isn't dbs capable, no further action needed");
+		policy_mgr_rl_debug("driver isn't dbs capable, no further action needed");
 		return QDF_STATUS_E_NOSUPPORT;
 	}
 

+ 23 - 23
components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c

@@ -1007,7 +1007,7 @@ QDF_STATUS policy_mgr_get_dbs_hw_modes(struct wlan_objmgr_psoc *psoc,
 	*two_by_two_dbs = false;
 
 	if (policy_mgr_is_hw_dbs_capable(psoc) == false) {
-		policy_mgr_err("HW is not DBS capable");
+		policy_mgr_rl_debug("HW is not DBS capable");
 		/* Caller will understand that DBS is disabled */
 		return QDF_STATUS_SUCCESS;
 
@@ -2240,7 +2240,7 @@ static bool policy_mgr_is_6g_channel_allowed(
 		if ((conn->mode == PM_SAP_MODE ||
 		     conn->mode == PM_P2P_GO_MODE) &&
 		    is_dfs && ch_freq != conn->freq) {
-			policy_mgr_err("don't allow MCC if SAP/GO on DFS channel");
+			policy_mgr_rl_debug("don't allow MCC if SAP/GO on DFS channel");
 			qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);
 			return false;
 		}
@@ -2273,14 +2273,14 @@ bool policy_mgr_is_concurrency_allowed(struct wlan_objmgr_psoc *psoc,
 	num_connections = policy_mgr_get_connection_count(psoc);
 
 	if (num_connections && policy_mgr_is_sub_20_mhz_enabled(psoc)) {
-		policy_mgr_err("dont allow concurrency if Sub 20 MHz is enabled");
+		policy_mgr_rl_debug("dont allow concurrency if Sub 20 MHz is enabled");
 		status = false;
 		goto done;
 	}
 
 	if (policy_mgr_max_concurrent_connections_reached(psoc)) {
-		policy_mgr_err("Reached max concurrent connections: %d",
-			       pm_ctx->cfg.max_conc_cxns);
+		policy_mgr_rl_debug("Reached max concurrent connections: %d",
+				    pm_ctx->cfg.max_conc_cxns);
 		goto done;
 	}
 
@@ -2329,7 +2329,7 @@ bool policy_mgr_is_concurrency_allowed(struct wlan_objmgr_psoc *psoc,
 								ch_freq);
 		}
 		if (true == match) {
-			policy_mgr_err("No MCC, SAP/GO about to come up on DFS channel");
+			policy_mgr_rl_debug("No MCC, SAP/GO about to come up on DFS channel");
 			goto done;
 		}
 		if ((policy_mgr_is_hw_dbs_capable(psoc) != true) &&
@@ -2348,7 +2348,7 @@ bool policy_mgr_is_concurrency_allowed(struct wlan_objmgr_psoc *psoc,
 							  list);
 	if (mode == PM_STA_MODE && count) {
 		if (count >= 2) {
-			policy_mgr_err("3rd STA isn't permitted");
+			policy_mgr_rl_debug("3rd STA isn't permitted");
 			goto done;
 		}
 		sta_freq = pm_conc_connection_list[list[0]].freq;
@@ -2366,23 +2366,23 @@ bool policy_mgr_is_concurrency_allowed(struct wlan_objmgr_psoc *psoc,
 	if ((PM_IBSS_MODE == mode) &&
 		(policy_mgr_mode_specific_connection_count(psoc,
 		PM_IBSS_MODE, list)) && count) {
-		policy_mgr_err("No 2nd IBSS, we already have STA + IBSS");
+		policy_mgr_rl_debug("No 2nd IBSS, we already have STA + IBSS");
 		goto done;
 	}
 	if ((PM_IBSS_MODE == mode) &&
 	    (wlan_reg_is_dfs_for_freq(pm_ctx->pdev, ch_freq)) && count) {
-		policy_mgr_err("No IBSS + STA SCC/MCC, IBSS is on DFS channel");
+		policy_mgr_rl_debug("No IBSS + STA SCC/MCC, IBSS is on DFS channel");
 		goto done;
 	}
 	if (PM_IBSS_MODE == mode) {
 		if (policy_mgr_is_hw_dbs_capable(psoc) == true) {
 			if (num_connections > 1) {
-				policy_mgr_err("No IBSS, we have concurrent connections already");
+				policy_mgr_rl_debug("No IBSS, we have concurrent connections already");
 				goto done;
 			}
 			qdf_mutex_acquire(&pm_ctx->qdf_conc_list_lock);
 			if (PM_STA_MODE != pm_conc_connection_list[0].mode) {
-				policy_mgr_err("No IBSS, we've a non-STA connection");
+				policy_mgr_rl_debug("No IBSS, we've a non-STA connection");
 				qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);
 				goto done;
 			}
@@ -2396,12 +2396,12 @@ bool policy_mgr_is_concurrency_allowed(struct wlan_objmgr_psoc *psoc,
 			    WLAN_REG_IS_SAME_BAND_FREQS(
 			    pm_conc_connection_list[0].freq, ch_freq)) {
 				qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);
-				policy_mgr_err("No IBSS + STA MCC");
+				policy_mgr_rl_debug("No IBSS + STA MCC");
 				goto done;
 			}
 			qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);
 		} else if (num_connections) {
-			policy_mgr_err("No IBSS, we have one connection already");
+			policy_mgr_rl_debug("No IBSS, we have one connection already");
 			goto done;
 		}
 	}
@@ -2409,7 +2409,7 @@ bool policy_mgr_is_concurrency_allowed(struct wlan_objmgr_psoc *psoc,
 	if ((PM_STA_MODE == mode) &&
 		(policy_mgr_mode_specific_connection_count(psoc,
 		PM_IBSS_MODE, list)) && count) {
-		policy_mgr_err("No 2nd STA, we already have STA + IBSS");
+		policy_mgr_rl_debug("No 2nd STA, we already have STA + IBSS");
 		goto done;
 	}
 
@@ -2418,7 +2418,7 @@ bool policy_mgr_is_concurrency_allowed(struct wlan_objmgr_psoc *psoc,
 		PM_IBSS_MODE, list))) {
 		if (policy_mgr_is_hw_dbs_capable(psoc) == true) {
 			if (num_connections > 1) {
-				policy_mgr_err("No 2nd STA, we already have IBSS concurrency");
+				policy_mgr_rl_debug("No 2nd STA, we already have IBSS concurrency");
 				goto done;
 			}
 			qdf_mutex_acquire(&pm_ctx->qdf_conc_list_lock);
@@ -2427,7 +2427,7 @@ bool policy_mgr_is_concurrency_allowed(struct wlan_objmgr_psoc *psoc,
 			    pm_conc_connection_list[0].freq)) &&
 			    (WLAN_REG_IS_5GHZ_CH_FREQ(ch_freq))) {
 				qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);
-				policy_mgr_err("No IBSS + STA SCC/MCC, IBSS is on DFS channel");
+				policy_mgr_rl_debug("No IBSS + STA SCC/MCC, IBSS is on DFS channel");
 				goto done;
 			}
 			/*
@@ -2438,20 +2438,20 @@ bool policy_mgr_is_concurrency_allowed(struct wlan_objmgr_psoc *psoc,
 			if (pm_conc_connection_list[0].freq != ch_freq &&
 			    WLAN_REG_IS_SAME_BAND_FREQS(
 			    pm_conc_connection_list[0].freq, ch_freq)) {
-				policy_mgr_err("No IBSS + STA MCC");
+				policy_mgr_rl_debug("No IBSS + STA MCC");
 				qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);
 				goto done;
 			}
 			qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);
 		} else {
-			policy_mgr_err("No STA, we have IBSS connection already");
+			policy_mgr_rl_debug("No STA, we have IBSS connection already");
 			goto done;
 		}
 	}
 
 	if (!policy_mgr_allow_sap_go_concurrency(psoc, mode, ch_freq,
 						 WLAN_INVALID_VDEV_ID)) {
-		policy_mgr_err("This concurrency combination is not allowed");
+		policy_mgr_rl_debug("This concurrency combination is not allowed");
 		goto done;
 	}
 	/* don't allow two P2P GO on same band */
@@ -2464,7 +2464,7 @@ bool policy_mgr_is_concurrency_allowed(struct wlan_objmgr_psoc *psoc,
 			if (WLAN_REG_IS_SAME_BAND_FREQS(
 			    ch_freq,
 			    pm_conc_connection_list[list[index]].freq)) {
-				policy_mgr_err("Don't allow P2P GO on same band");
+				policy_mgr_rl_debug("Don't allow P2P GO on same band");
 				qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);
 				goto done;
 			}
@@ -2474,7 +2474,7 @@ bool policy_mgr_is_concurrency_allowed(struct wlan_objmgr_psoc *psoc,
 	}
 
 	if (!policy_mgr_check_privacy_for_new_conn(pm_ctx)) {
-		policy_mgr_err("Don't allow new conn when wapi security conn existing");
+		policy_mgr_rl_debug("Don't allow new conn when wapi security conn existing");
 		goto done;
 	}
 
@@ -3236,8 +3236,8 @@ bool policy_mgr_scan_trim_5g_chnls_for_dfs_ap(struct wlan_objmgr_psoc *psoc)
 	    policy_mgr_get_single_mac_scan_with_dfs_config(psoc))
 		return false;
 
-	policy_mgr_err("scan skip 5g chan due to dfs ap(ch %d) present",
-		       ap_dfs_ch_freq);
+	policy_mgr_debug("scan skip 5g chan due to dfs ap(ch %d) present",
+			 ap_dfs_ch_freq);
 
 	return true;
 }