Jelajahi Sumber

qcacld-3.0: Selectively reduce the policymgr logs

Reduce certain logs of policymgr from info to debug.

Change-Id: Idb2817c20f97d5a8888cbe685bdc3b1eaf77662e
CRs-Fixed: 2607035
Arun Kumar Khandavalli 5 tahun lalu
induk
melakukan
f4ed406089

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

@@ -980,25 +980,25 @@ policy_mgr_validate_dbs_switch(struct wlan_objmgr_psoc *psoc,
 	 */
 	if (policy_mgr_is_2x2_5G_1x1_2G_dbs_capable(psoc) ||
 	    policy_mgr_is_2x2_2G_1x1_5G_dbs_capable(psoc)) {
-		policy_mgr_info("curr dbs action %d new action %d",
-				hw_mode.action_type, action);
+		policy_mgr_debug("curr dbs action %d new action %d",
+				 hw_mode.action_type, action);
 		if (hw_mode.action_type == PM_DBS1 &&
 		    ((action == PM_DBS1 ||
 		    action == PM_DBS1_DOWNGRADE))) {
-			policy_mgr_err("driver is already in DBS_5G_2x2_24G_1x1 (%d), no further action %d needed",
-				       hw_mode.action_type, action);
+			policy_mgr_debug("driver is already in DBS_5G_2x2_24G_1x1 (%d), no further action %d needed",
+					 hw_mode.action_type, action);
 			return QDF_STATUS_E_ALREADY;
 		} else if (hw_mode.action_type == PM_DBS2 &&
 			   ((action == PM_DBS2 ||
 			   action == PM_DBS2_DOWNGRADE))) {
-			policy_mgr_err("driver is already in DBS_24G_2x2_5G_1x1 (%d), no further action %d needed",
-				       hw_mode.action_type, action);
+			policy_mgr_debug("driver is already in DBS_24G_2x2_5G_1x1 (%d), no further action %d needed",
+					 hw_mode.action_type, action);
 			return QDF_STATUS_E_ALREADY;
 		}
 	} else if ((action == PM_DBS_DOWNGRADE) || (action == PM_DBS) ||
 		   (action == PM_DBS_UPGRADE)) {
-		policy_mgr_err("driver is already in %s mode, no further action needed",
-			       (hw_mode.dbs_cap) ? "dbs" : "non dbs");
+		policy_mgr_debug("driver is already in %s mode, no further action needed",
+				 (hw_mode.dbs_cap) ? "dbs" : "non dbs");
 		return QDF_STATUS_E_ALREADY;
 	}
 	return QDF_STATUS_SUCCESS;
@@ -1756,8 +1756,8 @@ static void __policy_mgr_check_sta_ap_concurrent_ch_intf(void *data)
 	mcc_to_scc_switch =
 		policy_mgr_get_mcc_to_scc_switch_mode(psoc);
 
-	policy_mgr_info("Concurrent open sessions running: %d",
-		policy_mgr_concurrent_open_sessions_running(psoc));
+	policy_mgr_debug("Concurrent open sessions running: %d",
+			 policy_mgr_concurrent_open_sessions_running(psoc));
 
 	if (!policy_mgr_is_sap_go_existed(psoc))
 		goto end;
@@ -1798,8 +1798,8 @@ static void __policy_mgr_check_sta_ap_concurrent_ch_intf(void *data)
 				wlan_hdd_get_channel_for_sap_restart
 					(psoc, vdev_id[i], &ch_freq);
 			if (status == QDF_STATUS_SUCCESS) {
-				policy_mgr_info("SAP restarts due to MCC->SCC switch, old ch freq :%d new ch freq: %d",
-						op_ch_freq_list[i], ch_freq);
+				policy_mgr_debug("SAP restarts due to MCC->SCC switch, old ch freq :%d new ch freq: %d",
+						 op_ch_freq_list[i], ch_freq);
 				break;
 			}
 		}
