From f10aa5ff4c5653408e4c96077f0ec42a4611e53d Mon Sep 17 00:00:00 2001 From: Ashish Kumar Dhanotiya Date: Fri, 28 Dec 2018 21:29:56 +0530 Subject: [PATCH] qcacld-3.0: Add mtrace logging for hdd messages New mtrace logging infrastructre is added in the driver, add mtrace logging for all the messages received from userspace. Change-Id: I235f7f8c890b16644d272328124f7a7b7a67f4c5 CRs-Fixed: 2376767 --- core/hdd/src/wlan_hdd_cfg80211.c | 133 +++++++++++++++++-------------- core/hdd/src/wlan_hdd_hostapd.c | 37 +++++---- core/hdd/src/wlan_hdd_ioctl.c | 92 +++++++++++---------- core/hdd/src/wlan_hdd_main.c | 11 ++- core/hdd/src/wlan_hdd_p2p.c | 14 ++-- core/hdd/src/wlan_hdd_power.c | 31 +++---- core/hdd/src/wlan_hdd_scan.c | 6 +- core/hdd/src/wlan_hdd_stats.c | 9 +-- core/hdd/src/wlan_hdd_tdls.c | 15 ++-- 9 files changed, 193 insertions(+), 155 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 0bb90f00d16b..9377720f13fd 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -13577,9 +13577,10 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy, if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_CHANGE_BSS, - adapter->session_id, params->ap_isolate)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_CHANGE_BSS, + adapter->session_id, params->ap_isolate); + hdd_debug("Device_mode %s(%d), ap_isolate = %d", qdf_opmode_str(adapter->device_mode), adapter->device_mode, params->ap_isolate); @@ -13763,9 +13764,9 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, if (errno) return errno; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_CHANGE_IFACE, - adapter->session_id, type)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_CHANGE_IFACE, + adapter->session_id, type); status = hdd_nl_to_qdf_iface_type(type, &new_mode); if (QDF_IS_STATUS_ERROR(status)) @@ -13977,9 +13978,9 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, return -EINVAL; } - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CHANGE_STATION, - adapter->session_id, params->listen_interval)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CHANGE_STATION, + adapter->session_id, params->listen_interval); if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; @@ -14220,8 +14221,10 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; - qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_ADD_KEY, - adapter->session_id, params->key_len); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_ADD_KEY, + adapter->session_id, params->key_len); + hdd_ctx = WLAN_HDD_GET_CTX(adapter); errno = wlan_hdd_validate_context(hdd_ctx); if (errno) @@ -14307,8 +14310,10 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; - qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_ADD_KEY, - adapter->session_id, params->key_len); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_ADD_KEY, + adapter->session_id, params->key_len); + hdd_ctx = WLAN_HDD_GET_CTX(adapter); errno = wlan_hdd_validate_context(hdd_ctx); @@ -14698,8 +14703,9 @@ static int __wlan_hdd_cfg80211_get_key(struct wiphy *wiphy, break; } - qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_GET_KEY, - adapter->session_id, params.cipher); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_GET_KEY, + adapter->session_id, params.cipher); params.key_len = roam_profile->Keys.KeyLength[key_index]; params.seq_len = 0; @@ -14826,8 +14832,9 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy, if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; - qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_DEFAULT_KEY, - adapter->session_id, key_index); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_SET_DEFAULT_KEY, + adapter->session_id, key_index); hdd_debug("Device_mode %s(%d) key_index = %d", qdf_opmode_str(adapter->device_mode), @@ -14892,8 +14899,9 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy, if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; - qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_DEFAULT_KEY, - adapter->session_id, key_index); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_SET_DEFAULT_KEY, + adapter->session_id, key_index); hdd_debug("Device_mode %s(%d) key_index = %d", qdf_opmode_str(adapter->device_mode), @@ -17663,9 +17671,10 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy, if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_CONNECT, - adapter->session_id, adapter->device_mode)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_CONNECT, + adapter->session_id, adapter->device_mode); + hdd_debug("Device_mode %s(%d)", qdf_opmode_str(adapter->device_mode), adapter->device_mode); @@ -18052,9 +18061,10 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy, if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_DISCONNECT, - adapter->session_id, reason)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_DISCONNECT, + adapter->session_id, reason); + hdd_print_netdev_txq_status(dev); hdd_debug("Device_mode %s(%d) reason code(%d)", qdf_opmode_str(adapter->device_mode), @@ -18310,9 +18320,10 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_JOIN_IBSS, - adapter->session_id, adapter->device_mode)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_JOIN_IBSS, + adapter->session_id, adapter->device_mode); + hdd_debug("Device_mode %s(%d)", qdf_opmode_str(adapter->device_mode), adapter->device_mode); @@ -18512,10 +18523,10 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy, if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_LEAVE_IBSS, - adapter->session_id, - eCSR_DISCONNECT_REASON_IBSS_LEAVE)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_LEAVE_IBSS, + adapter->session_id, eCSR_DISCONNECT_REASON_IBSS_LEAVE); + status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) return status; @@ -18618,9 +18629,10 @@ static int __wlan_hdd_cfg80211_set_wiphy_params(struct wiphy *wiphy, return -EINVAL; } - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_SET_WIPHY_PARAMS, - NO_SESSION, wiphy->rts_threshold)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_SET_WIPHY_PARAMS, + NO_SESSION, wiphy->rts_threshold); + status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) @@ -18806,9 +18818,9 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_DEL_STA, - adapter->session_id, adapter->device_mode)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_DEL_STA, + adapter->session_id, adapter->device_mode); hdd_ctx = WLAN_HDD_GET_CTX(adapter); status = wlan_hdd_validate_context(hdd_ctx); @@ -19038,9 +19050,9 @@ static int __wlan_hdd_cfg80211_add_station(struct wiphy *wiphy, if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_ADD_STA, - adapter->session_id, params->listen_interval)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_ADD_STA, + adapter->session_id, params->listen_interval); if (0 != wlan_hdd_validate_context(hdd_ctx)) return -EINVAL; @@ -19267,9 +19279,9 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy, result = sme_roam_set_pmkid_cache(mac_handle, adapter->session_id, &pmk_cache, 1, false); - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_SET_PMKSA, - adapter->session_id, result)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_SET_PMKSA, + adapter->session_id, result); sme_set_del_pmkid_cache(mac_handle, adapter->session_id, &pmk_cache, true); @@ -19342,9 +19354,9 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy, mac_handle = hdd_ctx->mac_handle; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_DEL_PMKSA, - adapter->session_id, 0)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_DEL_PMKSA, + adapter->session_id, 0); qdf_mem_zero(&pmk_cache, sizeof(pmk_cache)); @@ -19489,9 +19501,10 @@ __wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy, if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_UPDATE_FT_IES, - adapter->session_id, sta_ctx->conn_info.connState)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_UPDATE_FT_IES, + adapter->session_id, sta_ctx->conn_info.connState); + /* Added for debug on reception of Re-assoc Req. */ if (eConnectionState_Associated != sta_ctx->conn_info.connState) { hdd_err("Called with Ie of length = %zu when not associated", @@ -19637,9 +19650,9 @@ int __wlan_hdd_cfg80211_set_rekey_data(struct wiphy *wiphy, goto out; } - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_SET_REKEY_DATA, - adapter->session_id, adapter->device_mode)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_SET_REKEY_DATA, + adapter->session_id, adapter->device_mode); result = wlan_hdd_validate_context(hdd_ctx); if (0 != result) @@ -19754,9 +19767,10 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy, hdd_debug("acl policy: %d num acl entries: %d", params->acl_policy, params->n_acl_entries); - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_SET_MAC_ACL, - adapter->session_id, adapter->device_mode)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_SET_MAC_ACL, + adapter->session_id, adapter->device_mode); + if (QDF_SAP_MODE == adapter->device_mode) { pConfig = &adapter->session.ap.sap_config; @@ -19937,9 +19951,10 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy, return -EINVAL; } - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_TESTMODE, - NO_SESSION, nla_get_u32(tb[WLAN_HDD_TM_ATTR_CMD]))); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_TESTMODE, + NO_SESSION, nla_get_u32(tb[WLAN_HDD_TM_ATTR_CMD])); + switch (nla_get_u32(tb[WLAN_HDD_TM_ATTR_CMD])) { #ifdef FEATURE_WLAN_LPHB /* Low Power Heartbeat configuration request */ diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index eee1f1371a33..dcd90f84dd98 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -404,8 +404,10 @@ static int __hdd_hostapd_open(struct net_device *dev) hdd_enter_dev(dev); - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_HOSTAPD_OPEN_REQUEST, NO_SESSION, 0)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_HOSTAPD_OPEN_REQUEST, + NO_SESSION, 0); + /* Nothing to be done if device is unloading */ if (cds_is_driver_unloading()) { hdd_err("Driver is unloading can not open the hdd"); @@ -477,6 +479,11 @@ static int __hdd_hostapd_stop(struct net_device *dev) int ret; hdd_enter_dev(dev); + + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_HOSTAPD_STOP_REQUEST, + NO_SESSION, 0); + ret = wlan_hdd_validate_context(hdd_ctx); if (ret) { set_bit(DOWN_DURING_SSR, &adapter->event_flags); @@ -3424,9 +3431,9 @@ int wlan_hdd_set_channel(struct wiphy *wiphy, } adapter = WLAN_HDD_GET_PRIV_PTR(dev); - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_SET_CHANNEL, - adapter->session_id, channel_type)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_SET_CHANNEL, + adapter->session_id, channel_type); hdd_debug("Device_mode %s(%d) freq = %d", qdf_opmode_str(adapter->device_mode), @@ -5538,9 +5545,9 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_STOP_AP, - adapter->session_id, adapter->device_mode)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_STOP_AP, + adapter->session_id, adapter->device_mode); if (!(adapter->device_mode == QDF_SAP_MODE || adapter->device_mode == QDF_P2P_GO_MODE)) { @@ -5821,9 +5828,10 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_START_AP, adapter->session_id, - params->beacon_interval)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_START_AP, + adapter->session_id, params->beacon_interval); + if (WLAN_HDD_ADAPTER_MAGIC != adapter->magic) { hdd_err("HDD adapter magic is invalid"); return -ENODEV; @@ -6159,9 +6167,10 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy, if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_CHANGE_BEACON, - adapter->session_id, adapter->device_mode)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_CHANGE_BEACON, + adapter->session_id, adapter->device_mode); + hdd_debug("Device_mode %s(%d)", qdf_opmode_str(adapter->device_mode), adapter->device_mode); diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index 772eadd61379..2c4fcb8e7f28 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -1327,9 +1327,9 @@ hdd_parse_set_roam_scan_channels_v1(struct hdd_adapter *adapter, goto exit; } - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_SETROAMSCANCHANNELS_IOCTL, - adapter->session_id, num_chan)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_SETROAMSCANCHANNELS_IOCTL, + adapter->session_id, num_chan); if (num_chan > CFG_VALID_CHANNEL_LIST_LEN) { hdd_err("number of channels (%d) supported exceeded max (%d)", @@ -1400,9 +1400,10 @@ hdd_parse_set_roam_scan_channels_v2(struct hdd_adapter *adapter, goto exit; } - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_SETROAMSCANCHANNELS_IOCTL, - adapter->session_id, num_chan)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_SETROAMSCANCHANNELS_IOCTL, + adapter->session_id, num_chan); + for (i = 0; i < num_chan; i++) { channel = *value++; @@ -2775,13 +2776,14 @@ static int drv_cmd_p2p_dev_addr(struct hdd_adapter *adapter, size_t user_size = qdf_min(sizeof(addr->bytes), (size_t)priv_data->total_len); - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_P2P_DEV_ADDR_IOCTL, - adapter->session_id, - (unsigned int)(*(addr->bytes + 2) << 24 | + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_P2P_DEV_ADDR_IOCTL, + adapter->session_id, + (unsigned int)(*(addr->bytes + 2) << 24 | *(addr->bytes + 3) << 16 | *(addr->bytes + 4) << 8 | - *(addr->bytes + 5)))); + *(addr->bytes + 5))); + if (copy_to_user(priv_data->buf, addr->bytes, user_size)) { hdd_err("failed to copy data to user buffer"); @@ -2939,9 +2941,10 @@ static int drv_cmd_set_roam_trigger(struct hdd_adapter *adapter, goto exit; } - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_SETROAMTRIGGER_IOCTL, - adapter->session_id, lookup_threshold)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_SETROAMTRIGGER_IOCTL, + adapter->session_id, lookup_threshold); + hdd_debug("Received Command to Set Roam trigger (Neighbor lookup threshold) = %d", lookup_threshold); @@ -2971,9 +2974,9 @@ static int drv_cmd_get_roam_trigger(struct hdd_adapter *adapter, char extra[32]; uint8_t len = 0; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_GETROAMTRIGGER_IOCTL, - adapter->session_id, lookup_threshold)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_GETROAMTRIGGER_IOCTL, + adapter->session_id, lookup_threshold); len = scnprintf(extra, sizeof(extra), "%s %d", command, rssi); len = QDF_MIN(priv_data->total_len, len + 1); @@ -3025,9 +3028,11 @@ static int drv_cmd_set_roam_scan_period(struct hdd_adapter *adapter, ret = -EINVAL; goto exit; } - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_SETROAMSCANPERIOD_IOCTL, - adapter->session_id, roam_scan_period)); + + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_SETROAMSCANPERIOD_IOCTL, + adapter->session_id, roam_scan_period); + empty_scan_refresh_period = roam_scan_period * 1000; hdd_debug("Received Command to Set roam scan period (Empty Scan refresh period) = %d", @@ -3053,10 +3058,11 @@ static int drv_cmd_get_roam_scan_period(struct hdd_adapter *adapter, char extra[32]; uint8_t len; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_GETROAMSCANPERIOD_IOCTL, - adapter->session_id, - nEmptyScanRefreshPeriod)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_GETROAMSCANPERIOD_IOCTL, + adapter->session_id, + nEmptyScanRefreshPeriod); + len = scnprintf(extra, sizeof(extra), "%s %d", "GETROAMSCANPERIOD", (nEmptyScanRefreshPeriod / 1000)); @@ -3314,9 +3320,9 @@ static int drv_cmd_get_roam_delta(struct hdd_adapter *adapter, char extra[32]; uint8_t len; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_GETROAMDELTA_IOCTL, - adapter->session_id, roamRssiDiff)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_GETROAMDELTA_IOCTL, + adapter->session_id, roamRssiDiff); len = scnprintf(extra, sizeof(extra), "%s %d", command, roamRssiDiff); @@ -3343,9 +3349,9 @@ static int drv_cmd_get_band(struct hdd_adapter *adapter, hdd_get_band_helper(hdd_ctx, &band); - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_GETBAND_IOCTL, - adapter->session_id, band)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_GETBAND_IOCTL, + adapter->session_id, band); len = scnprintf(extra, sizeof(extra), "%s %d", command, band); len = QDF_MIN(priv_data->total_len, len + 1); @@ -3390,9 +3396,10 @@ static int drv_cmd_get_roam_scan_channels(struct hdd_adapter *adapter, goto exit; } - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_GETROAMSCANCHANNELS_IOCTL, - adapter->session_id, numChannels)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_GETROAMSCANCHANNELS_IOCTL, + adapter->session_id, numChannels); + /* * output channel list is of the format * [Number of roam scan channels][Channel1][Channel2]... @@ -3575,9 +3582,10 @@ static int drv_cmd_set_roam_scan_channel_min_time(struct hdd_adapter *adapter, goto exit; } - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_SETROAMSCANCHANNELMINTIME_IOCTL, - adapter->session_id, min_time)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_SETROAMSCANCHANNELMINTIME_IOCTL, + adapter->session_id, min_time); + hdd_debug("Received Command to change channel min time = %d", min_time); @@ -3616,9 +3624,9 @@ static int drv_cmd_get_roam_scan_channel_min_time(struct hdd_adapter *adapter, "GETROAMSCANCHANNELMINTIME", val); len = QDF_MIN(priv_data->total_len, len + 1); - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_GETROAMSCANCHANNELMINTIME_IOCTL, - adapter->session_id, val)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_GETROAMSCANCHANNELMINTIME_IOCTL, + adapter->session_id, val); if (copy_to_user(priv_data->buf, &extra, len)) { hdd_err("failed to copy data to user buffer"); @@ -6817,9 +6825,9 @@ static int drv_cmd_invalid(struct hdd_adapter *adapter, uint8_t command_len, struct hdd_priv_data *priv_data) { - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_UNSUPPORTED_IOCTL, - adapter->session_id, 0)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_UNSUPPORTED_IOCTL, + adapter->session_id, 0); hdd_warn("%s: Unsupported driver command \"%s\"", adapter->dev->name, command); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index ddfb9d9cd9f9..f80cf3201d31 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -3083,8 +3083,10 @@ static int __hdd_open(struct net_device *dev) int ret; hdd_enter_dev(dev); - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST, - adapter->session_id, adapter->device_mode)); + + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_OPEN_REQUEST, + adapter->session_id, adapter->device_mode); /* Nothing to be done if device is unloading */ if (cds_is_driver_unloading()) { @@ -3196,8 +3198,9 @@ static int __hdd_stop(struct net_device *dev) hdd_enter_dev(dev); - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_STOP_REQUEST, - adapter->session_id, adapter->device_mode)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_STOP_REQUEST, + adapter->session_id, adapter->device_mode); ret = wlan_hdd_validate_context(hdd_ctx); if (ret) { diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c index 150964312a89..242a150a0019 100644 --- a/core/hdd/src/wlan_hdd_p2p.c +++ b/core/hdd/src/wlan_hdd_p2p.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2019 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 @@ -634,8 +634,9 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy, if (ret) return ERR_PTR(ret); - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_ADD_VIRTUAL_INTF, NO_SESSION, type)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_ADD_VIRTUAL_INTF, + NO_SESSION, type); status = hdd_nl_to_qdf_iface_type(type, &mode); if (QDF_IS_STATUS_ERROR(status)) @@ -831,9 +832,10 @@ int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev) */ clear_bit(SOFTAP_INIT_DONE, &adapter->event_flags); - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_DEL_VIRTUAL_INTF, - adapter->session_id, adapter->device_mode)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_DEL_VIRTUAL_INTF, + adapter->session_id, adapter->device_mode); + hdd_debug("Device_mode %s(%d)", qdf_opmode_str(adapter->device_mode), adapter->device_mode); diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index 843fdde8be7b..692851cebc97 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -1647,10 +1647,10 @@ static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy) if (hdd_ctx->enable_dp_rx_threads) dp_txrx_resume(cds_get_context(QDF_MODULE_ID_SOC)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_RESUME_WLAN, + NO_SESSION, hdd_ctx->is_wiphy_suspended); - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_RESUME_WLAN, - NO_SESSION, hdd_ctx->is_wiphy_suspended)); hdd_ctx->is_wiphy_suspended = false; hdd_ctx->suspend_resume_stats.resumes++; @@ -1831,14 +1831,15 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, if (hdd_ctx->enable_dp_rx_threads) dp_txrx_suspend(cds_get_context(QDF_MODULE_ID_SOC)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_SUSPEND_WLAN, + NO_SESSION, hdd_ctx->is_wiphy_suspended); + if (hdd_suspend_wlan() < 0) { hdd_err("Failed to suspend WLAN"); goto resume_dp_thread; } - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_SUSPEND_WLAN, - NO_SESSION, hdd_ctx->is_wiphy_suspended)); hdd_ctx->is_wiphy_suspended = true; pld_request_bus_bandwidth(hdd_ctx->parent_dev, PLD_BUS_WIDTH_NONE); @@ -1957,9 +1958,9 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy, if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_SET_POWER_MGMT, - adapter->session_id, timeout)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_SET_POWER_MGMT, + adapter->session_id, timeout); hdd_ctx = WLAN_HDD_GET_CTX(adapter); status = wlan_hdd_validate_context(hdd_ctx); @@ -2028,9 +2029,9 @@ static int __wlan_hdd_cfg80211_set_txpower(struct wiphy *wiphy, return -EINVAL; } - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_SET_TXPOWER, - NO_SESSION, type)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_SET_TXPOWER, + NO_SESSION, type); errno = wlan_hdd_validate_context(hdd_ctx); if (errno) @@ -2175,9 +2176,9 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy, return 0; } - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_GET_TXPOWER, - adapter->session_id, adapter->device_mode)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_GET_TXPOWER, + adapter->session_id, adapter->device_mode); wlan_hdd_get_tx_power(adapter, dbm); hdd_debug("power: %d", *dbm); diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 7dade2ba874a..6cecd2f344f5 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -487,9 +487,9 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, if (0 != status) return status; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_SCAN, - adapter->session_id, request->n_channels)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_SCAN, + adapter->session_id, request->n_channels); if (!sme_is_session_id_valid(hdd_ctx->mac_handle, adapter->session_id)) return -EINVAL; diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index b673066435ac..f45ef954b7c1 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -4382,7 +4382,6 @@ static int wlan_hdd_get_sta_stats(struct wiphy *wiphy, uint8_t tx_mcs_index, rx_mcs_index; struct hdd_context *hdd_ctx = (struct hdd_context *) wiphy_priv(wiphy); mac_handle_t mac_handle; - uint16_t maxRate = 0; int8_t snr = 0; uint16_t my_tx_rate, my_rx_rate; uint8_t tx_nss = 1, rx_nss = 1; @@ -4392,6 +4391,10 @@ static int wlan_hdd_get_sta_stats(struct wiphy *wiphy, int link_speed_rssi_low = 0; uint32_t link_speed_rssi_report = 0; + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_GET_STA, + adapter->session_id, 0); + if (eConnectionState_Associated != sta_ctx->conn_info.connState) { hdd_debug("Not associated"); /*To keep GUI happy */ @@ -4564,10 +4567,6 @@ static int wlan_hdd_get_sta_stats(struct wiphy *wiphy, hdd_wlan_fill_per_chain_rssi_stats(sinfo, adapter); - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_GET_STA, - adapter->session_id, maxRate)); - hdd_exit(); return 0; diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index 305506a84cb6..f4713d2f4864 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2019 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 @@ -475,9 +475,9 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, if (wlan_hdd_validate_session_id(adapter->session_id)) return -EINVAL; - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_TDLS_MGMT, - adapter->session_id, action_code)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_TDLS_MGMT, + adapter->session_id, action_code); if (wlan_hdd_validate_context(hdd_ctx)) return -EINVAL; @@ -633,9 +633,10 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, return -ENOTSUPP; } - MTRACE(qdf_trace(QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_TDLS_OPER, - adapter->session_id, oper)); + qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, + TRACE_CODE_HDD_CFG80211_TDLS_OPER, + adapter->session_id, oper); + if (NULL == peer) { hdd_err("Invalid arguments"); return -EINVAL;