samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Garpu 0
Kode Masalah Tarik Permintaan Actions Packages Projects Rilis Wiki Kegiatan

qcacld-3.0: cleanup NAN/NDP logging

Telusuri Sumber 
Few NAN/NDP logs are redundant in the current logging infra.
Optimize the same and add few necessary logs.

Change-Id: Ie261db317af48955a16269539948ff1596c4bbcb
CRs-Fixed: 2644418
This commit is contained in:
Srinivas Dasari
2020-03-16 18:33:29 +05:30
committed by nshrivas
orang tua ad569a7582
melakukan 5ab63299b9
5 mengubah file dengan 36 tambahan dan 99 penghapusan
Download Patch File Download Diff File Expand all files Collapse all files

4
components/nan/core/src/nan_main.c
Melihat File

@@ -87,8 +87,8 @@ QDF_STATUS nan_set_discovery_state(struct wlan_objmgr_psoc *psoc,
qdf_spin_unlock_bh(&psoc_priv->lock);
nan_info("NAN State transitioned from %d -> %d", cur_state,
psoc_priv->disc_state);
nan_debug("NAN State transitioned from %d -> %d", cur_state,
psoc_priv->disc_state);
return status;
}

17
components/nan/dispatcher/src/nan_ucfg_api.c
Melihat File

