Browse Source

qcacld-3.0: Reduce excessive logging in PMO

There are several logs in PMO that log debugging related information
at the INFO level. Reduce the logging level of these debug logs to
avoid spamming the console.

Change-Id: Ib1bb9279d5d8104104b58bd2c83869f72c0bde4a
CRs-Fixed: 2260190
Dustin Brown 6 years ago
parent
commit
0f87448ee2

+ 3 - 3
components/pmo/core/src/wlan_pmo_lphb.c

@@ -71,13 +71,13 @@ static QDF_STATUS pmo_core_send_lphb_enable(struct wlan_objmgr_psoc *psoc,
 		psoc_ctx->wow.lphb_cache[i].params.lphb_enable_req.session =
 			ts_lphb_enable->session;
 		qdf_spin_unlock_bh(&psoc_ctx->lock);
-		pmo_info("cached LPHB status in WMA context for item %d", i);
+		pmo_debug("cached LPHB status in WMA context for item %d", i);
 	} else {
 		qdf_spin_lock_bh(&psoc_ctx->lock);
 		qdf_mem_zero((void *)&psoc_ctx->wow.lphb_cache,
 				sizeof(psoc_ctx->wow.lphb_cache));
 		qdf_spin_unlock_bh(&psoc_ctx->lock);
-		pmo_info("cleared all cached LPHB status in WMA context");
+		pmo_debug("cleared all cached LPHB status in WMA context");
 	}
 
 out:
