Merge branch 'android-msm-barbet-4.19-sc-security' into android-msm-barbet-4.19-sc-qpr1

Jan 2022.1

Bug: 204278602
Change-Id: I3dad163c435883d099cdff4810b0ed2074fe7859
diff --git a/dp/wifi3.0/dp_internal.h b/dp/wifi3.0/dp_internal.h
index 495fb64..f484908 100644
--- a/dp/wifi3.0/dp_internal.h
+++ b/dp/wifi3.0/dp_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019, 2021 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
@@ -1395,4 +1395,15 @@
 
 }
 
+/**
+ * dp_peer_flush_frags() - Flush all fragments for a particular
+ *  peer
+ * @pdev - dp pdev handle
+ * @vdev_id - vdev id
+ * @peer_addr - peer mac address
+ *
+ * Return: None
+ */
+void dp_peer_flush_frags(struct cdp_pdev *pdev, uint8_t vdev_id,
+			 uint8_t *peer_mac);
 #endif /* #ifndef _DP_INTERNAL_H_ */
diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c
index 1204101..17d4f44 100644
--- a/dp/wifi3.0/dp_main.c
+++ b/dp/wifi3.0/dp_main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2021 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
@@ -9975,6 +9975,7 @@
 	.peer_get_peer_mac_addr = dp_peer_get_peer_mac_addr,
 	.get_vdev_for_peer = dp_get_vdev_for_peer,
 	.get_peer_state = dp_get_peer_state,
+	.peer_flush_frags = dp_peer_flush_frags,
 };
 #endif
 
diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c
index b332621..e59200f 100644
--- a/dp/wifi3.0/dp_peer.c
+++ b/dp/wifi3.0/dp_peer.c
@@ -3586,3 +3586,33 @@
 
 	return false;
 }
+
+void dp_peer_flush_frags(struct cdp_pdev *pdev, uint8_t vdev_id,
+			 uint8_t *peer_mac)
+{
+	struct dp_pdev *dp_pdev = (struct dp_pdev *)pdev;
+	struct dp_peer *peer;
+	struct dp_rx_tid *rx_tid;
+	uint8_t tid;
+
+	if (!dp_pdev || !dp_pdev->soc)
+		return;
+
+	peer = dp_peer_find_hash_find(dp_pdev->soc, peer_mac, 0, vdev_id);
+	if (!peer)
+		return;
+
+	dp_info("Flushing fragments for peer " QDF_MAC_ADDR_STR,
+		QDF_MAC_ADDR_ARRAY(peer->mac_addr.raw));
+
+	for (tid = 0; tid < DP_MAX_TIDS; tid++) {
+		rx_tid = &peer->rx_tid[tid];
+
+		qdf_spin_lock_bh(&rx_tid->tid_lock);
+		dp_rx_defrag_waitlist_remove(peer, tid);
+		dp_rx_reorder_flush_frag(peer, tid);
+		qdf_spin_unlock_bh(&rx_tid->tid_lock);
+	}
+
+	dp_peer_unref_delete(peer);
+}
diff --git a/wmi/src/wmi_unified.c b/wmi/src/wmi_unified.c
index 4d094b3..2f0d966 100644
--- a/wmi/src/wmi_unified.c
+++ b/wmi/src/wmi_unified.c
@@ -1948,8 +1948,7 @@
 	evt_id = wmi_handle->wmi_events[event_id];
 
 	if (wmi_unified_get_event_handler_ix(wmi_handle, evt_id) != -1) {
-		WMI_LOGE("event handler already registered 0x%x",
-			  evt_id);
+		wmi_info("event handler already registered 0x%x", evt_id);
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (soc->max_event_idx == WMI_UNIFIED_MAX_EVENT) {
@@ -1996,8 +1995,8 @@
 
 	idx = wmi_unified_get_event_handler_ix(wmi_handle, evt_id);
 	if (idx == -1) {
-		WMI_LOGE("event handler is not registered: evt id 0x%x",
-			  evt_id);
+		wmi_warn("event handler is not registered: evt id 0x%x",
+			 evt_id);
 		return QDF_STATUS_E_FAILURE;
 	}
 	wmi_handle->event_handler[idx] = NULL;
@@ -2034,16 +2033,15 @@
 
 	if (event_id >= wmi_events_max ||
 		wmi_handle->wmi_events[event_id] == WMI_EVENT_ID_INVALID) {
-		WMI_LOGE("Event id %d is unavailable",
-			  event_id);
+		wmi_err("Event id %d is unavailable", event_id);
 		return QDF_STATUS_E_FAILURE;
 	}
 	evt_id = wmi_handle->wmi_events[event_id];
 
 	idx = wmi_unified_get_event_handler_ix(wmi_handle, evt_id);
 	if (idx == -1) {
-		WMI_LOGE("event handler is not registered: evt id 0x%x",
-			  evt_id);
+		wmi_err("event handler is not registered: evt id 0x%x",
+			 evt_id);
 		return QDF_STATUS_E_FAILURE;
 	}
 	wmi_handle->event_handler[idx] = NULL;
diff --git a/wmi/src/wmi_unified_api.c b/wmi/src/wmi_unified_api.c
index 12e9415..fe3e9e1 100644
--- a/wmi/src/wmi_unified_api.c
+++ b/wmi/src/wmi_unified_api.c
@@ -2606,7 +2606,7 @@
 				wmi_handle->services[service_id]);
 		}
 	} else {
-		WMI_LOGI("Service %d not supported", service_id);
+		wmi_info("Service %d not supported", service_id);
 	}
 
 	return false;
