diff options
author | Srinivas Dasari <dasaris@codeaurora.org> | 2020-03-24 15:42:49 +0530 |
---|---|---|
committer | Paul Chen <chenpaul@google.com> | 2020-04-09 05:18:45 +0000 |
commit | bbe4cea08908be686b8bdccf4ebf915f810e1a41 (patch) | |
tree | 086ed7e9683e49e7bc053907fbc11df730f665bf | |
parent | db65a007f8390ce929fcfd79bc670affba83d3a7 (diff) | |
download | qca-wfi-host-cmn-bbe4cea08908be686b8bdccf4ebf915f810e1a41.tar.gz |
qcacmn: cleanup NAN/NDP logging
Few NAN/NDP logs are redundant in the current logging infra.
Optimize the same and add few necessary logs.
Bug: 152385205
Change-Id: I9621416f7c9b17fe62db32bea48d4de0122ce17e
CRs-Fixed: 2644420
-rw-r--r-- | os_if/linux/nan/src/os_if_nan.c | 79 | ||||
-rw-r--r-- | wmi/src/wmi_unified_tlv.c | 85 |
2 files changed, 40 insertions, 124 deletions
diff --git a/os_if/linux/nan/src/os_if_nan.c b/os_if/linux/nan/src/os_if_nan.c index 9b444111e..ebafd9ffa 100644 --- a/os_if/linux/nan/src/os_if_nan.c +++ b/os_if/linux/nan/src/os_if_nan.c @@ -228,7 +228,7 @@ static int os_if_nan_process_ndi_delete(struct wlan_objmgr_psoc *psoc, nan_vdev = wlan_util_get_vdev_by_ifname(psoc, iface_name, WLAN_NAN_ID); if (!nan_vdev) { - cfg80211_err("Nan datapath interface is not present"); + cfg80211_debug("Nan datapath interface is not present"); return -EINVAL; } @@ -446,8 +446,6 @@ static int os_if_nan_process_ndp_initiator_req(struct wlan_objmgr_psoc *psoc, nla_data(tb[QCA_WLAN_VENDOR_ATTR_NDP_IPV6_ADDR]), QDF_IPV6_ADDR_SIZE); } - cfg80211_debug("ipv6 addr present: %d, addr: %pI6", - req.is_ipv6_addr_present, req.ipv6_addr); if (os_if_nan_parse_security_params(tb, &req.ncs_sk_type, &req.pmk, &req.passphrase, &req.service_name)) { @@ -456,11 +454,6 @@ static int os_if_nan_process_ndp_initiator_req(struct wlan_objmgr_psoc *psoc, goto initiator_req_failed; } - cfg80211_debug("vdev_id: %d, transaction_id: %d, channel: %d, service_instance_id: %d, ndp_app_info_len: %d, csid: %d, peer_discovery_mac_addr: %pM", - wlan_vdev_get_id(nan_vdev), req.transaction_id, req.channel, - req.service_instance_id, req.ndp_info.ndp_app_info_len, - req.ncs_sk_type, req.peer_discovery_mac_addr.bytes); - req.vdev = nan_vdev; status = ucfg_nan_req_processor(nan_vdev, &req, NDP_INITIATOR_REQ); ret = qdf_status_to_os_return(status); @@ -606,9 +599,9 @@ static int os_if_nan_process_ndp_responder_req(struct wlan_objmgr_psoc *psoc, } cfg80211_debug("ipv6 addr present: %d, addr: %pI6", req.is_ipv6_addr_present, req.ipv6_addr); - cfg80211_debug("port %d, present: %d", req.port, req.is_port_present); - cfg80211_debug("protocol %d, present: %d", - req.protocol, req.is_protocol_present); + cfg80211_debug("port %d, present: %d protocol %d, present: %d", + req.port, req.is_port_present, req.protocol, + req.is_protocol_present); if (os_if_nan_parse_security_params(tb, &req.ncs_sk_type, &req.pmk, &req.passphrase, &req.service_name)) { @@ -724,14 +717,13 @@ int os_if_nan_process_ndp_cmd(struct wlan_objmgr_psoc *psoc, if (tb[QCA_WLAN_VENDOR_ATTR_NDP_IFACE_STR]) { iface_name = nla_data(tb[QCA_WLAN_VENDOR_ATTR_NDP_IFACE_STR]); - cfg80211_err("Transaction Id: %d NDPCmd: %d iface_name: %s", - transaction_id, ndp_cmd_type, iface_name); + cfg80211_debug("Transaction Id: %d NDPCmd: %d iface_name: %s", + transaction_id, ndp_cmd_type, iface_name); } else { - cfg80211_err("Transaction Id: %d NDPCmd: %d iface_name: unspecified", - transaction_id, ndp_cmd_type); + cfg80211_debug("Transaction Id: %d NDPCmd: %d iface_name: unspecified", + transaction_id, ndp_cmd_type); } - cfg80211_debug("Received NDP cmd: %d", ndp_cmd_type); switch (ndp_cmd_type) { case QCA_WLAN_VENDOR_ATTR_NDP_INTERFACE_CREATE: return os_if_nan_process_ndi_create(psoc, tb); @@ -881,9 +873,6 @@ static void os_if_ndp_responder_rsp_handler(struct wlan_objmgr_vdev *vdev, return; } - cfg80211_debug("NDP Responder,vdev id %d transaction_id %d status code: %d reason %d", - wlan_vdev_get_id(rsp->vdev), rsp->transaction_id, - rsp->status, rsp->reason); data_len = osif_ndp_get_ndp_responder_rsp_len(); vendor_event = cfg80211_vendor_event_alloc(os_priv->wiphy, NULL, data_len, QCA_NL80211_VENDOR_SUBCMD_NDP_INDEX, @@ -1088,8 +1077,6 @@ static void os_if_ndp_indication_handler(struct wlan_objmgr_vdev *vdev, QDF_IPV6_ADDR_SIZE, event->ipv6_addr)) goto ndp_indication_nla_failed; } - cfg80211_debug("ipv6 addr present: %d, addr: %pI6", - event->is_ipv6_addr_present, event->ipv6_addr); cfg80211_vendor_event(vendor_event, GFP_ATOMIC); return; @@ -1152,7 +1139,6 @@ static QDF_STATUS os_if_ndp_confirm_pack_ch_info(struct sk_buff *event, int idx = 0; struct nlattr *ch_array, *ch_element; - cfg80211_debug("num_ch: %d", ndp_confirm->num_channels); if (!ndp_confirm->num_channels) return QDF_STATUS_SUCCESS; @@ -1161,10 +1147,6 @@ static QDF_STATUS os_if_ndp_confirm_pack_ch_info(struct sk_buff *event, return QDF_STATUS_E_FAULT; for (idx = 0; idx < ndp_confirm->num_channels; idx++) { - cfg80211_debug("ch[%d]: freq: %d, width: %d, nss: %d", - idx, ndp_confirm->ch[idx].channel, - ndp_confirm->ch[idx].ch_width, - ndp_confirm->ch[idx].nss); ch_element = nla_nest_start(event, idx); if (!ch_element) return QDF_STATUS_E_FAULT; @@ -1324,13 +1306,6 @@ os_if_ndp_confirm_ind_handler(struct wlan_objmgr_vdev *vdev, QCA_WLAN_VENDOR_ATTR_NDP_TRANSPORT_PROTOCOL, ndp_confirm->protocol)) goto ndp_confirm_nla_failed; - cfg80211_debug("ipv6 addr present: %d, addr: %pI6", - ndp_confirm->is_ipv6_addr_present, - ndp_confirm->ipv6_addr); - cfg80211_debug("port %d, present: %d", - ndp_confirm->port, ndp_confirm->is_port_present); - cfg80211_debug("protocol %d, present: %d", - ndp_confirm->protocol, ndp_confirm->is_protocol_present); cfg80211_vendor_event(vendor_event, GFP_ATOMIC); cfg80211_debug("NDP confim sent, ndp instance id: %d, peer addr: %pM rsp_code: %d, reason_code: %d", @@ -1338,10 +1313,6 @@ os_if_ndp_confirm_ind_handler(struct wlan_objmgr_vdev *vdev, ndp_confirm->peer_ndi_mac_addr.bytes, ndp_confirm->rsp_code, ndp_confirm->reason_code); - cfg80211_debug("NDP confim, ndp app info dump"); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_DEBUG, - ndp_confirm->ndp_info.ndp_app_info, - ndp_confirm->ndp_info.ndp_app_info_len); return; ndp_confirm_nla_failed: cfg80211_err("nla_put api failed"); @@ -1417,7 +1388,7 @@ static void os_if_ndp_end_rsp_handler(struct wlan_objmgr_vdev *vdev, rsp->transaction_id)) goto ndp_end_rsp_nla_failed; - cfg80211_debug("NDP End rsp sent, transaction id: %d, status: %d, reason: %d", + cfg80211_debug("NDP End rsp sent, transaction id: %u, status: %u, reason: %u", rsp->transaction_id, rsp->status, rsp->reason); cfg80211_vendor_event(vendor_event, GFP_ATOMIC); return; @@ -1580,7 +1551,7 @@ static void os_if_new_peer_ind_handler(struct wlan_objmgr_vdev *vdev, active_peers++; ucfg_nan_set_active_peers(vdev, active_peers); - cfg80211_debug("vdev_id: %d, num_peers: %d", vdev_id, active_peers); + cfg80211_debug("num_peers: %d", active_peers); } /** @@ -1679,7 +1650,7 @@ static void os_if_ndp_iface_create_rsp_handler(struct wlan_objmgr_psoc *psoc, create_status = ndi_rsp->status; create_reason = ndi_rsp->reason; } else { - cfg80211_err("Invalid ndi create response"); + cfg80211_debug("Invalid ndi create response"); create_fail = true; } @@ -1727,16 +1698,8 @@ static void os_if_ndp_iface_create_rsp_handler(struct wlan_objmgr_psoc *psoc, goto nla_put_failure; } - cfg80211_debug("sub command: %d, value: %d", - QCA_NL80211_VENDOR_SUBCMD_NDP, - QCA_WLAN_VENDOR_ATTR_NDP_INTERFACE_CREATE); - cfg80211_debug("create transaction id: %d, value: %d", - QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID, create_transaction_id); - cfg80211_debug("status code: %d, value: %d", - QCA_WLAN_VENDOR_ATTR_NDP_DRV_RESPONSE_STATUS_TYPE, - create_status); - cfg80211_debug("Return value: %d, value: %d", - QCA_WLAN_VENDOR_ATTR_NDP_DRV_RETURN_VALUE, create_reason); + cfg80211_debug("transaction id: %u status code: %u Reason: %u", + create_transaction_id, create_status, create_reason); cfg80211_vendor_event(vendor_event, GFP_KERNEL); @@ -2140,18 +2103,10 @@ void os_if_nan_ndi_session_end(struct wlan_objmgr_vdev *vdev) goto failure; } - cfg80211_debug("sub command: %d, value: %d", - QCA_WLAN_VENDOR_ATTR_NDP_SUBCMD, - QCA_WLAN_VENDOR_ATTR_NDP_INTERFACE_DELETE); - cfg80211_debug("delete transaction id: %d, value: %d", - QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID, - ucfg_nan_get_ndp_delete_transaction_id(vdev)); - cfg80211_debug("status code: %d, value: %d", - QCA_WLAN_VENDOR_ATTR_NDP_DRV_RESPONSE_STATUS_TYPE, - ucfg_nan_get_ndi_delete_rsp_status(vdev)); - cfg80211_debug("Return value: %d, value: %d", - QCA_WLAN_VENDOR_ATTR_NDP_DRV_RETURN_VALUE, - ucfg_nan_get_ndi_delete_rsp_reason(vdev)); + cfg80211_debug("delete transaction id: %u, status code: %u reason: %u", + ucfg_nan_get_ndp_delete_transaction_id(vdev), + ucfg_nan_get_ndi_delete_rsp_status(vdev), + ucfg_nan_get_ndi_delete_rsp_reason(vdev)); ucfg_nan_set_ndp_delete_transaction_id(vdev, 0); ucfg_nan_set_ndi_state(vdev, NAN_DATA_NDI_DELETED_STATE); diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index cd3fa2e08..f9cebadf2 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -9981,8 +9981,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_req->request_data_len; - WMI_LOGD("%s: The data len value is %u", - __func__, nan_req->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; @@ -16869,42 +16867,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, @@ -17111,7 +17085,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); @@ -17216,20 +17189,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->ndp_config.ndp_cfg_len = fixed_params->ndp_cfg_len; @@ -17277,12 +17243,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", @@ -17290,8 +17256,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, @@ -17299,8 +17263,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))) { @@ -17357,7 +17321,7 @@ 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("ch: %d, ch_mode: %d, nss: %d"), + WMI_LOGD("ch: %d, ch_mode: %d, nss: %d", rsp->ch[i].channel, rsp->ch[i].ch_width, rsp->ch[i].nss); @@ -17384,11 +17348,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; } @@ -17402,11 +17364,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, @@ -17421,6 +17378,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; } |