Merge "msm: ipa: handle modem ssr in imp" (edb26b5b) · Commits · e / devices / android_kernel_xiaomi_nabu

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -923,9 +923,8 @@ static int imp_probe(struct platform_device *pdev)
		static int imp_remove(struct platform_device *pdev)
		{
		IMP_FUNC_ENTRY();
		mutex_lock(&imp_ctx->mutex);
		mhi_driver_unregister(&mhi_driver);

		mutex_lock(&imp_ctx->mutex);
		if (!imp_ctx->in_lpm)
		IPA_ACTIVE_CLIENTS_DEC_SPECIAL("IMP");
		imp_ctx->in_lpm = false;

+7 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@ struct ipa_mhi_alloc_channel_resp_msg_v01 *imp_handle_allocate_channel_req(

		int imp_handle_vote_req(bool vote);

		void imp_handle_modem_shutdown(void);

		#else /* CONFIG_IPA3_MHI_PROXY */

		static inline void imp_handle_modem_ready(void)
		@@ -43,6 +45,11 @@ static inline int imp_handle_vote_req(bool vote)
		return -EPERM;
		}

		static inline void imp_handle_modem_shutdown(void)
		{

		}

		#endif /* CONFIG_IPA3_MHI_PROXY */

		#endif /* __IMP_H_ */

+1 −1

Original line number	Diff line number	Diff line
		@@ -2698,7 +2698,7 @@ static int ipa3_ssr_notifier_cb(struct notifier_block *this,
		ipa_stop_polling_stats();
		if (atomic_read(&rmnet_ipa3_ctx->is_initialized))
		platform_driver_unregister(&rmnet_ipa_driver);

		imp_handle_modem_shutdown();
		if (atomic_read(&rmnet_ipa3_ctx->is_ssr) &&
		ipa3_ctx->ipa_hw_type >= IPA_HW_v4_0)
		ipa3_q6_post_shutdown_cleanup();