From 069884fe62bf4b099dc384874bdec955c08b5321 Mon Sep 17 00:00:00 2001 From: Srinivas Dasari Date: Mon, 16 Mar 2020 19:35:14 +0530 Subject: [PATCH] qcacmn: cleanup NAN/NDP logging Few NAN/NDP logs are redundant in the current logging infra. Optimize the same and add few necessary logs. Change-Id: I9621416f7c9b17fe62db32bea48d4de0122ce17e CRs-Fixed: 2644420 --- wmi/src/wmi_unified_nan_tlv.c | 148 +++++++++------------------------- 1 file changed, 40 insertions(+), 108 deletions(-) diff --git a/wmi/src/wmi_unified_nan_tlv.c b/wmi/src/wmi_unified_nan_tlv.c index f972554952..5f43bc10ea 100644 --- a/wmi/src/wmi_unified_nan_tlv.c +++ b/wmi/src/wmi_unified_nan_tlv.c @@ -281,8 +281,6 @@ static QDF_STATUS send_nan_req_cmd_tlv(wmi_unified_t wmi_handle, WMITLV_TAG_STRUC_wmi_nan_cmd_param, WMITLV_GET_STRUCT_TLVLEN(wmi_nan_cmd_param)); cmd->data_len = nan_msg->request_data_len; - WMI_LOGD("%s: The data len value is %u", __func__, - nan_msg->request_data_len); buf_ptr += sizeof(wmi_nan_cmd_param); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, nan_data_len_aligned); buf_ptr += WMI_TLV_HDR_SIZE; @@ -452,42 +450,18 @@ static QDF_STATUS nan_ndp_initiator_req_tlv(wmi_unified_t wmi_handle, qdf_mem_copy(tcp_ip_param->ipv6_intf_addr, ndp_req->ipv6_addr, WMI_NDP_IPV6_INTF_ADDR_LEN); } - WMI_LOGD(FL("IPv6 addr present: %d, addr: %pI6"), + WMI_LOGD("IPv6 addr present: %d, addr: %pI6", ndp_req->is_ipv6_addr_present, ndp_req->ipv6_addr); - WMI_LOGD("vdev_id = %d, transaction_id: %d, service_instance_id: %d, ch: %d, ch_cfg: %d, csid: %d", + WMI_LOGD("vdev_id = %d, transaction_id: %d, service_instance_id: %d, ch: %d, ch_cfg: %d, csid: %d peer mac addr: mac_addr31to0: 0x%x, mac_addr47to32: 0x%x", cmd->vdev_id, cmd->transaction_id, cmd->service_instance_id, - ch_tlv->mhz, cmd->ndp_channel_cfg, cmd->nan_csid); - WMI_LOGD("peer mac addr: mac_addr31to0: 0x%x, mac_addr47to32: 0x%x", + ch_tlv->mhz, cmd->ndp_channel_cfg, cmd->nan_csid, cmd->peer_discovery_mac_addr.mac_addr31to0, cmd->peer_discovery_mac_addr.mac_addr47to32); - WMI_LOGD("ndp_config len: %d", cmd->ndp_cfg_len); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_DEBUG, - ndp_req->ndp_config.ndp_cfg, - ndp_req->ndp_config.ndp_cfg_len); - - WMI_LOGD("ndp_app_info len: %d", cmd->ndp_app_info_len); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_DEBUG, - ndp_req->ndp_info.ndp_app_info, - ndp_req->ndp_info.ndp_app_info_len); - - WMI_LOGD("pmk len: %d", cmd->nan_pmk_len); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_DEBUG, - ndp_req->pmk.pmk, cmd->nan_pmk_len); - - WMI_LOGD("pass phrase len: %d", cmd->nan_passphrase_len); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_DEBUG, - ndp_req->passphrase.passphrase, - cmd->nan_passphrase_len); - - WMI_LOGD("service name len: %d", cmd->nan_servicename_len); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_DEBUG, - ndp_req->service_name.service_name, - cmd->nan_servicename_len); - - WMI_LOGD("sending WMI_NDP_INITIATOR_REQ_CMDID(0x%X)", - WMI_NDP_INITIATOR_REQ_CMDID); + WMI_LOGD("ndp_config len: %d ndp_app_info len: %d pmk len: %d pass phrase len: %d service name len: %d", + cmd->ndp_cfg_len, cmd->ndp_app_info_len, cmd->nan_pmk_len, + cmd->nan_passphrase_len, cmd->nan_servicename_len); wmi_mtrace(WMI_NDP_INITIATOR_REQ_CMDID, cmd->vdev_id, 0); status = wmi_unified_cmd_send(wmi_handle, buf, len, @@ -605,43 +579,12 @@ static QDF_STATUS nan_ndp_responder_req_tlv(wmi_unified_t wmi_handle, tcp_ip_param->trans_proto_present = req->is_protocol_present; tcp_ip_param->transport_protocol = req->protocol; } - WMI_LOGD(FL("IPv6 addr present: %d, addr: %pI6"), - req->is_ipv6_addr_present, req->ipv6_addr); - WMI_LOGD(FL("port: %d present: %d"), req->is_port_present, req->port); - WMI_LOGD(FL("protocol: %d present: %d"), - req->is_protocol_present, req->protocol); - WMI_LOGD("vdev_id = %d, transaction_id: %d, csid: %d", - cmd->vdev_id, cmd->transaction_id, cmd->nan_csid); + WMI_LOGD("ndp_config len: %d ndp_app_info len: %d pmk len: %d pass phrase len: %d service name len: %d", + req->ndp_config.ndp_cfg_len, req->ndp_info.ndp_app_info_len, + cmd->nan_pmk_len, cmd->nan_passphrase_len, + cmd->nan_servicename_len); - WMI_LOGD("ndp_config len: %d", - req->ndp_config.ndp_cfg_len); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_DEBUG, - req->ndp_config.ndp_cfg, - req->ndp_config.ndp_cfg_len); - - WMI_LOGD("ndp_app_info len: %d", - req->ndp_info.ndp_app_info_len); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_DEBUG, - req->ndp_info.ndp_app_info, - req->ndp_info.ndp_app_info_len); - - WMI_LOGD("pmk len: %d", cmd->nan_pmk_len); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_DEBUG, - req->pmk.pmk, cmd->nan_pmk_len); - - WMI_LOGD("pass phrase len: %d", cmd->nan_passphrase_len); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_DEBUG, - req->passphrase.passphrase, - cmd->nan_passphrase_len); - - WMI_LOGD("service name len: %d", cmd->nan_servicename_len); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_DEBUG, - req->service_name.service_name, - cmd->nan_servicename_len); - - WMI_LOGD("sending WMI_NDP_RESPONDER_REQ_CMDID(0x%X)", - WMI_NDP_RESPONDER_REQ_CMDID); wmi_mtrace(WMI_NDP_RESPONDER_REQ_CMDID, cmd->vdev_id, 0); status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_NDP_RESPONDER_REQ_CMDID); @@ -692,7 +635,6 @@ static QDF_STATUS nan_ndp_end_req_tlv(wmi_unified_t wmi_handle, ndp_end_req_lst[i].ndp_instance_id = req->ndp_ids[i]; } - WMI_LOGD("Sending WMI_NDP_END_REQ_CMDID to FW"); wmi_mtrace(WMI_NDP_END_REQ_CMDID, NO_SESSION, 0); status = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_NDP_END_REQ_CMDID); @@ -845,20 +787,13 @@ static QDF_STATUS extract_ndp_ind_tlv(wmi_unified_t wmi_handle, WMI_MAC_ADDR_TO_CHAR_ARRAY(&fixed_params->peer_discovery_mac_addr, rsp->peer_discovery_mac_addr.bytes); - WMI_LOGD("WMI_NDP_INDICATION_EVENTID(0x%X) received. vdev %d,\n" - "service_instance %d, ndp_instance %d, role %d, policy %d,\n" - "csid: %d, scid_len: %d, peer_addr: %pM, peer_disc_addr: %pM", + WMI_LOGD("WMI_NDP_INDICATION_EVENTID(0x%X) received. vdev %d service_instance %d, ndp_instance %d, role %d, policy %d csid: %d, scid_len: %d, peer_addr: %pM, peer_disc_addr: %pM ndp_cfg - %d bytes ndp_app_info - %d bytes", WMI_NDP_INDICATION_EVENTID, fixed_params->vdev_id, fixed_params->service_instance_id, fixed_params->ndp_instance_id, fixed_params->self_ndp_role, - fixed_params->accept_policy, - fixed_params->nan_csid, fixed_params->nan_scid_len, - rsp->peer_mac_addr.bytes, - rsp->peer_discovery_mac_addr.bytes); - - WMI_LOGD("ndp_cfg - %d bytes", fixed_params->ndp_cfg_len); - - WMI_LOGD("ndp_app_info - %d bytes", + fixed_params->accept_policy, fixed_params->nan_csid, + fixed_params->nan_scid_len, rsp->peer_mac_addr.bytes, + rsp->peer_discovery_mac_addr.bytes, fixed_params->ndp_cfg_len, fixed_params->ndp_app_info_len); rsp->ncs_sk_type = fixed_params->nan_csid; @@ -914,12 +849,12 @@ static QDF_STATUS extract_ndp_confirm_tlv(wmi_unified_t wmi_handle, event = (WMI_NDP_CONFIRM_EVENTID_param_tlvs *) data; fixed_params = (wmi_ndp_confirm_event_fixed_param *)event->fixed_param; - WMI_LOGD("WMI_NDP_CONFIRM_EVENTID(0x%X) received. vdev %d, ndp_instance %d, rsp_code %d, reason_code: %d, num_active_ndps_on_peer: %d", + WMI_LOGD("WMI_NDP_CONFIRM_EVENTID(0x%X) received. vdev %d, ndp_instance %d, rsp_code %d, reason_code: %d, num_active_ndps_on_peer: %d num_ch: %d", WMI_NDP_CONFIRM_EVENTID, fixed_params->vdev_id, fixed_params->ndp_instance_id, fixed_params->rsp_code, fixed_params->reason_code, - fixed_params->num_active_ndps_on_peer); - WMI_LOGE("num_ch: %d", fixed_params->num_ndp_channels); + fixed_params->num_active_ndps_on_peer, + fixed_params->num_ndp_channels); if (fixed_params->ndp_cfg_len > event->num_ndp_cfg) { WMI_LOGE("FW message ndp cfg length %d larger than TLV hdr %d", @@ -927,8 +862,6 @@ static QDF_STATUS extract_ndp_confirm_tlv(wmi_unified_t wmi_handle, return QDF_STATUS_E_INVAL; } - WMI_LOGD("ndp_cfg - %d bytes", fixed_params->ndp_cfg_len); - if (fixed_params->ndp_app_info_len > event->num_ndp_app_info) { WMI_LOGE("FW message ndp app info length %d more than TLV hdr %d", fixed_params->ndp_app_info_len, @@ -936,8 +869,8 @@ static QDF_STATUS extract_ndp_confirm_tlv(wmi_unified_t wmi_handle, return QDF_STATUS_E_INVAL; } - WMI_LOGD("ndp_app_info - %d bytes", - fixed_params->ndp_app_info_len); + WMI_LOGD("ndp_cfg - %d bytes, ndp_app_info - %d bytes", + fixed_params->ndp_cfg_len, fixed_params->ndp_app_info_len); if (fixed_params->ndp_cfg_len > (WMI_SVC_MSG_MAX_SIZE - sizeof(*fixed_params))) { @@ -1003,14 +936,15 @@ static QDF_STATUS extract_ndp_confirm_tlv(wmi_unified_t wmi_handle, ch_mode = WMI_GET_CHANNEL_MODE(&event->ndp_channel_list[i]); rsp->ch[i].ch_width = wmi_get_ch_width_from_phy_mode(wmi_handle, ch_mode); - WMI_LOGD(FL("Freq: %d, ch_mode: %d, nss: %d"), - rsp->ch[i].freq, - rsp->ch[i].ch_width, - rsp->ch[i].nss); - if (ndi_dbs) { rsp->ch[i].mac_id = event->ndp_channel_info[i].mac_id; - WMI_LOGD("mac_id: %d", rsp->ch[i].mac_id); + WMI_LOGD("Freq: %d, ch_mode: %d, nss: %d mac_id: %d", + rsp->ch[i].freq, rsp->ch[i].ch_width, + rsp->ch[i].nss, rsp->ch[i].mac_id); + } else { + WMI_LOGD("Freq: %d, ch_mode: %d, nss: %d", + rsp->ch[i].freq, rsp->ch[i].ch_width, + rsp->ch[i].nss); } } @@ -1035,11 +969,9 @@ static QDF_STATUS extract_ndp_confirm_tlv(wmi_unified_t wmi_handle, event->ndp_transport_ip_param->transport_protocol; } } - WMI_LOGD(FL("IPv6 addr present: %d, addr: %pI6"), - rsp->is_ipv6_addr_present, rsp->ipv6_addr); - WMI_LOGD(FL("port: %d present: %d"), rsp->port, rsp->is_port_present); - WMI_LOGD(FL("protocol: %d present: %d"), - rsp->protocol, rsp->is_protocol_present); + WMI_LOGD("IPv6 addr present: %d, addr: %pI6 port: %d present: %d protocol: %d present: %d", + rsp->is_ipv6_addr_present, rsp->ipv6_addr, rsp->port, + rsp->is_port_present, rsp->protocol, rsp->is_protocol_present); return QDF_STATUS_SUCCESS; } @@ -1053,11 +985,6 @@ static QDF_STATUS extract_ndp_responder_rsp_tlv(wmi_unified_t wmi_handle, event = (WMI_NDP_RESPONDER_RSP_EVENTID_param_tlvs *)data; fixed_params = event->fixed_param; - WMI_LOGD("WMI_NDP_RESPONDER_RSP_EVENTID(0x%X) received. vdev_id: %d, peer_mac_addr: %pM,transaction_id: %d, status_code %d, reason_code: %d, create_peer: %d", - WMI_NDP_RESPONDER_RSP_EVENTID, fixed_params->vdev_id, - rsp->peer_mac_addr.bytes, rsp->transaction_id, - rsp->status, rsp->reason, rsp->create_peer); - rsp->vdev = wlan_objmgr_get_vdev_by_id_from_psoc(wmi_handle->soc->wmi_psoc, fixed_params->vdev_id, @@ -1072,6 +999,10 @@ static QDF_STATUS extract_ndp_responder_rsp_tlv(wmi_unified_t wmi_handle, rsp->create_peer = fixed_params->create_peer; WMI_MAC_ADDR_TO_CHAR_ARRAY(&fixed_params->peer_ndi_mac_addr, rsp->peer_mac_addr.bytes); + WMI_LOGD("WMI_NDP_RESPONDER_RSP_EVENTID(0x%X) received. vdev_id: %d, peer_mac_addr: %pM,transaction_id: %d, status_code %d, reason_code: %d, create_peer: %d", + WMI_NDP_RESPONDER_RSP_EVENTID, fixed_params->vdev_id, + rsp->peer_mac_addr.bytes, rsp->transaction_id, + rsp->status, rsp->reason, rsp->create_peer); return QDF_STATUS_SUCCESS; } @@ -1231,14 +1162,15 @@ static QDF_STATUS extract_ndp_sch_update_tlv(wmi_unified_t wmi_handle, ch_mode = WMI_GET_CHANNEL_MODE(&event->ndl_channel_list[i]); ind->ch[i].ch_width = wmi_get_ch_width_from_phy_mode(wmi_handle, ch_mode); - WMI_LOGD(FL("Freq: %d, ch_mode: %d, nss: %d"), - ind->ch[i].freq, - ind->ch[i].ch_width, - ind->ch[i].nss); - if (ndi_dbs) { ind->ch[i].mac_id = event->ndp_channel_info[i].mac_id; - WMI_LOGD("mac_id: %d", ind->ch[i].mac_id); + WMI_LOGD(FL("Freq: %d, ch_mode: %d, nss: %d mac_id: %d"), + ind->ch[i].freq, ind->ch[i].ch_width, + ind->ch[i].nss, ind->ch[i].mac_id); + } else { + WMI_LOGD(FL("Freq: %d, ch_mode: %d, nss: %d"), + ind->ch[i].freq, ind->ch[i].ch_width, + ind->ch[i].nss); } }