Merge "msm: ipa: Fix to remove duplicate proxy vote"

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

@@ -6350,7 +6350,7 @@ static int ipa3_post_init(const struct ipa3_plat_drv_res *resource_p,
 			atomic_read(&ipa3_ctx->ipa3_active_clients.cnt));
 	/* move proxy vote for modem on ipa3_post_init */
 	if (ipa3_ctx->ipa_hw_type != IPA_HW_v4_0)
-		ipa3_proxy_clk_vote();
+		ipa3_proxy_clk_vote(false);
 
 	/* The following will retrieve and save the gsi fw version */
 	ipa_save_gsi_ver();
@@ -6785,7 +6785,7 @@ static void ipa3_load_ipa_fw(struct work_struct *work)
 		IPADBG("Loading IPA uC via PIL\n");
 
 		/* Unvoting will happen when uC loaded event received. */
-		ipa3_proxy_clk_vote();
+		ipa3_proxy_clk_vote(false);
 
 		if (ipa3_ctx->uc_fw_file_name)
 			result = ipa3_pil_load_ipa_fws(

drivers/platform/msm/ipa/ipa_v3/ipa_i.h

@@ -2764,7 +2764,7 @@ int ipa3_ctx_get_type(enum ipa_type_mode type);
 bool ipa3_ctx_get_flag(enum ipa_flag flag);
 u32 ipa3_ctx_get_num_pipes(void);
 
-void ipa3_proxy_clk_vote(void);
+void ipa3_proxy_clk_vote(bool is_ssr);
 void ipa3_proxy_clk_unvote(void);
 
 bool ipa3_is_client_handle_valid(u32 clnt_hdl);

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

@@ -8201,10 +8201,16 @@ void ipa3_proxy_clk_unvote(void)
  *
  * Return value: none
  */
-void ipa3_proxy_clk_vote(void)
+void ipa3_proxy_clk_vote(bool is_ssr)
 {
 	if (ipa3_ctx == NULL)
 		return;
+
+	/* Avoid duplicate votes in case we are in SSR even before uC is loaded. */
+	if (is_ssr && !ipa3_uc_loaded_check()) {
+		IPADBG("Dup proxy vote. Ignore as uC is not yet loaded\n");
+		return;
+	}
 	mutex_lock(&ipa3_ctx->q6_proxy_clk_vote_mutex);
 	if (!ipa3_ctx->q6_proxy_clk_vote_valid ||
 		(ipa3_ctx->q6_proxy_clk_vote_cnt > 0)) {

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

@@ -2893,7 +2893,7 @@ static int ipa3_lcl_mdm_ssr_notifier_cb(struct notifier_block *this,
 			ipa3_q6_pre_powerup_cleanup();
 		}
 		/* hold a proxy vote for the modem. */
-		ipa3_proxy_clk_vote();
+		ipa3_proxy_clk_vote(atomic_read(&rmnet_ipa3_ctx->is_ssr));
 		ipa3_reset_freeze_vote();
 		IPAWANINFO("IPA BEFORE_POWERUP handling is complete\n");
 		break;