Browse Source

qcacld-3.0: Reduce excessive logging during suspend

There are several logs along the suspend/resume code paths that log
debugging related information at the INFO level. Reduce the logging
level of these debug logs to avoid spamming the console.

Change-Id: I0e81901e4a053038392c1012600ae125a1ad27a3
CRs-Fixed: 2258093
Dustin Brown 7 years ago
parent
commit
31321fa57d

+ 11 - 8
pmo/core/src/wlan_pmo_arp.c

@@ -102,8 +102,10 @@ static QDF_STATUS pmo_core_flush_arp_from_vdev_priv(
 	return QDF_STATUS_SUCCESS;
 }
 
-static QDF_STATUS pmo_core_do_enable_arp_offload(struct wlan_objmgr_vdev *vdev,
-		uint8_t vdev_id, enum pmo_offload_trigger trigger)
+static QDF_STATUS
+pmo_core_do_enable_arp_offload(struct wlan_objmgr_vdev *vdev,
+			       uint8_t vdev_id,
+			       enum pmo_offload_trigger trigger)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct pmo_psoc_priv_obj *psoc_ctx;
@@ -123,8 +125,8 @@ static QDF_STATUS pmo_core_do_enable_arp_offload(struct wlan_objmgr_vdev *vdev,
 	switch (trigger) {
 	case pmo_ipv4_change_notify:
 		if (!psoc_ctx->psoc_cfg.active_mode_offload) {
-			pmo_debug("active offload is disabled, skip in mode:%d",
-				trigger);
+			pmo_debug("active offload is disabled, skip in mode %d",
+				  trigger);
 			status = QDF_STATUS_E_INVAL;
 			goto out;
 		}
@@ -133,8 +135,8 @@ static QDF_STATUS pmo_core_do_enable_arp_offload(struct wlan_objmgr_vdev *vdev,
 		break;
 	case pmo_apps_suspend:
 		if (psoc_ctx->psoc_cfg.active_mode_offload) {
-			pmo_debug("active offload is enabled, skip in mode: %d",
-				trigger);
+			pmo_debug("active offload is enabled, skip in mode %d",
+				  trigger);
 			status = QDF_STATUS_E_INVAL;
 			goto out;
 		}
@@ -316,14 +318,15 @@ QDF_STATUS pmo_core_enable_arp_offload_in_fwr(struct wlan_objmgr_vdev *vdev,
 
 	status = pmo_core_arp_offload_sanity(vdev);
 	if (status != QDF_STATUS_SUCCESS)
-		goto def_ref;
+		goto put_ref;
 
 	vdev_id = pmo_vdev_get_id(vdev);
 	pmo_debug("Enable arp offload in fwr vdev id: %d vdev: %pK",
 		vdev_id, vdev);
 
 	status = pmo_core_do_enable_arp_offload(vdev, vdev_id, trigger);
-def_ref:
+
+put_ref:
 	pmo_vdev_put_ref(vdev);
 out:
 	pmo_exit();

+ 25 - 21
pmo/core/src/wlan_pmo_mc_addr_filtering.c

@@ -454,8 +454,8 @@ static QDF_STATUS pmo_core_handle_enable_mc_list_trigger(
 	switch (trigger) {
 	case pmo_mc_list_change_notify:
 		if (!vdev_ctx->pmo_psoc_ctx->psoc_cfg.active_mode_offload) {
-			pmo_info("active offload is disabled, skip in mode: %d",
-				 trigger);
+			pmo_debug("active offload is disabled, skip in mode %d",
+				  trigger);
 			status = QDF_STATUS_E_INVAL;
 			goto free_req;
 		}
@@ -464,8 +464,8 @@ static QDF_STATUS pmo_core_handle_enable_mc_list_trigger(
 		break;
 	case pmo_apps_suspend:
 		if (vdev_ctx->pmo_psoc_ctx->psoc_cfg.active_mode_offload) {
-			pmo_info("active offload is enabled, skip in mode: %d",
-				trigger);
+			pmo_debug("active offload is enabled, skip in mode %d",
+				  trigger);
 			status = QDF_STATUS_E_INVAL;
 			goto free_req;
 		}
@@ -516,7 +516,7 @@ QDF_STATUS pmo_core_enable_mc_addr_filtering_in_fwr(
 	if (status != QDF_STATUS_SUCCESS)
 		goto put_vdev;
 
-	pmo_info("enable mclist trigger: %d", trigger);
+	pmo_debug("enable mclist trigger: %d", trigger);
 	status = pmo_core_handle_enable_mc_list_trigger(vdev, trigger);
 
 put_vdev:
@@ -535,16 +535,16 @@ static QDF_STATUS pmo_core_handle_disable_mc_list_trigger(
 			struct wlan_objmgr_vdev *vdev,
 			enum pmo_offload_trigger trigger)
 {
-	struct pmo_vdev_priv_obj *vdev_ctx;
 	QDF_STATUS status;
-	struct pmo_mc_addr_list *op_mc_list_req = NULL;
+	struct pmo_vdev_priv_obj *vdev_ctx;
+	struct pmo_mc_addr_list *op_mc_list_req;
 
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
 	op_mc_list_req = qdf_mem_malloc(sizeof(*op_mc_list_req));
 	if (!op_mc_list_req) {
-		pmo_err("op_mc_list_req is NULL");
-		status = QDF_STATUS_E_NULL_VALUE;
+		pmo_err("out of memory");
+		status = QDF_STATUS_E_NOMEM;
 		goto out;
 	}
 
@@ -552,20 +552,20 @@ static QDF_STATUS pmo_core_handle_disable_mc_list_trigger(
 	case pmo_peer_disconnect:
 	case pmo_mc_list_change_notify:
 		if (!vdev_ctx->pmo_psoc_ctx->psoc_cfg.active_mode_offload) {
-			pmo_info("active offload is disabled, skip in mode: %d",
-				trigger);
+			pmo_debug("active offload is disabled, skip in mode %d",
+				  trigger);
 			status = QDF_STATUS_E_INVAL;
-			goto out;
+			goto free_req;
 		}
 		status = pmo_core_do_disable_mc_addr_list(vdev, vdev_ctx,
 				op_mc_list_req);
 		break;
 	case pmo_apps_resume:
 		if (vdev_ctx->pmo_psoc_ctx->psoc_cfg.active_mode_offload) {
-			pmo_info("active offload is enabled, skip in mode: %d",
-				trigger);
+			pmo_debug("active offload is enabled, skip in mode %d",
+				  trigger);
 			status = QDF_STATUS_E_INVAL;
-			goto out;
+			goto free_req;
 		}
 		status = pmo_core_do_disable_mc_addr_list(vdev, vdev_ctx,
 				op_mc_list_req);
@@ -575,10 +575,11 @@ static QDF_STATUS pmo_core_handle_disable_mc_list_trigger(
 		pmo_err("invalid pmo trigger for disable mc list");
 		break;
 	}
-out:
-	if (op_mc_list_req)
-		qdf_mem_free(op_mc_list_req);
 
+free_req:
+	qdf_mem_free(op_mc_list_req);
+
+out:
 	return status;
 }
 
@@ -610,12 +611,15 @@ QDF_STATUS pmo_core_disable_mc_addr_filtering_in_fwr(
 
 	status = pmo_core_mc_addr_flitering_sanity(vdev);
 	if (status != QDF_STATUS_SUCCESS)
-		goto dec_ref;
+		goto put_ref;
+
+	pmo_debug("disable mclist trigger: %d", trigger);
 
-	pmo_info("disable mclist trigger: %d", trigger);
 	status = pmo_core_handle_disable_mc_list_trigger(vdev, trigger);
-dec_ref:
+
+put_ref:
 	pmo_vdev_put_ref(vdev);
+
 out:
 	pmo_exit();
 

+ 3 - 3
pmo/core/src/wlan_pmo_suspend_resume.c

@@ -295,7 +295,7 @@ static QDF_STATUS pmo_core_psoc_configure_suspend(struct wlan_objmgr_psoc *psoc)
 	psoc_ctx = pmo_psoc_get_priv(psoc);
 
 	if (pmo_core_is_wow_applicable(psoc)) {
-		pmo_info("WOW Suspend");
+		pmo_debug("WOW Suspend");
 		pmo_core_apply_lphb(psoc);
 
 		pmo_core_configure_dynamic_wake_events(psoc);
@@ -719,7 +719,7 @@ QDF_STATUS pmo_core_psoc_bus_suspend_req(struct wlan_objmgr_psoc *psoc,
 	psoc_ctx = pmo_psoc_get_priv(psoc);
 
 	wow_mode_selected = pmo_core_is_wow_enabled(psoc_ctx);
-	pmo_info("wow mode selected %d", wow_mode_selected);
+	pmo_debug("wow mode selected %d", wow_mode_selected);
 
 	if (wow_mode_selected)
 		status = pmo_core_enable_wow_in_fw(psoc, psoc_ctx, wow_params);
@@ -1047,7 +1047,7 @@ QDF_STATUS pmo_core_psoc_bus_resume_req(struct wlan_objmgr_psoc *psoc,
 
 	psoc_ctx = pmo_psoc_get_priv(psoc);
 	wow_mode = pmo_core_is_wow_enabled(psoc_ctx);
-	pmo_info("wow mode %d", wow_mode);
+	pmo_debug("wow mode %d", wow_mode);
 
 	pmo_core_update_wow_initial_wake_up(psoc_ctx, false);