diff --git a/wmi/src/wmi_unified_extscan_tlv.c b/wmi/src/wmi_unified_extscan_tlv.c
index 570f6f4..0311343 100644
--- a/wmi/src/wmi_unified_extscan_tlv.c
+++ b/wmi/src/wmi_unified_extscan_tlv.c
@@ -739,8 +739,7 @@
 	cmd->configuration_flags = 0;
 	if (pstart->configuration_flags & WMI_EXTSCAN_LP_EXTENDED_BATCHING)
 		cmd->configuration_flags |= WMI_EXTSCAN_EXTENDED_BATCHING_EN;
-	WMI_LOGI("%s: configuration_flags: 0x%x", __func__,
-			cmd->configuration_flags);
+	wmi_debug("configuration_flags: 0x%x", cmd->configuration_flags);
 #ifdef FEATURE_WLAN_EXTSCAN
 	cmd->min_rest_time = WMI_EXTSCAN_REST_TIME;
 	cmd->max_rest_time = WMI_EXTSCAN_REST_TIME;
@@ -846,10 +845,10 @@
 			dest_blist->configuration_flags =
 				WMI_EXTSCAN_BUCKET_CACHE_RESULTS;
 
-		WMI_LOGI("%s: ntfy_extscan_events:%u cfg_flags:%u fwd_flags:%u",
-			__func__, dest_blist->notify_extscan_events,
-			dest_blist->configuration_flags,
-			dest_blist->forwarding_flags);
+		wmi_debug("ntfy_extscan_events:%u cfg_flags:%u fwd_flags:%u",
+			  dest_blist->notify_extscan_events,
+			  dest_blist->configuration_flags,
+			  dest_blist->forwarding_flags);
 
 		dest_blist->min_dwell_time_active =
 				   src_bucket->min_dwell_time_active;
diff --git a/wmi/src/wmi_unified_ocb_ut.c b/wmi/src/wmi_unified_ocb_ut.c
index c50a0be..c8950b0 100644
--- a/wmi/src/wmi_unified_ocb_ut.c
+++ b/wmi/src/wmi_unified_ocb_ut.c
@@ -275,16 +275,15 @@
 	struct wlan_ocb_rx_ops *ocb_rx_ops;
 	ol_scn_t scn = (ol_scn_t) wmi_handle->scn_handle;
 