@@ -159,7 +159,7 @@ static QDF_STATUS pmo_process_lphb_conf_req(struct wlan_objmgr_psoc *psoc,
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	pmo_info("LPHB configuration cmd id is %d", lphb_conf_req->cmd);
+	pmo_debug("LPHB configuration cmd id is %d", lphb_conf_req->cmd);
 	switch (lphb_conf_req->cmd) {
 	case pmo_lphb_set_en_param_indid:
 		status = pmo_core_send_lphb_enable(psoc, psoc_ctx,

+ 3 - 5
components/pmo/core/src/wlan_pmo_main.c

@@ -122,16 +122,14 @@ bool pmo_core_is_vdev_connected(struct wlan_objmgr_vdev *vdev)
 	enum wlan_peer_state peer_state;
 
 	peer = wlan_vdev_get_bsspeer(vdev);
-
 	if (!peer) {
-		pmo_err("peer is null");
+		pmo_debug("bss peer is null");
 		return false;
 	}
-	peer_state = wlan_peer_mlme_get_state(peer);
 
+	peer_state = wlan_peer_mlme_get_state(peer);
 	if (peer_state != WLAN_ASSOC_STATE) {
-		pmo_err("peer is not associated.peer state: %d",
-			peer_state);
+		pmo_debug("peer is not associated; state:%d", peer_state);
 		return false;
 	}
 

+ 7 - 7
components/pmo/core/src/wlan_pmo_mc_addr_filtering.c

@@ -329,13 +329,13 @@ static QDF_STATUS pmo_core_mc_addr_flitering_sanity(
 
 	/* Check if INI is enabled or not, otherwise just return */
 	if (!vdev_ctx->pmo_psoc_ctx->psoc_cfg.enable_mc_list) {
-		pmo_info("user disabled mc_addr_list using INI");
+		pmo_debug("user disabled mc_addr_list using INI");
 		return QDF_STATUS_E_INVAL;
 	}
 
 	if (!pmo_core_is_vdev_supports_offload(vdev)) {
-		pmo_info("vdev in invalid opmode for mc addr filtering %d",
-			pmo_get_vdev_opmode(vdev));
+		pmo_debug("vdev in invalid opmode for mc addr filtering %d",
+			  pmo_get_vdev_opmode(vdev));
 		return QDF_STATUS_E_INVAL;
 	}
 
@@ -376,8 +376,8 @@ QDF_STATUS pmo_core_cache_mc_addr_list(
 	if (status != QDF_STATUS_SUCCESS)
 		goto dec_ref;
 
-	pmo_info("Cache mc addr list for vdev id: %d psoc: %pK vdev: %pK",
-			mc_list_config->vdev_id, mc_list_config->psoc, vdev);
+	pmo_debug("Cache mc addr list for vdev id: %d psoc: %pK",
+		  mc_list_config->vdev_id, mc_list_config->psoc);
 
 	status = pmo_core_cache_mc_addr_list_in_vdev_priv(mc_list_config, vdev);
 dec_ref:
@@ -419,8 +419,8 @@ QDF_STATUS pmo_core_flush_mc_addr_list(struct wlan_objmgr_psoc *psoc,
 	if (status != QDF_STATUS_SUCCESS)
 		goto dec_ref;
 
-	pmo_info("Flush mc addr list for vdev id: %d psoc: %pK vdev: %pK",
-			vdev_id, psoc, vdev);
+	pmo_debug("Flush mc addr list for vdev id: %d psoc: %pK",
+		  vdev_id, psoc);
 
 	status = pmo_core_flush_mc_addr_list_from_vdev_priv(vdev);
 

+ 9 - 9
components/pmo/core/src/wlan_pmo_static_config.c

@@ -42,7 +42,7 @@ void pmo_register_wow_wakeup_events(struct wlan_objmgr_vdev *vdev)
 
 	vdev_opmode = pmo_get_vdev_opmode(vdev);
 	vdev_id = pmo_vdev_get_id(vdev);
-	pmo_info("vdev_opmode %d vdev_id %d", vdev_opmode, vdev_id);
+	pmo_debug("vdev_opmode %d vdev_id %d", vdev_opmode, vdev_id);
 
 	switch (vdev_opmode) {
 	case QDF_STA_MODE:
@@ -286,7 +286,7 @@ static QDF_STATUS pmo_configure_wow_sta(struct wlan_objmgr_vdev *vdev)
 	 */
 	if (!vdev_ctx->pmo_psoc_ctx->psoc_cfg.arp_offload_enable) {
 		/* Setup all ARP pkt pattern */
-		pmo_info("ARP offload is disabled in INI enable WoW for ARP");
+		pmo_debug("ARP offload is disabled in INI enable WoW for ARP");
 		ret = pmo_tgt_send_wow_patterns_to_fw(vdev,
 				pmo_get_and_increment_wow_default_ptrn(
 					vdev_ctx),
@@ -300,7 +300,7 @@ static QDF_STATUS pmo_configure_wow_sta(struct wlan_objmgr_vdev *vdev)
 	/* for NS or NDP offload packets */
 	if (!vdev_ctx->pmo_psoc_ctx->psoc_cfg.ns_offload_enable_static) {
 		/* Setup all NS pkt pattern */
-		pmo_info("NS offload is disabled in INI enable WoW for NS");
+		pmo_debug("NS offload is disabled in INI enable WoW for NS");
 		ret = pmo_tgt_send_wow_patterns_to_fw(vdev,
 				pmo_get_and_increment_wow_default_ptrn(
 					vdev_ctx),
@@ -343,18 +343,18 @@ void pmo_register_wow_default_patterns(struct wlan_objmgr_vdev *vdev)
 
 	if (pmo_is_vdev_in_beaconning_mode(vdev_opmode)) {
 		/* Configure SAP/GO/IBSS mode default wow patterns */
-		pmo_info("Config SAP default wow patterns vdev_id %d",
-			 vdev_id);
+		pmo_debug("Config SAP default wow patterns vdev_id %d",
+			  vdev_id);
 		pmo_configure_wow_ap(vdev);
 	} else {
 		/* Configure STA/P2P CLI mode default wow patterns */
-		pmo_info("Config STA default wow patterns vdev_id %d",
-			vdev_id);
+		pmo_debug("Config STA default wow patterns vdev_id %d",
+			  vdev_id);
 		pmo_configure_wow_sta(vdev);
 		psoc_ctx = vdev_ctx->pmo_psoc_ctx;
 		if (psoc_ctx && psoc_ctx->psoc_cfg.ra_ratelimit_enable) {
-			pmo_info("Config STA RA wow pattern vdev_id %d",
-				vdev_id);
+			pmo_debug("Config STA RA wow pattern vdev_id %d",
+				  vdev_id);
 			pmo_tgt_send_ra_filter_req(vdev);
 		}
 	}

+ 0 - 2
components/pmo/dispatcher/src/wlan_pmo_tgt_lphb.c

@@ -143,8 +143,6 @@ QDF_STATUS pmo_tgt_lphb_rsp_evt(struct wlan_objmgr_psoc *psoc,
 
 	psoc_ctx = pmo_psoc_get_priv(psoc);
 	if (psoc_ctx->wow.lphb_cb && psoc_ctx->wow.lphb_cb_ctx) {
-		pmo_info("callback:%pK context:%pK psoc:%pK",
-			psoc_ctx->wow.lphb_cb, psoc_ctx->wow.lphb_cb_ctx, psoc);
 		psoc_ctx->wow.lphb_cb(psoc_ctx->wow.lphb_cb_ctx, rsp_param);
 	} else {
 		pmo_err("lphb rsp callback/context is null for psoc %pK",

+ 4 - 4
components/pmo/dispatcher/src/wlan_pmo_tgt_pkt_filter.c

@@ -44,9 +44,9 @@ QDF_STATUS pmo_tgt_set_pkt_filter(struct wlan_objmgr_vdev *vdev,
 		goto out;
 	}
 
-	pmo_info("filter_type=%d, filter_id = %d",
-				pmo_set_pkt_fltr_req->filter_type,
-				pmo_set_pkt_fltr_req->filter_id);
+	pmo_debug("filter_type=%d, filter_id = %d",
+		  pmo_set_pkt_fltr_req->filter_type,
+		  pmo_set_pkt_fltr_req->filter_id);
 
 	request_buf = qdf_mem_malloc(sizeof(*request_buf));
 
@@ -110,7 +110,7 @@ QDF_STATUS pmo_tgt_clear_pkt_filter(struct wlan_objmgr_vdev *vdev,
 		goto out;
 	}
 
-	pmo_info("filter_id = %d", pmo_clr_pkt_fltr_param->filter_id);
+	pmo_debug("filter_id = %d", pmo_clr_pkt_fltr_param->filter_id);
 
 	request_buf = qdf_mem_malloc(sizeof(*request_buf));
 

+ 23 - 19
core/hdd/src/wlan_hdd_main.c

@@ -3397,7 +3397,7 @@ void wlan_hdd_release_intf_addr(struct hdd_context *hdd_ctx,
 static void __hdd_set_multicast_list(struct net_device *dev)
 {
 	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
-	int i = 0, status;
+	int i = 0, errno;
 	struct netdev_hw_addr *ha;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	struct pmo_mc_addr_list_params *mc_list_request = NULL;
@@ -3408,17 +3408,17 @@ static void __hdd_set_multicast_list(struct net_device *dev)
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam())
 		goto out;
 
-	status = wlan_hdd_validate_context(hdd_ctx);
-	if (0 != status)
+	errno = wlan_hdd_validate_context(hdd_ctx);
+	if (errno)
 		goto out;
 
-	status = hdd_validate_adapter(adapter);
-	if (status)
+	errno = hdd_validate_adapter(adapter);
+	if (errno)
 		goto out;
 
 	if (hdd_ctx->driver_status == DRIVER_MODULES_CLOSED) {
 		hdd_err("%s: Driver module is closed", __func__);
-		return;
+		goto out;
 	}
 
 	mc_list_request = qdf_mem_malloc(sizeof(*mc_list_request));
@@ -3429,7 +3429,7 @@ static void __hdd_set_multicast_list(struct net_device *dev)
 
 	/* Delete already configured multicast address list */
 	if (adapter->mc_addr_list.mc_cnt > 0) {
-		hdd_info("clear previously configured MC address list");
+		hdd_debug("clear previously configured MC address list");
 		hdd_disable_and_flush_mc_addr_list(adapter,
 			pmo_mc_list_change_notify);
 	}
@@ -3442,10 +3442,10 @@ static void __hdd_set_multicast_list(struct net_device *dev)
 		mc_count = netdev_mc_count(dev);
 		if (mc_count > pmo_ucfg_max_mc_addr_supported(psoc)) {
 			hdd_debug("Exceeded max MC filter addresses (%d). Allowing all MC frames by disabling MC address filtering",
-				   pmo_ucfg_max_mc_addr_supported(psoc));
+				  pmo_ucfg_max_mc_addr_supported(psoc));
 			hdd_disable_and_flush_mc_addr_list(adapter,
 				pmo_mc_list_change_notify);
-			goto out;
+			goto free_req;
 		}
 		netdev_for_each_mc_addr(ha, dev) {
 			hdd_debug("ha_addr[%d] "MAC_ADDRESS_STR,
@@ -3456,8 +3456,8 @@ static void __hdd_set_multicast_list(struct net_device *dev)
 				0, ETH_ALEN);
 			memcpy(&(mc_list_request->mc_addr[i].bytes),
 				ha->addr, ETH_ALEN);
-			hdd_info("mlist[%d] = %pM", i,
-				mc_list_request->mc_addr[i].bytes);
+			hdd_debug("mlist[%d] = %pM", i,
+				  mc_list_request->mc_addr[i].bytes);
 			i++;
 		}
 	}
@@ -3465,16 +3465,20 @@ static void __hdd_set_multicast_list(struct net_device *dev)
 	mc_list_request->psoc = psoc;
 	mc_list_request->vdev_id = adapter->session_id;
 	mc_list_request->count = mc_count;
-	status = hdd_cache_mc_addr_list(mc_list_request);
-	if (status == 0) {
-		hdd_enable_mc_addr_filtering(adapter,
-			pmo_mc_list_change_notify);
-	} else {
-		hdd_err("error while caching mc list");
+
+	errno = hdd_cache_mc_addr_list(mc_list_request);
+	if (errno) {
+		hdd_err("Failed to cache MC address list for vdev %u; errno:%d",
+			adapter->session_id, errno);
+		goto free_req;
 	}
+
+	hdd_enable_mc_addr_filtering(adapter, pmo_mc_list_change_notify);
+
+free_req:
+	qdf_mem_free(mc_list_request);
+
 out:
-	if (mc_list_request)
-		qdf_mem_free(mc_list_request);
 	hdd_exit();
 }
 

+ 3 - 9
core/hdd/src/wlan_hdd_power.c

@@ -998,26 +998,20 @@ void hdd_disable_mc_addr_filtering(struct hdd_adapter *adapter,
 				adapter->session_id, trigger);
 	if (status != QDF_STATUS_SUCCESS)
 		hdd_info("failed to disable mc list status %d", status);
+
 out:
 	hdd_exit();
-
 }
 
 int hdd_cache_mc_addr_list(struct pmo_mc_addr_list_params *mc_list_config)
 {
 	QDF_STATUS status;
-	int ret = 0;
 
 	hdd_enter();
-	/* cache mc addr list */
 	status = pmo_ucfg_cache_mc_addr_list(mc_list_config);
-	if (status != QDF_STATUS_SUCCESS) {
-		hdd_info("fail to cache mc list status %d", status);
-		ret = -EINVAL;
-	}
 	hdd_exit();
 
-	return ret;
+	return qdf_status_to_os_return(status);
 }
 
 void hdd_disable_and_flush_mc_addr_list(struct hdd_adapter *adapter,
@@ -1038,10 +1032,10 @@ void hdd_disable_and_flush_mc_addr_list(struct hdd_adapter *adapter,
 	status = pmo_ucfg_flush_mc_addr_list(psoc, adapter->session_id);
 	if (status != QDF_STATUS_SUCCESS)
 		hdd_info("fail to flush mc list status %d", status);
+
 	hdd_exit();
 
 	return;
-
 }
 
 /**