A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 05:39:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Move DBS opportunistic timer out of HDD context

Browse source 
Move the DBS opportunistic timer out, from the HDD context
to the CDS context.

Change-Id: I57cb3010bc1ba4ce3736edc6c4c1f4c32f226144
CRs-Fixed: 970163
This commit is contained in:
Chandrasekaran, Manishekar 2016-02-01 14:24:17 +05:30 • committed by Vishwajith Upendra
commit 6639d325cb
4 changed files with 21 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/cds/inc/cds_sched.h
View file

@ -48,6 +48,7 @@
#include <cds_mq.h>
#include <qdf_types.h>
#include "qdf_lock.h"
#include "qdf_mc_timer.h"
#define TX_POST_EVENT_MASK 0x001
#define TX_SUSPEND_EVENT_MASK 0x002
@ -286,6 +287,7 @@ typedef struct _cds_context_type {
qdf_spinlock_t bug_report_lock;
qdf_event_t connection_update_done_evt;
qdf_mutex_t qdf_conc_list_lock;
qdf_mc_timer_t dbs_opportunistic_timer;
} cds_context_type, *p_cds_contextType;

33
core/cds/src/cds_concurrency.c
View file

@ -3687,15 +3687,8 @@ void cds_decr_session_set_pcl(enum tQDF_ADAPTER_MODE mode,
uint8_t session_id)
{
QDF_STATUS qdf_status;
hdd_context_t *hdd_ctx;
cds_context_type *cds_ctx;
hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
if (!hdd_ctx) {
cds_err("HDD context is NULL");
return;
}
cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
if (!cds_ctx) {
cds_err("Invalid CDS Context");
@ -3722,9 +3715,9 @@ void cds_decr_session_set_pcl(enum tQDF_ADAPTER_MODE mode,
/* do we need to change the HW mode */
if (cds_need_opportunistic_upgrade()) {
/* let's start the timer */
qdf_mc_timer_stop(&hdd_ctx->dbs_opportunistic_timer);
qdf_mc_timer_stop(&cds_ctx->dbs_opportunistic_timer);
qdf_status = qdf_mc_timer_start(
&hdd_ctx->dbs_opportunistic_timer,
&cds_ctx->dbs_opportunistic_timer,
DBS_OPPORTUNISTIC_TIME *
1000);
if (!QDF_IS_STATUS_SUCCESS(qdf_status))
@ -3791,7 +3784,7 @@ void cds_decr_active_session(enum tQDF_ADAPTER_MODE mode,
/**
* cds_dbs_opportunistic_timer_handler() - handler of
* dbs_opportunistic_timer
* @data: HDD context
* @data: CDS context
*
* handler for dbs_opportunistic_timer
*
@ -3800,9 +3793,8 @@ void cds_decr_active_session(enum tQDF_ADAPTER_MODE mode,
void cds_dbs_opportunistic_timer_handler(void *data)
{
enum cds_conc_next_action action = CDS_NOP;
cds_context_type *cds_ctx;
cds_context_type *cds_ctx = (cds_context_type *)data;
cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
if (!cds_ctx) {
cds_err("Invalid CDS Context");
return;
@ -3846,6 +3838,19 @@ QDF_STATUS cds_deinit_policy_mgr(void)
cds_err("Failed to destroy qdf_conc_list_lock");
return QDF_STATUS_E_FAILURE;
}
if (QDF_TIMER_STATE_RUNNING ==
qdf_mc_timer_get_current_state(
&cds_ctx->dbs_opportunistic_timer)) {
qdf_mc_timer_stop(&cds_ctx->dbs_opportunistic_timer);
}
if (!QDF_IS_STATUS_SUCCESS(qdf_mc_timer_destroy(
&cds_ctx->dbs_opportunistic_timer))) {
cds_err("Cannot deallocate dbs opportunistic timer");
return QDF_STATUS_E_FAILURE;
}
return QDF_STATUS_SUCCESS;
}
@ -3889,10 +3894,10 @@ QDF_STATUS cds_init_policy_mgr(void)
sme_register_hw_mode_trans_cb(hdd_ctx->hHal,
cds_hw_mode_transition_cb);
status = qdf_mc_timer_init(&hdd_ctx->dbs_opportunistic_timer,
status = qdf_mc_timer_init(&cds_ctx->dbs_opportunistic_timer,
QDF_TIMER_TYPE_SW,
cds_dbs_opportunistic_timer_handler,
(void *)hdd_ctx);
(void *)cds_ctx);
if (!QDF_IS_STATUS_SUCCESS(status)) {
cds_err("Failed to init DBS opportunistic timer");
return status;

1
core/hdd/inc/wlan_hdd_main.h
View file

@ -1320,7 +1320,6 @@ struct hdd_context_s {
bool memdump_in_progress;
#endif /* WLAN_FEATURE_MEMDUMP */
qdf_mc_timer_t dbs_opportunistic_timer;
bool connection_in_progress;
qdf_spinlock_t connection_status_lock;

11
core/hdd/src/wlan_hdd_main.c
View file

@ -3725,17 +3725,6 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx)
FL("Cannot deallocate ACS Skip timer"));
}
#endif
if (QDF_TIMER_STATE_RUNNING ==
qdf_mc_timer_get_current_state(
&hdd_ctx->dbs_opportunistic_timer)) {
qdf_mc_timer_stop(&hdd_ctx->dbs_opportunistic_timer);
}
if (!QDF_IS_STATUS_SUCCESS
(qdf_mc_timer_destroy(
&hdd_ctx->dbs_opportunistic_timer))) {
hdd_err("Cannot deallocate dbs opportunistic timer");
}
/*
* Powersave Offload Case