From 134bb1fe06c091006de665086e690d0d5799294f Mon Sep 17 00:00:00 2001 From: Pankaj Singh Date: Fri, 7 Feb 2020 10:59:00 +0530 Subject: [PATCH] qcacld-3.0: Reduce excessive logging in P2P module Currently there are lot of duplicate logging. Identify and reduce those logs that are not absolutely necessary. Change-Id: I649ce3bec8c3c8542fe9edd08907da9ab01fa948 CRs-Fixed: 2617504 --- .../p2p/core/src/wlan_p2p_off_chan_tx.c | 5 ++-- components/p2p/core/src/wlan_p2p_roc.c | 27 ++++++++----------- os_if/p2p/src/wlan_cfg80211_p2p.c | 10 +++---- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/components/p2p/core/src/wlan_p2p_off_chan_tx.c b/components/p2p/core/src/wlan_p2p_off_chan_tx.c index 3e1d01dcd65f..4edea17ae063 100644 --- a/components/p2p/core/src/wlan_p2p_off_chan_tx.c +++ b/components/p2p/core/src/wlan_p2p_off_chan_tx.c @@ -1032,9 +1032,8 @@ static QDF_STATUS p2p_mgmt_tx(struct tx_action_context *tx_ctx, tx_ota_comp_cb = tgt_p2p_mgmt_ota_comp_cb; } - p2p_debug("length:%d, vdev_id:%d, chanfreq:%d, no_ack:%d", - mgmt_param.frm_len, mgmt_param.vdev_id, - mgmt_param.chanfreq, tx_ctx->no_ack); + p2p_debug("length:%d, chanfreq:%d", mgmt_param.frm_len, + mgmt_param.chanfreq); tx_ctx->nbuf = packet; diff --git a/components/p2p/core/src/wlan_p2p_roc.c b/components/p2p/core/src/wlan_p2p_roc.c index 2250440b74eb..3d3b4a2b7497 100644 --- a/components/p2p/core/src/wlan_p2p_roc.c +++ b/components/p2p/core/src/wlan_p2p_roc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-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 @@ -135,8 +135,8 @@ static QDF_STATUS p2p_scan_start(struct p2p_roc_context *roc_ctx) if (req->scan_req.dwell_time_passive > P2P_MAX_ROC_DURATION) req->scan_req.dwell_time_passive = P2P_MAX_ROC_DURATION; } - p2p_debug("FW requested roc duration is:%d for chan: %d", - req->scan_req.dwell_time_passive, roc_ctx->chan); + p2p_debug("FW requested roc duration is:%d", + req->scan_req.dwell_time_passive); status = ucfg_scan_start(req); @@ -233,10 +233,8 @@ static QDF_STATUS p2p_send_roc_event( p2p_evt.chan = roc_ctx->chan; p2p_evt.duration = roc_ctx->duration; - p2p_debug("p2p soc_obj:%pK, roc_ctx:%pK, vdev_id:%d, roc_event:" - "%d, cookie:%llx, chan:%d, duration:%d", p2p_soc_obj, - roc_ctx, p2p_evt.vdev_id, p2p_evt.roc_event, - p2p_evt.cookie, p2p_evt.chan, p2p_evt.duration); + p2p_debug("roc_event: %d, cookie:%llx", p2p_evt.roc_event, + p2p_evt.cookie); start_param->event_cb(start_param->event_cb_data, &p2p_evt); @@ -259,8 +257,9 @@ static QDF_STATUS p2p_destroy_roc_ctx(struct p2p_roc_context *roc_ctx, QDF_STATUS status = QDF_STATUS_SUCCESS; struct p2p_soc_priv_obj *p2p_soc_obj = roc_ctx->p2p_soc_obj; - p2p_debug("p2p_soc_obj:%pK, roc_ctx:%pK, up_layer_event:%d, in_roc_queue:%d", - p2p_soc_obj, roc_ctx, up_layer_event, in_roc_queue); + p2p_debug("p2p_soc_obj:%pK, roc_ctx:%pK, up_layer_event:%d, in_roc_queue:%d vdev_id:%d chan:%d duration:%d", + p2p_soc_obj, roc_ctx, up_layer_event, in_roc_queue, + roc_ctx->vdev_id, roc_ctx->chan, roc_ctx->duration); if (up_layer_event) { if (roc_ctx->roc_state < ROC_STATE_ON_CHAN) @@ -463,8 +462,7 @@ static QDF_STATUS p2p_process_scan_start_evt( struct p2p_roc_context *roc_ctx) { roc_ctx->roc_state = ROC_STATE_STARTED; - p2p_debug("scan started, roc ctx:%pK, scan id:%d", - roc_ctx, roc_ctx->scan_id); + p2p_debug("scan started, scan id:%d", roc_ctx->scan_id); return QDF_STATUS_SUCCESS; } @@ -489,11 +487,8 @@ static QDF_STATUS p2p_process_ready_on_channel_evt( p2p_soc_obj = roc_ctx->p2p_soc_obj; roc_ctx->roc_state = ROC_STATE_ON_CHAN; - p2p_debug("p2p soc obj:%pK, roc ctx:%pK, vdev_id:%d, scan_id:%d, tx ctx:%pK, chan:%d, phy_mode:%d, duration:%d, roc_type:%d, roc_state:%d", - p2p_soc_obj, roc_ctx, roc_ctx->vdev_id, - roc_ctx->scan_id, roc_ctx->tx_ctx, roc_ctx->chan, - roc_ctx->phy_mode, roc_ctx->duration, - roc_ctx->roc_type, roc_ctx->roc_state); + p2p_debug("scan_id:%d, roc_state:%d", roc_ctx->scan_id, + roc_ctx->roc_state); status = qdf_mc_timer_start(&roc_ctx->roc_timer, (roc_ctx->duration + P2P_EVENT_PROPAGATE_TIME)); diff --git a/os_if/p2p/src/wlan_cfg80211_p2p.c b/os_if/p2p/src/wlan_cfg80211_p2p.c index 5a2ddfb4bbac..15ee29fd6f96 100644 --- a/os_if/p2p/src/wlan_cfg80211_p2p.c +++ b/os_if/p2p/src/wlan_cfg80211_p2p.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-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 @@ -83,8 +83,8 @@ static void wlan_p2p_rx_callback(void *user_data, goto fail; } - osif_debug("Indicate frame over nl80211, vdev id:%d, idx:%d", - rx_frame->vdev_id, wdev->netdev->ifindex); + osif_debug("Indicate frame over nl80211, idx:%d", + wdev->netdev->ifindex); #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)) cfg80211_rx_mgmt(wdev, rx_frame->rx_freq, rx_frame->rx_rssi * 100, @@ -121,10 +121,6 @@ static void wlan_p2p_action_tx_cnf_callback(void *user_data, struct wireless_dev *wdev; bool is_success; - osif_debug("user data:%pK, action cookie:%llx, buf:%pK, len:%d, tx status:%d", - user_data, tx_cnf->action_cookie, tx_cnf->buf, - tx_cnf->buf_len, tx_cnf->status); - psoc = user_data; if (!psoc) { osif_err("psoc is null");