@@ -2109,8 +2109,8 @@ void policy_mgr_check_concurrent_intf_and_restart_sap(
 
 	mcc_to_scc_switch =
 		policy_mgr_get_mcc_to_scc_switch_mode(psoc);
-	policy_mgr_info("MCC to SCC switch: %d chan: %d",
-			mcc_to_scc_switch, op_ch_freq_list[0]);
+	policy_mgr_debug("MCC to SCC switch: %d chan: %d",
+			 mcc_to_scc_switch, op_ch_freq_list[0]);
 sap_restart:
 	/*
 	 * If sta_sap_scc_on_dfs_chan is true then standalone SAP is not
@@ -2126,7 +2126,7 @@ sap_restart:
 	    (sta_check || gc_check))) {
 		if (pm_ctx->sta_ap_intf_check_work_info) {
 			qdf_sched_work(0, &pm_ctx->sta_ap_intf_check_work);
-			policy_mgr_info(
+			policy_mgr_debug(
 				"Checking for Concurrent Change interference");
 		}
 	}
@@ -2427,7 +2427,7 @@ QDF_STATUS policy_mgr_check_and_set_hw_mode_for_channel_switch(
 	    (!policy_mgr_is_hw_dbs_2x2_capable(psoc) &&
 	    !policy_mgr_is_hw_dbs_required_for_band(
 					psoc, HW_MODE_MAC_BAND_2G))) {
-		policy_mgr_err("2x2 DBS is not enabled");
+		policy_mgr_debug("2x2 DBS is not enabled");
 		return QDF_STATUS_E_NOSUPPORT;
 	}
 
@@ -2439,12 +2439,12 @@ QDF_STATUS policy_mgr_check_and_set_hw_mode_for_channel_switch(
 	policy_mgr_stop_opportunistic_timer(psoc);
 
 	if (policy_mgr_is_current_hwmode_dbs(psoc)) {
-		policy_mgr_err("Already in DBS mode");
+		policy_mgr_debug("Already in DBS mode");
 		return QDF_STATUS_E_ALREADY;
 	}
 
 	if (wlan_reg_freq_to_band(ch_freq) != REG_BAND_2G) {
-		policy_mgr_err("DBS is not required for 5Ghz chan");
+		policy_mgr_debug("DBS is not required for 5Ghz chan");
 		return QDF_STATUS_E_NOSUPPORT;
 	}
 
@@ -2628,21 +2628,21 @@ enum policy_mgr_hw_mode_change policy_mgr_get_hw_mode_change_from_hw_mode_index(
 	}
 
 	if (hw_mode.dbs_cap) {
-		policy_mgr_info("DBS is requested with HW (%d)",
-		hw_mode_index);
+		policy_mgr_debug("DBS is requested with HW (%d)",
+				 hw_mode_index);
 		value = POLICY_MGR_DBS_IN_PROGRESS;
 		goto ret_value;
 	}
 
 	if (hw_mode.sbs_cap) {
-		policy_mgr_info("SBS is requested with HW (%d)",
-		hw_mode_index);
+		policy_mgr_debug("SBS is requested with HW (%d)",
+				 hw_mode_index);
 		value = POLICY_MGR_SBS_IN_PROGRESS;
 		goto ret_value;
 	}
 
 	value = POLICY_MGR_SMM_IN_PROGRESS;
-	policy_mgr_info("SMM is requested with HW (%d)", hw_mode_index);
+	policy_mgr_debug("SMM is requested with HW (%d)", hw_mode_index);
 
 ret_value:
 	return value;

+ 10 - 9
components/cmn_services/policy_mgr/src/wlan_policy_mgr_core.c

@@ -694,11 +694,12 @@ void policy_mgr_store_and_del_conn_info(struct wlan_objmgr_psoc *psoc,
 
 	if (!found_index) {
 		*num_cxn_del = 0;
-		policy_mgr_err("Mode:%d not available in the conn info", mode);
+		policy_mgr_debug("Mode:%d not available in the conn info",
+				 mode);
 	} else {
 		*num_cxn_del = found_index;
-		policy_mgr_err("Mode:%d number of conn %d temp del",
-				mode, *num_cxn_del);
+		policy_mgr_debug("Mode:%d number of conn %d temp del",
+				 mode, *num_cxn_del);
 	}
 
 	/*
@@ -923,7 +924,7 @@ void policy_mgr_pdev_set_hw_mode_cb(uint32_t status,
 		POLICY_MGR_HW_MODE_NOT_IN_PROGRESS);
 
 	if (status != SET_HW_MODE_STATUS_OK) {
-		policy_mgr_err("Set HW mode failed with status %d", status);
+		policy_mgr_debug("Set HW mode failed with status %d", status);
 		goto next_action;
 	}
 
@@ -1265,7 +1266,7 @@ void policy_mgr_dump_current_concurrency(struct wlan_objmgr_psoc *psoc)
 	case 1:
 		policy_mgr_dump_current_concurrency_one_connection(cc_mode,
 					sizeof(cc_mode));
-		policy_mgr_err("%s Standalone", cc_mode);
+		policy_mgr_debug("%s Standalone", cc_mode);
 		break;
 	case 2:
 		count = policy_mgr_dump_current_concurrency_two_connection(
@@ -1280,7 +1281,7 @@ void policy_mgr_dump_current_concurrency(struct wlan_objmgr_psoc *psoc)
 		} else
 			strlcat(cc_mode, " DBS", sizeof(cc_mode));
 		qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);
-		policy_mgr_err("%s", cc_mode);
+		policy_mgr_debug("%s", cc_mode);
 		break;
 	case 3:
 		count = policy_mgr_dump_current_concurrency_three_connection(
@@ -1305,11 +1306,11 @@ void policy_mgr_dump_current_concurrency(struct wlan_objmgr_psoc *psoc)
 			policy_mgr_dump_dbs_concurrency(psoc, cc_mode,
 					sizeof(cc_mode));
 		}
-		policy_mgr_err("%s", cc_mode);
+		policy_mgr_debug("%s", cc_mode);
 		break;
 	default:
-		policy_mgr_err("unexpected num_connections value %d",
-			num_connections);
+		policy_mgr_debug("unexpected num_connections value %d",
+				 num_connections);
 		break;
 	}
 

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

@@ -1500,8 +1500,8 @@ bool policy_mgr_current_concurrency_is_mcc(struct wlan_objmgr_psoc *psoc)
 		}
 		break;
 	default:
-		policy_mgr_err("unexpected num_connections value %d",
-			num_connections);
+		policy_mgr_debug("unexpected num_connections value %d",
+				 num_connections);
 		break;
 	}
 
@@ -1585,8 +1585,8 @@ void policy_mgr_set_concurrency_mode(struct wlan_objmgr_psoc *psoc,
 		break;
 	}
 
-	policy_mgr_info("concurrency_mode = 0x%x Number of open sessions for mode %d = %d",
-		pm_ctx->concurrency_mode, mode,
+	policy_mgr_debug("concurrency_mode = 0x%x Number of open sessions for mode %d = %d",
+			 pm_ctx->concurrency_mode, mode,
 		pm_ctx->no_of_open_sessions[mode]);
 }
 
@@ -1624,9 +1624,9 @@ void policy_mgr_clear_concurrency_mode(struct wlan_objmgr_psoc *psoc,
 		break;
 	}
 
-	policy_mgr_info("concurrency_mode = 0x%x Number of open sessions for mode %d = %d",
-		pm_ctx->concurrency_mode, mode,
-		pm_ctx->no_of_open_sessions[mode]);
+	policy_mgr_debug("concurrency_mode = 0x%x Number of open sessions for mode %d = %d",
+			 pm_ctx->concurrency_mode, mode,
+			 pm_ctx->no_of_open_sessions[mode]);
 }
 
 void policy_mgr_incr_active_session(struct wlan_objmgr_psoc *psoc,
@@ -2616,8 +2616,8 @@ uint32_t policy_mgr_get_concurrency_mode(struct wlan_objmgr_psoc *psoc)
 		return QDF_STA_MASK;
 	}
 
-	policy_mgr_info("concurrency_mode: 0x%x",
-			pm_ctx->concurrency_mode);
+	policy_mgr_debug("concurrency_mode: 0x%x",
+			 pm_ctx->concurrency_mode);
 
 	return pm_ctx->concurrency_mode;
 }
@@ -2876,7 +2876,7 @@ QDF_STATUS policy_mgr_change_mcc_go_beacon_interval(
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	policy_mgr_info("UPDATE Beacon Params");
+	policy_mgr_debug("UPDATE Beacon Params");
 
 	if (QDF_SAP_MODE == dev_mode) {
 		if (pm_ctx->sme_cbacks.sme_change_mcc_beacon_interval

+ 2 - 2
components/cmn_services/policy_mgr/src/wlan_policy_mgr_init_deinit.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2020 The Linux Foundation. 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
@@ -366,7 +366,7 @@ QDF_STATUS policy_mgr_psoc_close(struct wlan_objmgr_psoc *psoc)
 	if (pm_ctx->hw_mode.hw_mode_list) {
 		qdf_mem_free(pm_ctx->hw_mode.hw_mode_list);
 		pm_ctx->hw_mode.hw_mode_list = NULL;
-		policy_mgr_info("HW list is freed");
+		policy_mgr_debug("HW list is freed");
 	}
 
 	if (pm_ctx->sta_ap_intf_check_work_info) {