samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Move wakelock to psoc level

Browse Source 
Wakelock is system level lock not required to be taken
for every vdev, Hence move the wakelock to the psoc
hierarchy.

Change-Id: I525baf5f4b5dcadb493d84900dbd0a2e7c6407f6
CRs-Fixed: 2563406
This commit is contained in:
Arun Kumar Khandavalli
2019-11-22 17:16:18 +05:30
parent 614d1e4476
commit eaac8c195b
10 changed files with 239 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
target_if/mlme/vdev_mgr/inc/target_if_vdev_mgr_wake_lock.h
View File

@@ -1,104 +0,0 @@
/*
* Copyright (c) 2013-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
* above copyright notice and this permission notice appear in all
* copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
* WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
* AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
/**
* DOC: target_if_vdev_mgr_wake_lock.h
*
* This file provides declaration for wakelock APIs
*/
#ifndef __TARGET_IF_VDEV_MGR_WAKE_LOCK_H__
#define __TARGET_IF_VDEV_MGR_WAKE_LOCK_H__
enum wakelock_mode {
START_WAKELOCK,
STOP_WAKELOCK,
DELETE_WAKELOCK
};
#ifdef FEATURE_VDEV_RSP_WAKELOCK
/**
* target_if_wake_lock_init() - API to initialize
wakelocks:start,
stop and delete.
* @vdev: pointer to vdev
*
* This also initialize the runtime lock
*
* Return: None
*/
void target_if_wake_lock_init(struct wlan_objmgr_vdev *vdev);
/**
* target_if_wake_lock_deinit() - API to destroy
wakelocks:start, stop and delete.
* @vdev: pointer to vdev
*
* This also destroy the runtime lock
*
* Return: None
*/
void target_if_wake_lock_deinit(struct wlan_objmgr_vdev *vdev);
/**
* target_if_start_wake_lock_timeout_acquire() - acquire the
vdev start wakelock
* @vdev: pointer to vdev
*
* This also acquires the target_if runtime pm lock.
*
* Return: Success/Failure
*/
QDF_STATUS target_if_wake_lock_timeout_acquire(struct wlan_objmgr_vdev *vdev,
enum wakelock_mode mode);
/**
* target_if_start_wake_lock_timeout_release() - release the
start wakelock
* @vdev: pointer to vdev
*
* This also release the target_if runtime pm lock.
*
* Return: Success/Failure
*/
QDF_STATUS target_if_wake_lock_timeout_release(struct wlan_objmgr_vdev *vdev,
enum wakelock_mode mode);
#else
static inline void target_if_wake_lock_init(struct wlan_objmgr_vdev *vdev)
{
}
static inline void target_if_wake_lock_deinit(struct wlan_objmgr_vdev *vdev)
{
}
static inline QDF_STATUS target_if_wake_lock_timeout_acquire(
struct wlan_objmgr_vdev *vdev,
enum wakelock_mode mode)
{
return QDF_STATUS_SUCCESS;
}
static inline QDF_STATUS target_if_wake_lock_timeout_release(
struct wlan_objmgr_vdev *vdev,
enum wakelock_mode mode)
{
return QDF_STATUS_SUCCESS;
}
#endif
#endif

38
target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_tx_ops.c
View File

@@ -28,7 +28,6 @@
#include <init_deinit_lmac.h>
#include <target_if_vdev_mgr_tx_ops.h>
#include <target_if_vdev_mgr_rx_ops.h>
#include <target_if_vdev_mgr_wake_lock.h>
#include <target_if.h>
#include <target_type.h>
#include <wlan_mlme_dbg.h>
@@ -38,6 +37,7 @@
#include <wmi_unified_vdev_api.h>
#include <cdp_txrx_ctrl.h>
#include <target_if_psoc_timer_tx_ops.h>
#include <target_if_psoc_wake_lock.h>
static QDF_STATUS target_if_vdev_mgr_register_event_handler(
struct wlan_objmgr_psoc *psoc)
@@ -444,7 +444,7 @@ static QDF_STATUS target_if_vdev_mgr_start_send(
}
vdev_rsp->expire_time = START_RESPONSE_TIMER;
target_if_wake_lock_timeout_acquire(vdev, START_WAKELOCK);
target_if_wake_lock_timeout_acquire(psoc, START_WAKELOCK);
if (param->is_restart)
target_if_vdev_mgr_rsp_timer_start(psoc, vdev_rsp,
@@ -457,7 +457,7 @@ static QDF_STATUS target_if_vdev_mgr_start_send(
if (QDF_IS_STATUS_ERROR(status)) {
vdev_rsp->timer_status = QDF_STATUS_E_CANCELED;
vdev_rsp->expire_time = 0;
target_if_wake_lock_timeout_release(vdev, START_WAKELOCK);
target_if_wake_lock_timeout_release(psoc, START_WAKELOCK);
if (param->is_restart)
target_if_vdev_mgr_rsp_timer_stop(psoc, vdev_rsp,
RESTART_RESPONSE_BIT);
@@ -478,7 +478,7 @@ static QDF_STATUS target_if_vdev_mgr_delete_response_send(
rsp.vdev_id = wlan_vdev_get_id(vdev);
status = rx_ops->vdev_mgr_delete_response(psoc, &rsp);
target_if_wake_lock_timeout_release(vdev, DELETE_WAKELOCK);
target_if_wake_lock_timeout_release(psoc, DELETE_WAKELOCK);
return status;
}
@@ -521,10 +521,10 @@ static QDF_STATUS target_if_vdev_mgr_delete_send(
return QDF_STATUS_E_INVAL;
}
target_if_wake_lock_timeout_acquire(vdev, DELETE_WAKELOCK);
vdev_rsp->expire_time = DELETE_RESPONSE_TIMER;
target_if_vdev_mgr_rsp_timer_start(psoc, vdev_rsp,
DELETE_RESPONSE_BIT);
target_if_wake_lock_timeout_acquire(psoc, DELETE_WAKELOCK);
status = wmi_unified_vdev_delete_send(wmi_handle, param->vdev_id);
if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -540,11 +540,11 @@ static QDF_STATUS target_if_vdev_mgr_delete_send(
target_if_vdev_mgr_delete_response_send(vdev, rx_ops);
}
} else {
target_if_wake_lock_timeout_release(vdev, DELETE_WAKELOCK);
vdev_rsp->expire_time = 0;
vdev_rsp->timer_status = QDF_STATUS_E_CANCELED;
target_if_vdev_mgr_rsp_timer_stop(psoc, vdev_rsp,
DELETE_RESPONSE_BIT);
target_if_wake_lock_timeout_release(psoc, DELETE_WAKELOCK);
}
return status;
}
@@ -588,17 +588,17 @@ static QDF_STATUS target_if_vdev_mgr_stop_send(
return QDF_STATUS_E_INVAL;
}
target_if_wake_lock_timeout_acquire(vdev, STOP_WAKELOCK);
vdev_rsp->expire_time = STOP_RESPONSE_TIMER;
target_if_vdev_mgr_rsp_timer_start(psoc, vdev_rsp, STOP_RESPONSE_BIT);
target_if_wake_lock_timeout_acquire(psoc, STOP_WAKELOCK);
status = wmi_unified_vdev_stop_send(wmi_handle, param->vdev_id);
if (QDF_IS_STATUS_ERROR(status)) {
vdev_rsp->expire_time = 0;
vdev_rsp->timer_status = QDF_STATUS_E_CANCELED;
target_if_wake_lock_timeout_release(vdev, STOP_WAKELOCK);
target_if_vdev_mgr_rsp_timer_stop(psoc, vdev_rsp,
STOP_RESPONSE_BIT);
target_if_wake_lock_timeout_release(psoc, STOP_WAKELOCK);
}
return status;
}
@@ -609,6 +609,7 @@ static QDF_STATUS target_if_vdev_mgr_down_send(
{
QDF_STATUS status;
struct wmi_unified *wmi_handle;
struct wlan_objmgr_psoc *psoc;
if (!vdev || !param) {
mlme_err("Invalid input");
@@ -621,8 +622,14 @@ static QDF_STATUS target_if_vdev_mgr_down_send(
return QDF_STATUS_E_INVAL;
}
psoc = wlan_vdev_get_psoc(vdev);
if (!psoc) {
mlme_err("Failed to get PSOC Object");
return QDF_STATUS_E_INVAL;
}
status = wmi_unified_vdev_down_send(wmi_handle, param->vdev_id);
target_if_wake_lock_timeout_release(vdev, START_WAKELOCK);
target_if_wake_lock_timeout_release(psoc, START_WAKELOCK);
return status;
}
@@ -636,6 +643,7 @@ static QDF_STATUS target_if_vdev_mgr_up_send(
struct vdev_set_params sparam = {0};
uint8_t bssid[QDF_MAC_ADDR_SIZE];
uint8_t vdev_id;
struct wlan_objmgr_psoc *psoc;
if (!vdev || !param) {
mlme_err("Invalid input");
@@ -648,6 +656,12 @@ static QDF_STATUS target_if_vdev_mgr_up_send(
return QDF_STATUS_E_INVAL;
}
psoc = wlan_vdev_get_psoc(vdev);
if (!psoc) {
mlme_err("Failed to get PSOC Object");
return QDF_STATUS_E_INVAL;
}
vdev_id = wlan_vdev_get_id(vdev);
sparam.vdev_id = vdev_id;
@@ -661,7 +675,7 @@ static QDF_STATUS target_if_vdev_mgr_up_send(
ucfg_wlan_vdev_mgr_get_param_bssid(vdev, bssid);
status = wmi_unified_vdev_up_send(wmi_handle, bssid, param);
target_if_wake_lock_timeout_release(vdev, START_WAKELOCK);
target_if_wake_lock_timeout_release(psoc, START_WAKELOCK);
return status;
}
@@ -1174,5 +1188,9 @@ target_if_vdev_mgr_register_tx_ops(struct wlan_lmac_if_tx_ops *tx_ops)
target_if_psoc_vdev_rsp_timer_deinit;
mlme_tx_ops->psoc_vdev_rsp_timer_inuse =
target_if_psoc_vdev_rsp_timer_inuse;
mlme_tx_ops->psoc_wake_lock_init =
target_if_wake_lock_init;
mlme_tx_ops->psoc_wake_lock_deinit =
target_if_wake_lock_deinit;
return QDF_STATUS_SUCCESS;
}

199
target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_wake_lock.c
View File

@@ -1,199 +0,0 @@
/*
* Copyright (c) 2013-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
* above copyright notice and this permission notice appear in all
* copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
* WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
* AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
/**
* DOC: target_if_vdev_mgr_wake_lock.c
*
* This file provide definition for APIs related to wake lock
*/
#include "wlan_objmgr_vdev_obj.h"
#include "include/wlan_vdev_mlme.h"
#include "qdf_lock.h"
#include "target_if_vdev_mgr_wake_lock.h"
#include "wlan_lmac_if_def.h"
#include "host_diag_core_event.h"
#include <wlan_objmgr_vdev_obj.h>
#include <wlan_objmgr_pdev_obj.h>
#include <target_if.h>
#include "target_if_vdev_mgr_rx_ops.h"
void target_if_wake_lock_init(struct wlan_objmgr_vdev *vdev)
{
struct vdev_mlme_wakelock *vdev_wakelock;
struct wlan_objmgr_psoc *psoc;
struct wlan_lmac_if_mlme_rx_ops *rx_ops;
if (!vdev) {
target_if_err(" VDEV is NULL");
return;
}
psoc = wlan_vdev_get_psoc(vdev);
if (!psoc) {
target_if_err("PSOC is NULL");
return;
}
rx_ops = target_if_vdev_mgr_get_rx_ops(psoc);
if (!rx_ops || !rx_ops->vdev_mgr_get_wakelock_info) {
target_if_err("No Rx Ops");
return;
}
vdev_wakelock = rx_ops->vdev_mgr_get_wakelock_info(vdev);
qdf_wake_lock_create(&vdev_wakelock->start_wakelock, "vdev_start");
qdf_wake_lock_create(&vdev_wakelock->stop_wakelock, "vdev_stop");
qdf_wake_lock_create(&vdev_wakelock->delete_wakelock, "vdev_delete");
qdf_runtime_lock_init(&vdev_wakelock->wmi_cmd_rsp_runtime_lock);
}
void target_if_wake_lock_deinit(struct wlan_objmgr_vdev *vdev)
{
struct vdev_mlme_wakelock *vdev_wakelock;
struct wlan_objmgr_psoc *psoc;
struct wlan_lmac_if_mlme_rx_ops *rx_ops;
if (!vdev) {
target_if_err(" VDEV is NULL");
return;
}
psoc = wlan_vdev_get_psoc(vdev);
if (!psoc) {
target_if_err("PSOC is NULL");
return;
}
rx_ops = target_if_vdev_mgr_get_rx_ops(psoc);
if (!rx_ops || !rx_ops->vdev_mgr_get_wakelock_info) {
target_if_err("No Rx Ops");
return;
}
vdev_wakelock = rx_ops->vdev_mgr_get_wakelock_info(vdev);
qdf_wake_lock_destroy(&vdev_wakelock->start_wakelock);
qdf_wake_lock_destroy(&vdev_wakelock->stop_wakelock);
qdf_wake_lock_destroy(&vdev_wakelock->delete_wakelock);
qdf_runtime_lock_deinit(&vdev_wakelock->wmi_cmd_rsp_runtime_lock);
}
QDF_STATUS target_if_wake_lock_timeout_acquire(
struct wlan_objmgr_vdev *vdev,
enum wakelock_mode mode)
{
struct vdev_mlme_wakelock *vdev_wakelock;
struct wlan_objmgr_psoc *psoc;
struct wlan_lmac_if_mlme_rx_ops *rx_ops;
if (!vdev) {
target_if_err(" VDEV is NULL");
return QDF_STATUS_E_FAILURE;
}
psoc = wlan_vdev_get_psoc(vdev);
if (!psoc) {
target_if_err("PSOC is NULL");
return QDF_STATUS_E_FAILURE;
}
rx_ops = target_if_vdev_mgr_get_rx_ops(psoc);
if (!rx_ops || !rx_ops->vdev_mgr_get_wakelock_info) {
target_if_err("No Rx Ops");
return QDF_STATUS_E_FAILURE;
}
vdev_wakelock = rx_ops->vdev_mgr_get_wakelock_info(vdev);
switch (mode) {
case START_WAKELOCK:
qdf_wake_lock_timeout_acquire(&vdev_wakelock->start_wakelock,
START_RESPONSE_TIMER);
break;
case STOP_WAKELOCK:
qdf_wake_lock_timeout_acquire(&vdev_wakelock->stop_wakelock,
STOP_RESPONSE_TIMER);
break;
case DELETE_WAKELOCK:
qdf_wake_lock_timeout_acquire(&vdev_wakelock->delete_wakelock,
DELETE_RESPONSE_TIMER);
break;
default:
target_if_err("operation mode is invalid");
return QDF_STATUS_E_FAILURE;
}
qdf_runtime_pm_prevent_suspend(
&vdev_wakelock->wmi_cmd_rsp_runtime_lock);
return QDF_STATUS_SUCCESS;
}
QDF_STATUS target_if_wake_lock_timeout_release(
struct wlan_objmgr_vdev *vdev,
enum wakelock_mode mode)
{
struct vdev_mlme_wakelock *vdev_wakelock;
struct wlan_objmgr_psoc *psoc;
struct wlan_lmac_if_mlme_rx_ops *rx_ops;
if (!vdev) {
target_if_err(" VDEV is NULL");
return QDF_STATUS_E_FAILURE;
}
psoc = wlan_vdev_get_psoc(vdev);
if (!psoc) {
target_if_err("PSOC is NULL");
return QDF_STATUS_E_FAILURE;
}
rx_ops = target_if_vdev_mgr_get_rx_ops(psoc);
if (!rx_ops || !rx_ops->vdev_mgr_get_wakelock_info) {
target_if_err("No Rx Ops");
return QDF_STATUS_E_FAILURE;
}
vdev_wakelock = rx_ops->vdev_mgr_get_wakelock_info(vdev);
switch (mode) {
case START_WAKELOCK:
qdf_wake_lock_release(&vdev_wakelock->start_wakelock,
WIFI_POWER_EVENT_WAKELOCK_WMI_CMD_RSP);
break;
case STOP_WAKELOCK:
qdf_wake_lock_release(&vdev_wakelock->stop_wakelock,
WIFI_POWER_EVENT_WAKELOCK_WMI_CMD_RSP);
break;
case DELETE_WAKELOCK:
qdf_wake_lock_release(&vdev_wakelock->delete_wakelock,
WIFI_POWER_EVENT_WAKELOCK_WMI_CMD_RSP);
break;
default:
target_if_err("operation mode is invalid");
return QDF_STATUS_E_FAILURE;
}
qdf_runtime_pm_allow_suspend(&vdev_wakelock->wmi_cmd_rsp_runtime_lock);
return QDF_STATUS_SUCCESS;
}