evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: ipa3: add offline charging support"

Browse source
This commit is contained in:
Linux Build Service Account 2017-07-28 00:21:08 -07:00 • committed by Gerrit - the friendly Code Review server
commit 954d1c4aae
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/platform/msm/ipa/ipa_v3/ipa.c
View file

@ -3977,6 +3977,8 @@ static int ipa3_post_init(const struct ipa3_plat_drv_res *resource_p,
/* Prevent consequent calls from trying to load the FW again. */ /* Prevent consequent calls from trying to load the FW again. */
if (ipa3_ctx->ipa_initialization_complete) if (ipa3_ctx->ipa_initialization_complete)
return 0; return 0;
/* move proxy vote for modem on ipa3_post_init */
IPA_ACTIVE_CLIENTS_INC_SPECIAL("PROXY_CLK_VOTE");
if (ipa3_ctx->transport_prototype == IPA_TRANSPORT_TYPE_GSI) { if (ipa3_ctx->transport_prototype == IPA_TRANSPORT_TYPE_GSI) {
memset(&gsi_props, 0, sizeof(gsi_props)); memset(&gsi_props, 0, sizeof(gsi_props));
@ -4296,7 +4298,6 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p,
int i; int i;
struct ipa3_flt_tbl *flt_tbl; struct ipa3_flt_tbl *flt_tbl;
struct ipa3_rt_tbl_set *rset; struct ipa3_rt_tbl_set *rset;
struct ipa_active_client_logging_info log_info;
IPADBG("IPA Driver initialization started\n"); IPADBG("IPA Driver initialization started\n");
@ -4486,8 +4487,7 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p,
mutex_init(&ipa3_ctx->ipa3_active_clients.mutex); mutex_init(&ipa3_ctx->ipa3_active_clients.mutex);
spin_lock_init(&ipa3_ctx->ipa3_active_clients.spinlock); spin_lock_init(&ipa3_ctx->ipa3_active_clients.spinlock);
IPA_ACTIVE_CLIENTS_PREP_SPECIAL(log_info, "PROXY_CLK_VOTE"); /* move proxy vote for modem to ipa3_post_init() */
ipa3_active_clients_log_inc(&log_info, false);
ipa3_ctx->ipa3_active_clients.cnt = 1; ipa3_ctx->ipa3_active_clients.cnt = 1;
/* Assign resource limitation to each group */ /* Assign resource limitation to each group */
@ -4723,7 +4723,6 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p,
init_completion(&ipa3_ctx->init_completion_obj); init_completion(&ipa3_ctx->init_completion_obj);
init_completion(&ipa3_ctx->uc_loaded_completion_obj); init_completion(&ipa3_ctx->uc_loaded_completion_obj);
/* /*
* For GSI, we can't register the GSI driver yet, as it expects * For GSI, we can't register the GSI driver yet, as it expects
* the GSI FW to be up and running before the registration. * the GSI FW to be up and running before the registration.
@ -4766,6 +4765,8 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p,
IPADBG("ipa cdev added successful. major:%d minor:%d\n", IPADBG("ipa cdev added successful. major:%d minor:%d\n",
MAJOR(ipa3_ctx->dev_num), MAJOR(ipa3_ctx->dev_num),
MINOR(ipa3_ctx->dev_num)); MINOR(ipa3_ctx->dev_num));
/* proxy vote for motem is added in ipa3_post_init() phase */
IPA_ACTIVE_CLIENTS_DEC_SIMPLE();
return 0; return 0;
fail_cdev_add: fail_cdev_add: