Merge "msm: ipa3: add offline charging support" (954d1c4a) · Commits · e / devices / android_kernel_sony_msm8998

drivers/platform/msm/ipa/ipa_v3/ipa.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -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. */
		if (ipa3_ctx->ipa_initialization_complete)
		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) {
		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;
		struct ipa3_flt_tbl *flt_tbl;
		struct ipa3_rt_tbl_set *rset;
		struct ipa_active_client_logging_info log_info;

		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);
		spin_lock_init(&ipa3_ctx->ipa3_active_clients.spinlock);
		IPA_ACTIVE_CLIENTS_PREP_SPECIAL(log_info, "PROXY_CLK_VOTE");
		ipa3_active_clients_log_inc(&log_info, false);
		/* move proxy vote for modem to ipa3_post_init() */
		ipa3_ctx->ipa3_active_clients.cnt = 1;

		/* 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->uc_loaded_completion_obj);

		/*
		* For GSI, we can't register the GSI driver yet, as it expects
		* 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",
		MAJOR(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;

		fail_cdev_add: