qcacmn: Reduce target_if info logging

Excessive logging in target_if has been identified as the root cause of
a watchdog timeout. Reduce target_if logging in normal operation paths
to debug level to avoid excessive CPU use.

Change-Id: If384474270bb4b860100b98e5eea81d54b7c2184
CRs-Fixed: 2286630
This commit is contained in:
Dustin Brown
2018-07-27 12:47:10 -07:00
committed by nshrivas
parent 00ffeaf6be
commit 3fc809d63d
5 changed files with 37 additions and 43 deletions

View File

@@ -103,9 +103,8 @@ static uint32_t init_deinit_alloc_host_mem_chunk(struct wlan_objmgr_psoc *psoc,
info->mem_chunks[idx].req_id = req_id; info->mem_chunks[idx].req_id = req_id;
} }
} }
target_if_info( target_if_debug("req_id %d idx %d num_units %d unit_len %d",
"req_id %d idx %d num_units %d unit_len %d", req_id, idx, num_units, unit_len);
req_id, idx, num_units, unit_len);
return num_units; return num_units;
} }
@@ -250,11 +249,11 @@ static QDF_STATUS init_deinit_alloc_num_units(struct wlan_objmgr_psoc *psoc,
} }
} }
target_if_info("idx %d req %d num_units %d num_unit_info %d unit size %d actual units %d", target_if_debug("idx %d req %d num_units %d num_unit_info %d unit size %d actual units %d",
idx, mem_reqs[idx].req_id, idx, mem_reqs[idx].req_id,
mem_reqs[idx].num_units, mem_reqs[idx].num_units,
mem_reqs[idx].num_unit_info, mem_reqs[idx].num_unit_info,
mem_reqs[idx].unit_size, num_units); mem_reqs[idx].unit_size, num_units);
status = init_deinit_alloc_host_mem(psoc, tgt_hdl, status = init_deinit_alloc_host_mem(psoc, tgt_hdl,
mem_reqs[idx].req_id, num_units, mem_reqs[idx].req_id, num_units,
@@ -384,7 +383,7 @@ void init_deinit_derive_band_to_mac_param(
(WMI_HOST_WLAN_5G_CAPABILITY | (WMI_HOST_WLAN_5G_CAPABILITY |
WMI_HOST_WLAN_2G_CAPABILITY)) { WMI_HOST_WLAN_2G_CAPABILITY)) {
/*Supports both 5G and 2G. Use freq from both radios*/ /*Supports both 5G and 2G. Use freq from both radios*/
target_if_info("Supports both 2G and 5G"); target_if_debug("Supports both 2G and 5G");
band_to_mac[i].pdev_id = mac_phy_cap->pdev_id; band_to_mac[i].pdev_id = mac_phy_cap->pdev_id;
band_to_mac[i].start_freq = band_to_mac[i].start_freq =
reg_cap[i].low_2ghz_chan; reg_cap[i].low_2ghz_chan;
@@ -402,11 +401,10 @@ void init_deinit_derive_band_to_mac_param(
reg_cap[mac_phy_cap->phy_id].low_5ghz_chan = 0; reg_cap[mac_phy_cap->phy_id].low_5ghz_chan = 0;
reg_cap[mac_phy_cap->phy_id].high_5ghz_chan = 0; reg_cap[mac_phy_cap->phy_id].high_5ghz_chan = 0;
target_if_info( target_if_debug("2G radio - pdev_id = %d start_freq = %d end_freq= %d",
"2G radio - pdev_id = %d start_freq = %d end_freq= %d", band_to_mac[i].pdev_id,
band_to_mac[i].pdev_id, band_to_mac[i].start_freq,
band_to_mac[i].start_freq, band_to_mac[i].end_freq);
band_to_mac[i].end_freq);
} else if (mac_phy_cap->supported_bands == } else if (mac_phy_cap->supported_bands ==
WMI_HOST_WLAN_5G_CAPABILITY) { WMI_HOST_WLAN_5G_CAPABILITY) {
@@ -419,11 +417,10 @@ void init_deinit_derive_band_to_mac_param(
reg_cap[mac_phy_cap->phy_id].low_2ghz_chan = 0; reg_cap[mac_phy_cap->phy_id].low_2ghz_chan = 0;
reg_cap[mac_phy_cap->phy_id].high_2ghz_chan = 0; reg_cap[mac_phy_cap->phy_id].high_2ghz_chan = 0;
target_if_info( target_if_debug("5G radio -pdev_id = %d start_freq = %d end_freq =%d\n",
"5G radio -pdev_id = %d start_freq = %d end_freq =%d\n", band_to_mac[i].pdev_id,
band_to_mac[i].pdev_id, band_to_mac[i].start_freq,
band_to_mac[i].start_freq, band_to_mac[i].end_freq);
band_to_mac[i].end_freq);
} }
} }
} }
@@ -480,8 +477,7 @@ void init_deinit_prepare_send_init_cmd(
return; return;
target_if_info("FW version 0x%x ", info->target_caps.fw_version); target_if_info("FW version 0x%x ", info->target_caps.fw_version);
if (init_deinit_is_service_ext_msg(psoc, tgt_hdl) == if (init_deinit_is_service_ext_msg(psoc, tgt_hdl) == QDF_STATUS_SUCCESS)
QDF_STATUS_SUCCESS)
target_if_info("0x%x\n", target_if_info("0x%x\n",
info->service_ext_param.fw_build_vers_ext); info->service_ext_param.fw_build_vers_ext);
else else

View File

@@ -101,7 +101,7 @@ static int init_deinit_service_ready_event_handler(ol_scn_t scn_handle,
if (wmi_service_enabled(wmi_handle, wmi_service_check_cal_version)) if (wmi_service_enabled(wmi_handle, wmi_service_check_cal_version))
wlan_psoc_nif_fw_ext_cap_set(psoc, WLAN_SOC_CEXT_SW_CAL); wlan_psoc_nif_fw_ext_cap_set(psoc, WLAN_SOC_CEXT_SW_CAL);
target_if_info(" TT support %d, Wide BW Scan %d, SW cal %d", target_if_debug(" TT support %d, Wide BW Scan %d, SW cal %d",
wlan_psoc_nif_fw_ext_cap_get(psoc, WLAN_SOC_CEXT_TT_SUPPORT), wlan_psoc_nif_fw_ext_cap_get(psoc, WLAN_SOC_CEXT_TT_SUPPORT),
wlan_psoc_nif_fw_ext_cap_get(psoc, WLAN_SOC_CEXT_WIDEBAND_SCAN), wlan_psoc_nif_fw_ext_cap_get(psoc, WLAN_SOC_CEXT_WIDEBAND_SCAN),
wlan_psoc_nif_fw_ext_cap_get(psoc, WLAN_SOC_CEXT_SW_CAL)); wlan_psoc_nif_fw_ext_cap_get(psoc, WLAN_SOC_CEXT_SW_CAL));
@@ -140,11 +140,11 @@ static int init_deinit_service_ready_event_handler(ol_scn_t scn_handle,
if (wmi_service_enabled(wmi_handle, wmi_service_mgmt_tx_wmi)) { if (wmi_service_enabled(wmi_handle, wmi_service_mgmt_tx_wmi)) {
wlan_psoc_nif_fw_ext_cap_set(psoc, WLAN_SOC_CEXT_WMI_MGMT_REF); wlan_psoc_nif_fw_ext_cap_set(psoc, WLAN_SOC_CEXT_WMI_MGMT_REF);
target_if_info("WMI mgmt service enabled"); target_if_debug("WMI mgmt service enabled");
} else { } else {
wlan_psoc_nif_fw_ext_cap_clear(psoc, wlan_psoc_nif_fw_ext_cap_clear(psoc,
WLAN_SOC_CEXT_WMI_MGMT_REF); WLAN_SOC_CEXT_WMI_MGMT_REF);
target_if_info("WMI mgmt service disabled"); target_if_debug("WMI mgmt service disabled");
} }
err_code = init_deinit_handle_host_mem_req(psoc, tgt_hdl, event); err_code = init_deinit_handle_host_mem_req(psoc, tgt_hdl, event);
@@ -153,13 +153,13 @@ static int init_deinit_service_ready_event_handler(ol_scn_t scn_handle,
target_if_reg_set_offloaded_info(psoc); target_if_reg_set_offloaded_info(psoc);
if (!wmi_service_enabled(wmi_handle, wmi_service_ext_msg)) { if (!wmi_service_enabled(wmi_handle, wmi_service_ext_msg)) {
target_if_info("No EXT message, send init command"); target_if_debug("No EXT message, send init command");
tgt_hdl->info.wmi_service_ready = TRUE; tgt_hdl->info.wmi_service_ready = TRUE;
target_psoc_set_num_radios(tgt_hdl, 1); target_psoc_set_num_radios(tgt_hdl, 1);
/* send init command */ /* send init command */
init_deinit_prepare_send_init_cmd(psoc, tgt_hdl); init_deinit_prepare_send_init_cmd(psoc, tgt_hdl);
} else { } else {
target_if_info("Wait for EXT message"); target_if_debug("Wait for EXT message");
} }
target_if_smart_log_enable(psoc, tgt_hdl, event); target_if_smart_log_enable(psoc, tgt_hdl, event);

View File

@@ -153,8 +153,8 @@ int init_deinit_populate_mac_phy_capability(void *handle, uint8_t *evt,
hw_mode_id = hw_cap->hw_mode_id; hw_mode_id = hw_cap->hw_mode_id;
phy_bit_map = hw_cap->phy_id_map; phy_bit_map = hw_cap->phy_id_map;
target_if_info("hw_mode_id %d phy_bit_map 0x%x", target_if_debug("hw_mode_id %d phy_bit_map 0x%x",
hw_mode_id, phy_bit_map); hw_mode_id, phy_bit_map);
mac_phy_id = 0; mac_phy_id = 0;
while (phy_bit_map) { while (phy_bit_map) {
@@ -177,7 +177,7 @@ int init_deinit_populate_mac_phy_capability(void *handle, uint8_t *evt,
phy_bit_map &= (phy_bit_map - 1); phy_bit_map &= (phy_bit_map - 1);
mac_phy_id++; mac_phy_id++;
} }
target_if_info("total_mac_phy_cnt %d", info->total_mac_phy_cnt); target_if_debug("total_mac_phy_cnt %d", info->total_mac_phy_cnt);
return 0; return 0;
} }
@@ -227,7 +227,7 @@ int init_deinit_populate_hw_mode_capability(void *wmi_handle,
target_if_err("invalid num_hw_modes %d", num_hw_modes); target_if_err("invalid num_hw_modes %d", num_hw_modes);
return -EINVAL; return -EINVAL;
} }
target_if_info("num_hw_modes %d", num_hw_modes); target_if_debug("num_hw_modes %d", num_hw_modes);
qdf_mem_zero(&hw_mode_caps, sizeof(hw_mode_caps)); qdf_mem_zero(&hw_mode_caps, sizeof(hw_mode_caps));
@@ -250,12 +250,11 @@ int init_deinit_populate_hw_mode_capability(void *wmi_handle,
if ((preferred_mode != WMI_HOST_HW_MODE_MAX) && if ((preferred_mode != WMI_HOST_HW_MODE_MAX) &&
(hw_mode_caps[hw_idx].hw_mode_id == preferred_mode)) { (hw_mode_caps[hw_idx].hw_mode_id == preferred_mode)) {
info->num_radios = info->total_mac_phy_cnt; info->num_radios = info->total_mac_phy_cnt;
target_if_info("num radios is %d\n", info->num_radios); target_if_debug("num radios is %d\n", info->num_radios);
} }
} }
status = get_sar_version(wmi_handle, event, &info->service_ext_param); status = get_sar_version(wmi_handle, event, &info->service_ext_param);
target_if_info("sar version %d", target_if_debug("sar version %d", info->service_ext_param.sar_version);
info->service_ext_param.sar_version);
return_exit: return_exit:
return qdf_status_to_os_return(status); return qdf_status_to_os_return(status);
@@ -271,7 +270,7 @@ int init_deinit_populate_dbr_ring_cap(struct wlan_objmgr_psoc *psoc,
num_dbr_ring_caps = info->service_ext_param.num_dbr_ring_caps; num_dbr_ring_caps = info->service_ext_param.num_dbr_ring_caps;
target_if_info("Num DMA Capabilities = %d", num_dbr_ring_caps); target_if_debug("Num DMA Capabilities = %d", num_dbr_ring_caps);
if (!num_dbr_ring_caps) if (!num_dbr_ring_caps)
return 0; return 0;
@@ -340,8 +339,8 @@ int init_deinit_populate_phy_reg_cap(struct wlan_objmgr_psoc *psoc,
reg_cap[0].phy_id = 0; reg_cap[0].phy_id = 0;
qdf_mem_copy(&(reg_cap[0].eeprom_reg_domain), &cap, qdf_mem_copy(&(reg_cap[0].eeprom_reg_domain), &cap,
sizeof(struct wlan_psoc_hal_reg_capability)); sizeof(struct wlan_psoc_hal_reg_capability));
target_if_info("FW wireless modes 0x%x", target_if_debug("FW wireless modes 0x%x",
reg_cap[0].wireless_modes); reg_cap[0].wireless_modes);
} else { } else {
num_phy_reg_cap = info->service_ext_param.num_phy; num_phy_reg_cap = info->service_ext_param.num_phy;
if (num_phy_reg_cap > PSOC_MAX_PHY_REG_CAP) { if (num_phy_reg_cap > PSOC_MAX_PHY_REG_CAP) {
@@ -349,7 +348,7 @@ int init_deinit_populate_phy_reg_cap(struct wlan_objmgr_psoc *psoc,
num_phy_reg_cap); num_phy_reg_cap);
return -EINVAL; return -EINVAL;
} }
target_if_info("num_phy_reg_cap %d", num_phy_reg_cap); target_if_debug("num_phy_reg_cap %d", num_phy_reg_cap);
for (reg_idx = 0; reg_idx < num_phy_reg_cap; reg_idx++) { for (reg_idx = 0; reg_idx < num_phy_reg_cap; reg_idx++) {
status = wmi_extract_reg_cap_service_ready_ext(handle, status = wmi_extract_reg_cap_service_ready_ext(handle,

View File

@@ -356,8 +356,7 @@ QDF_STATUS tgt_if_regulatory_modify_freq_range(struct wlan_objmgr_psoc *psoc)
reg_cap->high_2ghz_chan = 0; reg_cap->high_2ghz_chan = 0;
} }
target_if_info( target_if_debug("phy_id = %d - low_2ghz_chan = %d high_2ghz_chan = %d low_5ghz_chan = %d high_5ghz_chan = %d",
"phy_id = %d - low_2ghz_chan = %d high_2ghz_chan = %d low_5ghz_chan = %d high_5ghz_chan = %d",
reg_cap->phy_id, reg_cap->phy_id,
reg_cap->low_2ghz_chan, reg_cap->low_2ghz_chan,
reg_cap->high_2ghz_chan, reg_cap->high_2ghz_chan,

View File

@@ -116,8 +116,8 @@ int target_if_nlo_complete_handler(ol_scn_t scn, uint8_t *data,
} }
nlo_event = param_buf->fixed_param; nlo_event = param_buf->fixed_param;
target_if_info("PNO complete event received for vdev %d", target_if_debug("PNO complete event received for vdev %d",
nlo_event->vdev_id); nlo_event->vdev_id);
event_info->event.type = SCAN_EVENT_TYPE_NLO_COMPLETE; event_info->event.type = SCAN_EVENT_TYPE_NLO_COMPLETE;
event_info->event.vdev_id = nlo_event->vdev_id; event_info->event.vdev_id = nlo_event->vdev_id;
@@ -166,8 +166,8 @@ int target_if_nlo_match_event_handler(ol_scn_t scn, uint8_t *data,
} }
nlo_event = param_buf->fixed_param; nlo_event = param_buf->fixed_param;
target_if_info("PNO match event received for vdev %d", target_if_debug("PNO match event received for vdev %d",
nlo_event->vdev_id); nlo_event->vdev_id);
event_info->event.type = SCAN_EVENT_TYPE_NLO_MATCH; event_info->event.type = SCAN_EVENT_TYPE_NLO_MATCH;
event_info->event.vdev_id = nlo_event->vdev_id; event_info->event.vdev_id = nlo_event->vdev_id;