Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e3015dc authored by Mohammed Javid's avatar Mohammed Javid
Browse files

msm: ipa3: Fix Q6 resourse manager de-init 



Make a change not to handle Q6 resource manager
de-init in SSR situation.

Change-Id: I5c3f68deb4514747146c5118fb58dad121ca7335
Signed-off-by: default avatarMohammed Javid <mjavid@codeaurora.org>
parent d98d9ee8

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

+7 −2
Original line number Diff line number Diff line
@@ -1877,6 +1877,8 @@ void q6_deinitialize_rm(void) 
	if (ret < 0)

		IPAWANERR("Error deleting resource %d, ret=%d\n",

			IPA_RM_RESOURCE_Q6_PROD, ret);



	if (ipa_rm_q6_workqueue)

		destroy_workqueue(ipa_rm_q6_workqueue);

}
@@ -2186,7 +2188,10 @@ static int ipa_wwan_probe(struct platform_device *pdev) 
		IPAWANERR("Error deleting resource %d, ret=%d\n",

		IPA_RM_RESOURCE_WWAN_0_PROD, ret);

create_rsrc_err:



	if (!atomic_read(&is_ssr))

		q6_deinitialize_rm();



q6_init_err:

	free_netdev(ipa_netdevs[0]);

	ipa_netdevs[0] = NULL;

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

+7 −2
Original line number Diff line number Diff line
@@ -1927,6 +1927,8 @@ void ipa3_q6_deinitialize_rm(void) 
	if (ret < 0)

		IPAWANERR("Error deleting resource %d, ret=%d\n",

			IPA_RM_RESOURCE_Q6_PROD, ret);



	if (rmnet_ipa3_ctx->rm_q6_wq)

		destroy_workqueue(rmnet_ipa3_ctx->rm_q6_wq);

}
@@ -2267,7 +2269,10 @@ static int ipa3_wwan_probe(struct platform_device *pdev) 
		IPAWANERR("Error deleting resource %d, ret=%d\n",

		IPA_RM_RESOURCE_WWAN_0_PROD, ret);

create_rsrc_err:



	if (!atomic_read(&rmnet_ipa3_ctx->is_ssr))

		ipa3_q6_deinitialize_rm();



q6_init_err:

	free_netdev(dev);

	rmnet_ipa3_ctx->wwan_priv = NULL;