-	WMI_LOGP("%s : called", __func__);
-	WMI_LOGI("%s: vdev_id=%d, channel_count=%d, schedule_size=%d, flag=%x",
-		 __func__, config->vdev_id, config->channel_count,
+	wmi_debug("vdev_id=%d, channel_count=%d, schedule_size=%d, flag=%x",
+		 config->vdev_id, config->channel_count,
 		 config->schedule_size, config->flags);
 
 	for (i = 0; i < config->channel_count; i++) {
-		WMI_LOGI("%s: channel info for channel %d"
+		wmi_debug("channel info for channel %d"
 			" chan_freq=%d, bandwidth=%d, " QDF_MAC_ADDRESS_STR
 			" max_pwr=%d, min_pwr=%d, reg_pwr=%d, antenna_max=%d, "
-			"flags=%d", __func__, i, config->channels[i].chan_freq,
+			"flags=%d", i, config->channels[i].chan_freq,
 			config->channels[i].bandwidth,
 			QDF_MAC_ADDR_ARRAY(
 				config->channels[i].mac_address.bytes),
@@ -296,9 +295,9 @@
 	}
 
 	for (i = 0; i < config->schedule_size; i++) {
-		WMI_LOGI("%s: schedule info for channel %d: "
+		wmi_debug("schedule info for channel %d: "
 			"chan_fre=%d, total_duration=%d, guard_intreval=%d",
-			__func__, i, config->schedule[i].chan_freq,
+			i, config->schedule[i].chan_freq,
 			config->schedule[i].total_duration,
 			config->schedule[i].guard_interval);
 	}
@@ -396,12 +395,12 @@
 			  struct vdev_start_params *req)
 {
 	tp_wma_handle wma = (tp_wma_handle) wmi_handle->scn_handle;
-	WMI_LOGP("%s : called", __func__);
-	WMI_LOGI("%s: vdev_id %d freq %d chanmode %d ch_info is_dfs %d "
+
+	wmi_debug("vdev_id %d freq %d chanmode %d ch_info is_dfs %d "
 		"beacon interval %d dtim %d center_chan %d center_freq2 %d "
 		"max_txpow: 0x%x "
 		"Tx SS %d, Rx SS %d, ldpc_rx: %d, cac %d, regd %d, HE ops: %d",
-		__func__, (int)req->vdev_id, req->channel.mhz,
+		(int)req->vdev_id, req->channel.mhz,
 		req->channel.phy_mode,
 		(int)req->channel.dfs_set, req->beacon_intval, req->dtim_period,
 		req->channel.cfreq1, req->channel.cfreq2,
diff --git a/wmi/src/wmi_unified_p2p_tlv.c b/wmi/src/wmi_unified_p2p_tlv.c
index 4ea6c63..fb4d30a 100644
--- a/wmi/src/wmi_unified_p2p_tlv.c
+++ b/wmi/src/wmi_unified_p2p_tlv.c
@@ -72,7 +72,7 @@
 	noa_discriptor->interval = noa->interval;
 	noa_discriptor->start_time = 0;
 
-	WMI_LOGI("SET P2P GO NOA:vdev_id:%d count:%d duration:%d interval:%d",
+	wmi_debug("SET P2P GO NOA:vdev_id:%d count:%d duration:%d interval:%d",
 		 cmd->vdev_id, noa->count, noa_discriptor->duration,
 		 noa->interval);
 	wmi_mtrace(WMI_FWTEST_P2P_SET_NOA_PARAM_CMDID, cmd->vdev_id, 0);
@@ -119,7 +119,7 @@
 		WMI_UNIFIED_OPPPS_ATTR_ENABLED_SET(cmd);
 
 	WMI_UNIFIED_OPPPS_ATTR_CTWIN_SET(cmd, oppps->ctwindow);
-	WMI_LOGI("SET P2P GO OPPPS:vdev_id:%d ctwindow:%d",
+	wmi_debug("SET P2P GO OPPPS:vdev_id:%d ctwindow:%d",
 		 cmd->vdev_id, oppps->ctwindow);
 	wmi_mtrace(WMI_P2P_SET_OPPPS_PARAM_CMDID, cmd->vdev_id, 0);
 	status = wmi_unified_cmd_send(wmi_handle, buf, sizeof(*cmd),
diff --git a/wmi/src/wmi_unified_sta_tlv.c b/wmi/src/wmi_unified_sta_tlv.c
index f4a9e41..ac1fcc5 100644
--- a/wmi/src/wmi_unified_sta_tlv.c
+++ b/wmi/src/wmi_unified_sta_tlv.c
@@ -837,7 +837,7 @@
 
 		if (in_chan_info->dfs_set) {
 			WMI_SET_CHANNEL_FLAG(chan_info, WMI_CHAN_FLAG_PASSIVE);
-			WMI_LOGI("chan[%d] DFS[%d]",
+			wmi_debug("chan[%d] DFS[%d]",
 				 in_chan_info->chan_id,
 				 in_chan_info->dfs_set);
 		}
@@ -1478,17 +1478,17 @@
 		(WMI_SAR2_RESULT_EVENTID_param_tlvs *)event;
 
 	if (!param_buf) {
-		WMI_LOGI("Invalid sar2 result event buffer");
+		wmi_err("Invalid sar2 result event buffer");
 		return QDF_STATUS_E_INVAL;
 	}
 
 	sar2_fixed_param = param_buf->fixed_param;
 	if (!sar2_fixed_param) {
-		WMI_LOGI("Invalid sar2 result event fixed param buffer");
+		wmi_err("Invalid sar2 result event fixed param buffer");
 		return QDF_STATUS_E_INVAL;
 	}
 
-	WMI_LOGI("SAR2 result: %s",
+	wmi_debug("SAR2 result: %s",
 		 wmi_sar2_result_string(sar2_fixed_param->result));
 
 	return QDF_STATUS_SUCCESS;
@@ -2454,7 +2454,7 @@
 	/* fill in arp stats req cmd values */
 	get_arp_stats->vdev_id = req_buf->vdev_id;
 
-	WMI_LOGI(FL("vdev=%d"), req_buf->vdev_id);
+	wmi_debug("vdev=%d", req_buf->vdev_id);
 	/* Send per roam config parameters */
 	wmi_mtrace(WMI_VDEV_GET_ARP_STAT_CMDID, NO_SESSION, 0);
 	status = wmi_unified_cmd_send(wmi_handle, buf,
diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c
index bc8bab8..066d3fa 100644
--- a/wmi/src/wmi_unified_tlv.c
+++ b/wmi/src/wmi_unified_tlv.c
@@ -956,7 +956,7 @@
 	WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC,
 		       cmd->num_noa_descriptors *
 		       sizeof(wmi_p2p_noa_descriptor));
-	WMI_LOGI("%s: vdev_id %d freq %d chanmode %d ch_info: 0x%x is_dfs %d "
+	wmi_info("%s: vdev_id %d freq %d chanmode %d ch_info: 0x%x is_dfs %d "
 		"beacon interval %d dtim %d center_chan %d center_freq2 %d "
 		"reg_info_1: 0x%x reg_info_2: 0x%x, req->max_txpow: 0x%x "
 		"Tx SS %d, Rx SS %d, ldpc_rx: %d, cac %d, regd %d, HE ops: %d"
@@ -5281,8 +5281,8 @@
 
 	cmd = (uint8_t *) wmi_buf_data(buf);
 	qdf_mem_copy(cmd, cfg, sizeof(*cfg));
-	WMI_LOGI(FL("Sending OEM Data Request to target, data len %lu"),
-		sizeof(*cfg));
+	wmi_debug("Sending OEM Data Request to target, data len %lu",
+		  sizeof(*cfg));
 	wmi_mtrace(WMI_OEM_DMA_RING_CFG_REQ_CMDID, NO_SESSION, 0);
 	ret = wmi_unified_cmd_send(wmi_handle, buf, sizeof(*cfg),
 				WMI_OEM_DMA_RING_CFG_REQ_CMDID);
@@ -6054,7 +6054,7 @@
 	cmd->vdev_id = param->vdev_id;
 	cmd->enable_override = 0;
 
-	WMI_LOGI("Setting dscp for vap id: %d", cmd->vdev_id);
+	wmi_debug("Setting dscp for vap id: %d", cmd->vdev_id);
 	wmi_mtrace(WMI_VDEV_SET_DSCP_TID_MAP_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi_handle, buf, len,
 				 WMI_VDEV_SET_DSCP_TID_MAP_CMDID)) {
@@ -6284,48 +6284,27 @@
 		wmi_buf_free(buf);
 	}
 
-	WMI_LOGI("%s: Sent WMI_VDEV_SPECTRAL_SCAN_CONFIGURE_CMDID",
-		 __func__);
-
-	WMI_LOGI("vdev_id = %u\n"
-		 "spectral_scan_count = %u\n"
-		 "spectral_scan_period = %u\n"
-		 "spectral_scan_priority = %u\n"
-		 "spectral_scan_fft_size = %u\n"
-		 "spectral_scan_gc_ena = %u\n"
-		 "spectral_scan_restart_ena = %u\n"
-		 "spectral_scan_noise_floor_ref = %u\n"
-		 "spectral_scan_init_delay = %u\n"
-		 "spectral_scan_nb_tone_thr = %u\n"
-		 "spectral_scan_str_bin_thr = %u\n"
-		 "spectral_scan_wb_rpt_mode = %u\n"
-		 "spectral_scan_rssi_rpt_mode = %u\n"
-		 "spectral_scan_rssi_thr = %u\n"
-		 "spectral_scan_pwr_format = %u\n"
-		 "spectral_scan_rpt_mode = %u\n"
-		 "spectral_scan_bin_scale = %u\n"
-		 "spectral_scan_dBm_adj = %u\n"
-		 "spectral_scan_chn_mask = %u",
-		 param->vdev_id,
-		 param->count,
-		 param->period,
-		 param->spectral_pri,
-		 param->fft_size,
-		 param->gc_enable,
-		 param->restart_enable,
-		 param->noise_floor_ref,
-		 param->init_delay,
-		 param->nb_tone_thr,
-		 param->str_bin_thr,
-		 param->wb_rpt_mode,
-		 param->rssi_rpt_mode,
-		 param->rssi_thr,
-		 param->pwr_format,
-		 param->rpt_mode,
-		 param->bin_scale,
-		 param->dbm_adj,
-		 param->chn_mask);
-	WMI_LOGI("%s: Status: %d", __func__, ret);
+	wmi_debug("Sent WMI_VDEV_SPECTRAL_SCAN_CONFIGURE_CMDID");
+	wmi_debug("vdev_id: %u spectral_scan_count: %u",
+		 param->vdev_id, param->count);
+	wmi_debug("spectral_scan_period: %u spectral_scan_priority: %u",
+		 param->period, param->spectral_pri);
+	wmi_debug("spectral_scan_fft_size: %u spectral_scan_gc_ena: %u",
+		 param->fft_size, param->gc_enable);
+	wmi_debug("spectral_scan_restart_ena: %u", param->restart_enable);
+	wmi_debug("spectral_scan_noise_floor_ref: %u", param->noise_floor_ref);
+	wmi_debug("spectral_scan_init_delay: %u", param->init_delay);
+	wmi_debug("spectral_scan_nb_tone_thr: %u", param->nb_tone_thr);
+	wmi_debug("spectral_scan_str_bin_thr: %u", param->str_bin_thr);
+	wmi_debug("spectral_scan_wb_rpt_mode: %u", param->wb_rpt_mode);
+	wmi_debug("spectral_scan_rssi_rpt_mode: %u", param->rssi_rpt_mode);
+	wmi_debug("spectral_scan_rssi_thr: %u spectral_scan_pwr_format: %u",
+		 param->rssi_thr, param->pwr_format);
+	wmi_debug("spectral_scan_rpt_mode: %u spectral_scan_bin_scale: %u",
+		 param->rpt_mode, param->bin_scale);
+	wmi_debug("spectral_scan_dBm_adj: %u spectral_scan_chn_mask: %u",
+		 param->dbm_adj, param->chn_mask);
+	wmi_debug("Status: %d", ret);
 
 	return ret;
 }
@@ -6373,12 +6352,8 @@
 		cmd->enable_cmd = 0; /* 0: Ignore */
 	}
 
-	WMI_LOGI("vdev_id = %u\n"
-				 "trigger_cmd = %u\n"
-				 "enable_cmd = %u",
-				 cmd->vdev_id,
-				 cmd->trigger_cmd,
-				 cmd->enable_cmd);
+	wmi_debug("vdev_id = %u trigger_cmd = %u enable_cmd = %u",
+		 cmd->vdev_id, cmd->trigger_cmd, cmd->enable_cmd);
 
 	wmi_mtrace(WMI_VDEV_SPECTRAL_SCAN_ENABLE_CMDID, cmd->vdev_id, 0);
 	ret = wmi_unified_cmd_send(wmi_handle, buf, len,
@@ -6389,9 +6364,8 @@
 		wmi_buf_free(buf);
 	}
 
-	WMI_LOGI("%s: Sent WMI_VDEV_SPECTRAL_SCAN_ENABLE_CMDID", __func__);
-
-	WMI_LOGI("%s: Status: %d", __func__, ret);
+	wmi_debug("Sent WMI_VDEV_SPECTRAL_SCAN_ENABLE_CMDID, Status: %d",
+		  ret);
 
 	return ret;
 }
@@ -6906,7 +6880,7 @@
 	WMI_DIAG_EVENT_LOG_SUPPORTED_EVENTID_param_tlvs *param_buf;
 	wmi_diag_event_log_supported_event_fixed_params *wmi_event;
 
-	WMI_LOGI("Received WMI_DIAG_EVENT_LOG_SUPPORTED_EVENTID");
+	wmi_debug("Received WMI_DIAG_EVENT_LOG_SUPPORTED_EVENTID");
 
 	param_buf = (WMI_DIAG_EVENT_LOG_SUPPORTED_EVENTID_param_tlvs *) event;
 	if (!param_buf) {
@@ -7437,13 +7411,12 @@
 	WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32,
 		       (wmi_utest->num_args * sizeof(uint32_t)));
 	unit_test_cmd_args = (uint32_t *) (buf_ptr + WMI_TLV_HDR_SIZE);
-	WMI_LOGI("%s: VDEV ID: %d", __func__, cmd->vdev_id);
-	WMI_LOGI("%s: MODULE ID: %d", __func__, cmd->module_id);
-	WMI_LOGI("%s: TOKEN: %d", __func__, cmd->diag_token);
-	WMI_LOGI("%s: %d num of args = ", __func__, wmi_utest->num_args);
+	wmi_debug("VDEV ID: %d MODULE ID: %d TOKEN: %d",
+		 cmd->vdev_id, cmd->module_id, cmd->diag_token);
+	wmi_debug("%d num of args = ", wmi_utest->num_args);
 	for (i = 0; (i < wmi_utest->num_args && i < WMI_UNIT_TEST_MAX_NUM_ARGS); i++) {
 		unit_test_cmd_args[i] = wmi_utest->args[i];
-		WMI_LOGI("%d,", wmi_utest->args[i]);
+		wmi_debug("%d,", wmi_utest->args[i]);
 	}
 	wmi_mtrace(WMI_UNIT_TEST_CMDID, cmd->vdev_id, 0);
 	if (wmi_unified_cmd_send(wmi_handle, wmi_buf, len,
@@ -7498,10 +7471,10 @@
 	WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32,
 		       (param->num_args * sizeof(uint32_t)));
 	cmd_args = (uint32_t *) (buf_ptr + WMI_TLV_HDR_SIZE);
-	WMI_LOGI("%s: %d num of args = ", __func__, param->num_args);
+	wmi_debug("%d num of args = ", param->num_args);
 	for (i = 0; (i < param->num_args && i < WMI_MAX_POWER_DBG_ARGS); i++) {
 		cmd_args[i] = param->args[i];
-		WMI_LOGI("%d,", param->args[i]);
+		wmi_debug("%d,", param->args[i]);
 	}
 
 	wmi_mtrace(WMI_PDEV_WAL_POWER_DEBUG_CMDID, NO_SESSION, 0);
@@ -7540,7 +7513,7 @@
 	len = sizeof(*cmd);
 	buf = wmi_buf_alloc(wmi_handle, len);
 
-	WMI_LOGI("%s: pdev_id=%d", __func__, pdev_id);
+	wmi_debug("pdev_id=%d", pdev_id);
 
 	if (!buf)
 		return QDF_STATUS_E_NOMEM;
@@ -7587,7 +7560,7 @@
 	len = sizeof(*cmd);
 	buf = wmi_buf_alloc(wmi_handle, len);
 
-	WMI_LOGI("%s: pdev_id=%d", __func__, pdev_id);
+	wmi_debug("pdev_id=%d", pdev_id);
 
 	if (!buf)
 		return QDF_STATUS_E_NOMEM;
@@ -9105,12 +9078,12 @@
 	unit_test->diag_token = ev_param->diag_token;
 	unit_test->flag = ev_param->flag;
 	unit_test->payload_len = ev_param->payload_len;
-	WMI_LOGI("%s:vdev_id:%d mod_id:%d diag_token:%d flag:%d", __func__,
+	wmi_debug("vdev_id:%d mod_id:%d diag_token:%d flag:%d",
 			ev_param->vdev_id,
 			ev_param->module_id,
 			ev_param->diag_token,
 			ev_param->flag);
-	WMI_LOGD("%s: Unit-test data given below %d", __func__, num_bufp);
+	wmi_debug("Unit-test data given below %d", num_bufp);
 	qdf_trace_hex_dump(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_DEBUG,
 			bufp, num_bufp);
 	copy_size = (num_bufp < maxspace) ? num_bufp : maxspace;
@@ -10639,7 +10612,7 @@
 	radar_found->freq_offset = radar_event->freq_offset;
 	radar_found->sidx = radar_event->sidx;
 
-	WMI_LOGI("processed radar found event pdev %d,"
+	wmi_info("processed radar found event pdev %d,"
 		"Radar Event Info:pdev_id %d,timestamp %d,chan_freq  (dur) %d,"
 		"chan_width (RSSI) %d,detector_id (false_radar) %d,"
 		"freq_offset (radar_check) %d,segment_id %d,sidx %d,"