@@ -443,7 +443,7 @@ QDF_STATUS ucfg_nan_req_processor(struct wlan_objmgr_vdev *vdev,
nan_debug("Wait for NDP END indication");
err = osif_request_wait_for_response(request);
if (err)
nan_err("NAN request timed out: %d", err);
nan_debug("NAN request timed out: %d", err);
osif_request_put(request);
psoc_obj->request_context = NULL;
}
@@ -471,11 +471,11 @@ static void ucfg_nan_request_process_cb(void *cookie)
request = osif_request_get(cookie);
if (request) {
nan_debug("request (cookie:0x%pK) completed", cookie);
osif_request_complete(request);
osif_request_put(request);
} else {
nan_err("Obsolete request (cookie:0x%pK), do nothing", cookie);
nan_debug("Obsolete request (cookie:0x%pK), do nothing",
cookie);
}
}
@@ -739,7 +739,6 @@ QDF_STATUS ucfg_nan_discovery_req(void *in_req, uint32_t req_type)
psoc_priv->is_explicit_disable = true;
post_msg:
nan_debug("posting request: %u", req_type);
status = scheduler_post_message(QDF_MODULE_ID_NAN,
QDF_MODULE_ID_NAN,
QDF_MODULE_ID_OS_IF, &msg);
@@ -752,11 +751,8 @@ post_msg:
if (req_type != NAN_GENERIC_REQ) {
err = osif_request_wait_for_response(request);
if (err)
nan_err("NAN request: %u timed out: %d",
req_type, err);
else
nan_debug("NAN request: %u serviced successfully",
req_type);
nan_debug("NAN request: %u timed out: %d",
req_type, err);
if (req_type == NAN_DISABLE_REQ)
psoc_priv->is_explicit_disable = false;
@@ -1121,13 +1117,12 @@ QDF_STATUS ucfg_disable_nan_discovery(struct wlan_objmgr_psoc *psoc,
qdf_mem_copy(nan_req->params.request_data, data, data_len);
}
nan_debug("sending NAN Disable Req");
status = ucfg_nan_discovery_req(nan_req, NAN_DISABLE_REQ);
if (QDF_IS_STATUS_SUCCESS(status))
nan_debug("Successfully sent NAN Disable request");
else
nan_err("Unable to send NAN Disable request: %u", status);
nan_debug("Unable to send NAN Disable request: %u", status);
qdf_mem_free(nan_req);
return status;

23
core/hdd/src/wlan_hdd_nan_datapath.c
Melihat File

@@ -356,16 +356,16 @@ void hdd_ndp_event_handler(struct hdd_adapter *adapter,
case eCSR_ROAM_RESULT_NDI_CREATE_RSP:
success = (roam_info->ndp.ndi_create_params.status ==
NAN_DATAPATH_RSP_STATUS_SUCCESS);
hdd_debug("posting ndi create status: %d to umac",
success);
hdd_debug("posting ndi create status: %d (%s) to umac",
success, success ? "Success" : "Failure");
os_if_nan_post_ndi_create_rsp(psoc, adapter->vdev_id,
success);
return;
case eCSR_ROAM_RESULT_NDI_DELETE_RSP:
success = (roam_info->ndp.ndi_create_params.status ==
NAN_DATAPATH_RSP_STATUS_SUCCESS);
hdd_debug("posting ndi delete status: %d to umac",
success);
hdd_debug("posting ndi delete status: %d (%s) to umac",
success, success ? "Success" : "Failure");
os_if_nan_post_ndi_delete_rsp(psoc, adapter->vdev_id,
success);
return;
@@ -396,8 +396,6 @@ static int __wlan_hdd_cfg80211_process_ndp_cmd(struct wiphy *wiphy,
int ret_val;
struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
hdd_enter();
ret_val = wlan_hdd_validate_context(hdd_ctx);
if (ret_val)
return ret_val;
@@ -837,8 +835,6 @@ int hdd_ndp_new_peer_handler(uint8_t vdev_id, uint16_t sta_id,
struct bss_description tmp_bss_descp = {0};
struct csr_roam_info *roam_info;
hdd_enter();
hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
if (!hdd_ctx) {
hdd_err("hdd_ctx is null");
@@ -875,7 +871,7 @@ int hdd_ndp_new_peer_handler(uint8_t vdev_id, uint16_t sta_id,
/* perform following steps for first new peer ind */
if (fist_peer) {
hdd_info("Set ctx connection state to connected");
hdd_debug("Set ctx connection state to connected");
hdd_bus_bw_compute_prev_txrx_stats(adapter);
hdd_bus_bw_compute_timer_start(hdd_ctx);
sta_ctx->conn_info.conn_state = eConnectionState_NdiConnected;
@@ -884,7 +880,6 @@ int hdd_ndp_new_peer_handler(uint8_t vdev_id, uint16_t sta_id,
WLAN_WAKE_ALL_NETIF_QUEUE, WLAN_CONTROL_PATH);
}
qdf_mem_free(roam_info);
hdd_exit();
return 0;
}
@@ -900,7 +895,7 @@ void hdd_cleanup_ndi(struct hdd_context *hdd_ctx,
sta_ctx->conn_info.conn_state = eConnectionState_NdiDisconnected;
hdd_conn_set_connection_state(adapter,
eConnectionState_NdiDisconnected);
hdd_info("Stop netif tx queues.");
hdd_debug("Stop netif tx queues.");
wlan_hdd_netif_queue_control(adapter, WLAN_STOP_ALL_NETIF_QUEUE,
WLAN_CONTROL_PATH);
hdd_bus_bw_compute_reset_prev_txrx_stats(adapter);
@@ -921,8 +916,6 @@ void hdd_ndp_peer_departed_handler(uint8_t vdev_id, uint16_t sta_id,
struct hdd_adapter *adapter;
struct hdd_station_ctx *sta_ctx;
hdd_enter();
hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
if (!hdd_ctx) {
hdd_err("hdd_ctx is null");
@@ -945,9 +938,7 @@ void hdd_ndp_peer_departed_handler(uint8_t vdev_id, uint16_t sta_id,
hdd_delete_peer(sta_ctx, peer_mac_addr);
if (last_peer) {
hdd_info("No more ndp peers.");
hdd_debug("No more ndp peers.");
hdd_cleanup_ndi(hdd_ctx, adapter);
}
hdd_exit();
}

10
core/mac/src/pe/nan/nan_datapath.c
Melihat File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
* Copyright (c) 2016-2020 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
@@ -199,10 +199,10 @@ static void lim_ndp_delete_peers(struct mac_context *mac_ctx,
return;
for (i = 0; i < num_peers; i++) {
pe_info("ndp_map[%d]: MAC: " QDF_MAC_ADDR_STR " num_active %d",
i,
QDF_MAC_ADDR_ARRAY(ndp_map[i].peer_ndi_mac_addr.bytes),
ndp_map[i].num_active_ndp_sessions);
pe_debug("ndp_map[%d]: MAC: " QDF_MAC_ADDR_STR " num_active %d",
i,
QDF_MAC_ADDR_ARRAY(ndp_map[i].peer_ndi_mac_addr.bytes),
ndp_map[i].num_active_ndp_sessions);
/* Do not delete a peer with active NDPs */
if (ndp_map[i].num_active_ndp_sessions > 0)

81
os_if/nan/src/os_if_nan.c
Melihat File

@@ -439,7 +439,7 @@ static int __os_if_nan_process_ndi_delete(struct wlan_objmgr_psoc *psoc,
nan_vdev = os_if_get_ndi_vdev_by_ifname(psoc, iface_name);
if (!nan_vdev) {
osif_err("Nan datapath interface is not present");
osif_debug("Nan datapath interface is not present");
return -EINVAL;
}
@@ -693,8 +693,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);
}
osif_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,
@@ -704,12 +702,6 @@ static int __os_if_nan_process_ndp_initiator_req(struct wlan_objmgr_psoc *psoc,
goto initiator_req_failed;
}
osif_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);
@@ -881,9 +873,9 @@ static int __os_if_nan_process_ndp_responder_req(struct wlan_objmgr_psoc *psoc,
}
osif_debug("ipv6 addr present: %d, addr: %pI6",
req.is_ipv6_addr_present, req.ipv6_addr);
osif_debug("port %d, present: %d", req.port, req.is_port_present);
osif_debug("protocol %d, present: %d",
req.protocol, req.is_protocol_present);
osif_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)) {
@@ -1058,14 +1050,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]);
osif_err("Transaction Id: %d NDPCmd: %d iface_name: %s",
transaction_id, ndp_cmd_type, iface_name);
osif_debug("Transaction Id: %u NDPCmd: %u iface_name: %s",
transaction_id, ndp_cmd_type, iface_name);
} else {
osif_err("Transaction Id: %d NDPCmd: %d iface_name: unspecified",
transaction_id, ndp_cmd_type);
osif_debug("Transaction Id: %u NDPCmd: %u iface_name: unspecified",
transaction_id, ndp_cmd_type);
}
osif_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);
@@ -1227,9 +1218,6 @@ static void os_if_ndp_responder_rsp_handler(struct wlan_objmgr_vdev *vdev,
return;
}
osif_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,
@@ -1434,8 +1422,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;
}
osif_debug("ipv6 addr present: %d, addr: %pI6",
event->is_ipv6_addr_present, event->ipv6_addr);
cfg80211_vendor_event(vendor_event, GFP_ATOMIC);
return;
@@ -1498,7 +1484,6 @@ static QDF_STATUS os_if_ndp_confirm_pack_ch_info(struct sk_buff *event,
int idx = 0;
struct nlattr *ch_array, *ch_element;
osif_debug("num_ch: %d", ndp_confirm->num_channels);
if (!ndp_confirm->num_channels)
return QDF_STATUS_SUCCESS;
@@ -1507,10 +1492,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++) {
osif_debug("Freq[%d]: freq: %d, width: %d, nss: %d",
idx, ndp_confirm->ch[idx].freq,
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;
@@ -1646,13 +1627,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;
osif_debug("ipv6 addr present: %d, addr: %pI6",
ndp_confirm->is_ipv6_addr_present,
ndp_confirm->ipv6_addr);
osif_debug("port %d, present: %d",
ndp_confirm->port, ndp_confirm->is_port_present);
osif_debug("protocol %d, present: %d",
ndp_confirm->protocol, ndp_confirm->is_protocol_present);
cfg80211_vendor_event(vendor_event, GFP_ATOMIC);
osif_debug("NDP confim sent, ndp instance id: %d, peer addr: %pM rsp_code: %d, reason_code: %d",
@@ -1660,10 +1634,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);
osif_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:
osif_err("nla_put api failed");
@@ -1739,7 +1709,7 @@ static void os_if_ndp_end_rsp_handler(struct wlan_objmgr_vdev *vdev,
rsp->transaction_id))
goto ndp_end_rsp_nla_failed;
osif_debug("NDP End rsp sent, transaction id: %d, status: %d, reason: %d",
osif_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;
@@ -1867,7 +1837,7 @@ static void os_if_new_peer_ind_handler(struct wlan_objmgr_vdev *vdev,
active_peers++;
ucfg_nan_set_active_peers(vdev, active_peers);
osif_debug("vdev_id: %d, num_peers: %d", vdev_id, active_peers);
osif_debug("num_peers: %d", active_peers);
}
/**
@@ -1965,7 +1935,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 {
osif_err("Invalid ndi create response");
osif_debug("Invalid ndi create response");
create_fail = true;
}
@@ -2013,18 +1983,8 @@ static void os_if_ndp_iface_create_rsp_handler(struct wlan_objmgr_psoc *psoc,
goto nla_put_failure;
}
osif_debug("sub command: %d, value: %d",
QCA_NL80211_VENDOR_SUBCMD_NDP,
QCA_WLAN_VENDOR_ATTR_NDP_INTERFACE_CREATE);
osif_debug("create transaction id: %d, value: %d",
QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID,
create_transaction_id);
osif_debug("status code: %d, value: %d",
QCA_WLAN_VENDOR_ATTR_NDP_DRV_RESPONSE_STATUS_TYPE,
create_status);
osif_debug("Return value: %d, value: %d",
QCA_WLAN_VENDOR_ATTR_NDP_DRV_RETURN_VALUE,
create_reason);
osif_debug("transaction id: %u status code: %u Reason: %u",
create_transaction_id, create_status, create_reason);
cfg80211_vendor_event(vendor_event, GFP_KERNEL);
@@ -2461,17 +2421,9 @@ void os_if_nan_ndi_session_end(struct wlan_objmgr_vdev *vdev)
goto failure;
}
osif_debug("sub command: %d, value: %d",
QCA_WLAN_VENDOR_ATTR_NDP_SUBCMD,
QCA_WLAN_VENDOR_ATTR_NDP_INTERFACE_DELETE);
osif_debug("delete transaction id: %d, value: %d",
QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID,
ucfg_nan_get_ndp_delete_transaction_id(vdev));
osif_debug("status code: %d, value: %d",
QCA_WLAN_VENDOR_ATTR_NDP_DRV_RESPONSE_STATUS_TYPE,
ucfg_nan_get_ndi_delete_rsp_status(vdev));
osif_debug("Return value: %d, value: %d",
QCA_WLAN_VENDOR_ATTR_NDP_DRV_RETURN_VALUE,
osif_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);
@@ -2559,7 +2511,6 @@ static int os_if_nan_generic_req(struct wlan_objmgr_psoc *psoc,
nla_memcpy(nan_req->params.request_data,
tb[QCA_WLAN_VENDOR_ATTR_NAN_CMD_DATA], buf_len);
osif_debug("sending NAN Req");
status = ucfg_nan_discovery_req(nan_req, NAN_GENERIC_REQ);
if (QDF_IS_STATUS_SUCCESS(status))