From 867ce6d5345f9227bbf5a22620d765ae1f640128 Mon Sep 17 00:00:00 2001 From: Dustin Brown Date: Thu, 19 Jul 2018 16:03:33 -0700 Subject: [PATCH] qcacld-3.0: Reduce excessive logging during suspend Currently, errors are logged if a given offload feature is disabled while suspending the wlan driver. Instead, simply return success for the configuration of those features which are disabled, since nothing needs to be done. This also has the side effect of avoiding meaningless error logs for situations which are not error conditions. Change-Id: I1d897d8db066e642e1cc6e77daff0f44172cefe8 CRs-Fixed: 2282040 --- components/pmo/core/src/wlan_pmo_arp.c | 8 ++++---- components/pmo/core/src/wlan_pmo_mc_addr_filtering.c | 4 ++-- components/pmo/core/src/wlan_pmo_ns.c | 4 ++-- .../target_if/pmo/src/target_if_pmo_suspend_resume.c | 8 ++++---- core/hdd/src/wlan_hdd_power.c | 4 +--- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/components/pmo/core/src/wlan_pmo_arp.c b/components/pmo/core/src/wlan_pmo_arp.c index 8f95c3d65cb9..c0b67fe36573 100644 --- a/components/pmo/core/src/wlan_pmo_arp.c +++ b/components/pmo/core/src/wlan_pmo_arp.c @@ -105,7 +105,7 @@ 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; + QDF_STATUS status; struct pmo_psoc_priv_obj *psoc_ctx; struct pmo_vdev_priv_obj *vdev_ctx; @@ -125,7 +125,7 @@ pmo_core_do_enable_arp_offload(struct wlan_objmgr_vdev *vdev, if (!psoc_ctx->psoc_cfg.active_mode_offload) { pmo_debug("active offload is disabled, skip in mode %d", trigger); - status = QDF_STATUS_E_INVAL; + status = QDF_STATUS_SUCCESS; goto out; } /* enable arp when active offload is true (ipv4 notifier) */ @@ -135,7 +135,7 @@ pmo_core_do_enable_arp_offload(struct wlan_objmgr_vdev *vdev, if (psoc_ctx->psoc_cfg.active_mode_offload) { pmo_debug("active offload is enabled, skip in mode %d", trigger); - status = QDF_STATUS_E_INVAL; + status = QDF_STATUS_SUCCESS; goto out; } /* enable arp when active offload is false (apps suspend) */ @@ -175,7 +175,7 @@ static QDF_STATUS pmo_core_do_disable_arp_offload(struct wlan_objmgr_vdev *vdev, if (psoc_ctx->psoc_cfg.active_mode_offload) { pmo_debug("active offload is enabled, skip in mode: %d", trigger); - status = QDF_STATUS_E_INVAL; + status = QDF_STATUS_SUCCESS; goto out; } /* disable arp on apps resume when active offload is disable */ diff --git a/components/pmo/core/src/wlan_pmo_mc_addr_filtering.c b/components/pmo/core/src/wlan_pmo_mc_addr_filtering.c index a61527dec7e5..75c4f5981fb5 100644 --- a/components/pmo/core/src/wlan_pmo_mc_addr_filtering.c +++ b/components/pmo/core/src/wlan_pmo_mc_addr_filtering.c @@ -454,7 +454,7 @@ static QDF_STATUS pmo_core_handle_enable_mc_list_trigger( if (!vdev_ctx->pmo_psoc_ctx->psoc_cfg.active_mode_offload) { pmo_debug("active offload is disabled, skip in mode %d", trigger); - status = QDF_STATUS_E_INVAL; + status = QDF_STATUS_SUCCESS; goto free_req; } status = pmo_core_do_enable_mc_addr_list(vdev, vdev_ctx, @@ -464,7 +464,7 @@ static QDF_STATUS pmo_core_handle_enable_mc_list_trigger( if (vdev_ctx->pmo_psoc_ctx->psoc_cfg.active_mode_offload) { pmo_debug("active offload is enabled, skip in mode %d", trigger); - status = QDF_STATUS_E_INVAL; + status = QDF_STATUS_SUCCESS; goto free_req; } status = pmo_core_do_enable_mc_addr_list(vdev, vdev_ctx, diff --git a/components/pmo/core/src/wlan_pmo_ns.c b/components/pmo/core/src/wlan_pmo_ns.c index 35b4c73bfd52..01645be21169 100644 --- a/components/pmo/core/src/wlan_pmo_ns.c +++ b/components/pmo/core/src/wlan_pmo_ns.c @@ -159,7 +159,7 @@ static QDF_STATUS pmo_core_do_enable_ns_offload(struct wlan_objmgr_vdev *vdev, if (!psoc_ctx->psoc_cfg.active_mode_offload) { pmo_debug("active offload is disabled, skip in mode:%d", trigger); - status = QDF_STATUS_E_INVAL; + status = QDF_STATUS_SUCCESS; goto out; } /* enable arp when active offload is true (ipv6 notifier) */ @@ -169,7 +169,7 @@ static QDF_STATUS pmo_core_do_enable_ns_offload(struct wlan_objmgr_vdev *vdev, if (psoc_ctx->psoc_cfg.active_mode_offload) { pmo_debug("active offload is enabled, skip in mode: %d", trigger); - status = QDF_STATUS_E_INVAL; + status = QDF_STATUS_SUCCESS; goto out; } /* enable arp when active offload is false (apps suspend) */ diff --git a/components/target_if/pmo/src/target_if_pmo_suspend_resume.c b/components/target_if/pmo/src/target_if_pmo_suspend_resume.c index 7608b979718d..b884ad2e6e38 100644 --- a/components/target_if/pmo/src/target_if_pmo_suspend_resume.c +++ b/components/target_if/pmo/src/target_if_pmo_suspend_resume.c @@ -64,8 +64,8 @@ QDF_STATUS target_if_pmo_send_vdev_update_param_req( param.if_id = vdev_id; param.param_id = param_id; param.param_value = param_value; - target_if_info("set vdev param vdev_id: %d value: %d for param_id: %d", - vdev_id, param_value, param_id); + target_if_debug("set vdev param vdev_id: %d value: %d for param_id: %d", + vdev_id, param_value, param_id); return wmi_unified_vdev_set_param_send( get_wmi_unified_hdl_from_psoc(psoc), ¶m); } @@ -104,8 +104,8 @@ QDF_STATUS target_if_pmo_send_vdev_ps_param_req( sta_ps_param.vdev_id = vdev_id; sta_ps_param.param = param_id; sta_ps_param.value = param_value; - target_if_info("set vdev param vdev_id: %d value: %d for param_id: %d", - vdev_id, param_value, param_id); + target_if_debug("set vdev param vdev_id: %d value: %d for param_id: %d", + vdev_id, param_value, param_id); status = wmi_unified_sta_ps_cmd_send( get_wmi_unified_hdl_from_psoc(psoc), &sta_ps_param); diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index cc7227856766..d4be6415ff61 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -1061,10 +1061,8 @@ hdd_suspend_wlan(void) } hdd_for_each_adapter(hdd_ctx, adapter) { - if (wlan_hdd_validate_session_id(adapter->session_id)) { - hdd_err("invalid session id: %d", adapter->session_id); + if (wlan_hdd_validate_session_id(adapter->session_id)) continue; - } /* stop all TX queues before suspend */ hdd_debug("Disabling queues for dev mode %s",