From 01cfa4e8594c085a8b88f51d1c62b739136bfbed Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Sun, 4 Sep 2016 15:10:49 +0530 Subject: [PATCH] qcacld-3.0: Remove ani_global.h from qca-cmn Currently ani_global.h is included in qca-cmn, The change removes ani_global.h and there are corresponding changes in Driver Change-Id: I59684e475406386e250635bde88390797835c95f CRs-Fixed: 1012452 --- core/cds/inc/cds_utils.h | 10 ++++++++++ core/hdd/src/wlan_hdd_hostapd.c | 6 ++++-- core/hdd/src/wlan_hdd_main.c | 3 ++- core/hdd/src/wlan_hdd_softap_tx_rx.c | 6 ++++-- core/hdd/src/wlan_hdd_tx_rx.c | 6 ++++-- core/wma/src/wma_dev_if.c | 10 +++++++--- core/wma/src/wma_features.c | 19 +++++++++++++------ core/wma/src/wma_scan_roam.c | 18 ++++++++++++------ 8 files changed, 56 insertions(+), 22 deletions(-) diff --git a/core/cds/inc/cds_utils.h b/core/cds/inc/cds_utils.h index daaa1647c03e..16d856340699 100644 --- a/core/cds/inc/cds_utils.h +++ b/core/cds/inc/cds_utils.h @@ -44,6 +44,7 @@ #include #include #include +#include #include "ani_global.h" /*-------------------------------------------------------------------------- @@ -187,4 +188,13 @@ bool cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id, uint8_t cds_get_mmie_size(void); #endif /* WLAN_FEATURE_11W */ QDF_STATUS sme_send_flush_logs_cmd_to_fw(tpAniSirGlobal pMac); +static inline void cds_host_diag_log_work(qdf_wake_lock_t *lock, uint32_t msec, + uint32_t reason) { + if (((cds_get_ring_log_level(RING_ID_WAKELOCK) >= WLAN_LOG_LEVEL_ACTIVE) + && (WIFI_POWER_EVENT_WAKELOCK_HOLD_RX == reason)) || + (WIFI_POWER_EVENT_WAKELOCK_HOLD_RX != reason)) { + host_diag_log_wlock(reason, qdf_wake_lock_name(lock), + msec, WIFI_POWER_EVENT_WAKELOCK_TAKEN); + } +} #endif /* #if !defined __CDS_UTILS_H */ diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index c88fce1fad45..cfdaad7836ed 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -1521,9 +1521,11 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, #ifdef FEATURE_WLAN_AUTO_SHUTDOWN wlan_hdd_auto_shutdown_enable(pHddCtx, false); #endif + cds_host_diag_log_work(&pHddCtx->sap_wake_lock, + HDD_SAP_WAKE_LOCK_DURATION, + WIFI_POWER_EVENT_WAKELOCK_SAP); qdf_wake_lock_timeout_acquire(&pHddCtx->sap_wake_lock, - HDD_SAP_WAKE_LOCK_DURATION, - WIFI_POWER_EVENT_WAKELOCK_SAP); + HDD_SAP_WAKE_LOCK_DURATION); { struct station_info *sta_info; uint16_t iesLen = diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 8c785391a92e..f5a27fb7507a 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -4678,7 +4678,8 @@ void hdd_allow_suspend(uint32_t reason) void hdd_prevent_suspend_timeout(uint32_t timeout, uint32_t reason) { - qdf_wake_lock_timeout_acquire(&wlan_wake_lock, timeout, reason); + cds_host_diag_log_work(&wlan_wake_lock, timeout, reason); + qdf_wake_lock_timeout_acquire(&wlan_wake_lock, timeout); } /** diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index f893aab74863..1c8979bfa5ee 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -602,9 +602,11 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *context, qdf_nbuf_t rxBuf) skb->protocol = eth_type_trans(skb, skb->dev); #ifdef WLAN_FEATURE_HOLD_RX_WAKELOCK + cds_host_diag_log_work(&pHddCtx->rx_wake_lock, + HDD_WAKE_LOCK_DURATION, + WIFI_POWER_EVENT_WAKELOCK_HOLD_RX); qdf_wake_lock_timeout_acquire(&pHddCtx->rx_wake_lock, - HDD_WAKE_LOCK_DURATION, - WIFI_POWER_EVENT_WAKELOCK_HOLD_RX); + HDD_WAKE_LOCK_DURATION); #endif /* Remove SKB from internal tracking table before submitting diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index 53bfa38f9c4e..ac1257633d35 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -958,9 +958,11 @@ QDF_STATUS hdd_rx_packet_cbk(void *context, qdf_nbuf_t rxBuf) } #ifdef WLAN_FEATURE_HOLD_RX_WAKELOCK + cds_host_diag_log_work(&pHddCtx->rx_wake_lock, + HDD_WAKE_LOCK_DURATION, + WIFI_POWER_EVENT_WAKELOCK_HOLD_RX); qdf_wake_lock_timeout_acquire(&pHddCtx->rx_wake_lock, - HDD_WAKE_LOCK_DURATION, - WIFI_POWER_EVENT_WAKELOCK_HOLD_RX); + HDD_WAKE_LOCK_DURATION); #endif /* Remove SKB from internal tracking table before submitting diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 2af766ed6a4a..f2b2e752d98e 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -561,10 +561,12 @@ static QDF_STATUS wma_handle_vdev_detach(tp_wma_handle wma_handle, /* Acquire wake lock only when you expect a response from firmware */ if (WMI_SERVICE_IS_ENABLED(wma_handle->wmi_service_bitmap, WMI_SERVICE_SYNC_DELETE_CMDS)) { - qdf_wake_lock_timeout_acquire( - &wma_handle->wmi_cmd_rsp_wake_lock, + cds_host_diag_log_work(&wma_handle->wmi_cmd_rsp_wake_lock, WMA_FW_RSP_EVENT_WAKE_LOCK_DURATION, WIFI_POWER_EVENT_WAKELOCK_WMI_CMD_RSP); + qdf_wake_lock_timeout_acquire( + &wma_handle->wmi_cmd_rsp_wake_lock, + WMA_FW_RSP_EVENT_WAKE_LOCK_DURATION); qdf_runtime_pm_prevent_suspend( wma_handle->wmi_cmd_rsp_runtime_lock); } @@ -3971,9 +3973,11 @@ static void wma_delete_sta_req_ap_mode(tp_wma_handle wma, * Acquire wake lock and bus lock till * firmware sends the response */ - qdf_wake_lock_timeout_acquire(&wma->wmi_cmd_rsp_wake_lock, + cds_host_diag_log_work(&wma->wmi_cmd_rsp_wake_lock, WMA_FW_RSP_EVENT_WAKE_LOCK_DURATION, WIFI_POWER_EVENT_WAKELOCK_WMI_CMD_RSP); + qdf_wake_lock_timeout_acquire(&wma->wmi_cmd_rsp_wake_lock, + WMA_FW_RSP_EVENT_WAKE_LOCK_DURATION); qdf_runtime_pm_prevent_suspend(wma->wmi_cmd_rsp_runtime_lock); return; } diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 3e793abd11e8..73d5ca8ec961 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -3203,9 +3203,11 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, if (node) { WMA_LOGD("NLO match happened"); node->nlo_match_evt_received = true; - qdf_wake_lock_timeout_acquire(&wma->pno_wake_lock, + cds_host_diag_log_work(&wma->pno_wake_lock, WMA_PNO_MATCH_WAKE_LOCK_TIMEOUT, WIFI_POWER_EVENT_WAKELOCK_PNO); + qdf_wake_lock_timeout_acquire(&wma->pno_wake_lock, + WMA_PNO_MATCH_WAKE_LOCK_TIMEOUT); } break; @@ -3362,9 +3364,11 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, } if (wake_lock_duration) { + cds_host_diag_log_work(&wma->wow_wake_lock, + wake_lock_duration, + WIFI_POWER_EVENT_WAKELOCK_WOW); qdf_wake_lock_timeout_acquire(&wma->wow_wake_lock, - wake_lock_duration, - WIFI_POWER_EVENT_WAKELOCK_WOW); + wake_lock_duration); WMA_LOGA("Holding %d msec wake_lock", wake_lock_duration); } @@ -6571,10 +6575,13 @@ void wma_target_suspend_acknowledge(void *context, bool wow_nack) wma->wow_nack = wow_nack; qdf_event_set(&wma->target_suspend); - if (wow_nack) + if (wow_nack) { + cds_host_diag_log_work(&wma->wow_wake_lock, + WMA_WAKE_LOCK_TIMEOUT, + WIFI_POWER_EVENT_WAKELOCK_WOW); qdf_wake_lock_timeout_acquire(&wma->wow_wake_lock, - WMA_WAKE_LOCK_TIMEOUT, - WIFI_POWER_EVENT_WAKELOCK_WOW); + WMA_WAKE_LOCK_TIMEOUT); + } } /** diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 9de21c49a3ba..de791f3e982b 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -3371,9 +3371,11 @@ int wma_nlo_match_evt_handler(void *handle, uint8_t *event, if (node) node->nlo_match_evt_received = true; + cds_host_diag_log_work(&wma->pno_wake_lock, + WMA_PNO_MATCH_WAKE_LOCK_TIMEOUT, + WIFI_POWER_EVENT_WAKELOCK_PNO); qdf_wake_lock_timeout_acquire(&wma->pno_wake_lock, - WMA_PNO_MATCH_WAKE_LOCK_TIMEOUT, - WIFI_POWER_EVENT_WAKELOCK_PNO); + WMA_PNO_MATCH_WAKE_LOCK_TIMEOUT); return 0; } @@ -3424,9 +3426,11 @@ int wma_nlo_scan_cmp_evt_handler(void *handle, uint8_t *event, if (scan_event) { /* Posting scan completion msg would take scan cache result * from LIM module and update in scan cache maintained in SME.*/ + cds_host_diag_log_work(&wma->pno_wake_lock, + WMA_PNO_SCAN_COMPLETE_WAKE_LOCK_TIMEOUT, + WIFI_POWER_EVENT_WAKELOCK_PNO); qdf_wake_lock_timeout_acquire(&wma->pno_wake_lock, - WMA_PNO_SCAN_COMPLETE_WAKE_LOCK_TIMEOUT, - WIFI_POWER_EVENT_WAKELOCK_PNO); + WMA_PNO_SCAN_COMPLETE_WAKE_LOCK_TIMEOUT); qdf_mem_zero(scan_event, sizeof(tSirScanOffloadEvent)); scan_event->reasonCode = eSIR_PNO_SCAN_SUCCESS; scan_event->event = SIR_SCAN_EVENT_COMPLETED; @@ -3660,9 +3664,11 @@ int wma_extscan_operations_event_handler(void *handle, case WMI_EXTSCAN_CYCLE_STARTED_EVENT: WMA_LOGD("%s: received WMI_EXTSCAN_CYCLE_STARTED_EVENT", __func__); + cds_host_diag_log_work(&wma->extscan_wake_lock, + WMA_EXTSCAN_CYCLE_WAKE_LOCK_DURATION, + WIFI_POWER_EVENT_WAKELOCK_EXT_SCAN); qdf_wake_lock_timeout_acquire(&wma->extscan_wake_lock, - WMA_EXTSCAN_CYCLE_WAKE_LOCK_DURATION, - WIFI_POWER_EVENT_WAKELOCK_EXT_SCAN); + WMA_EXTSCAN_CYCLE_WAKE_LOCK_DURATION); oprn_ind->scanEventType = WIFI_EXTSCAN_CYCLE_STARTED_EVENT; oprn_ind->status = 0; oprn_ind->buckets_scanned = 0;