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

Commit 1c2c6d7f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: ssr: stop QMI service in BEFORE_POWERUP stage"

parents c808da70 009665ec

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -2099,8 +2099,6 @@ static int ipa_wwan_remove(struct platform_device *pdev) 
	ipa_del_mux_qmap_hdrs();

	ipa_del_mux_qmap_hdrs();

	if (ipa_qmi_ctx && ipa_qmi_ctx->modem_cfg_emb_pipe_flt == false)

	if (ipa_qmi_ctx && ipa_qmi_ctx->modem_cfg_emb_pipe_flt == false)

		wwan_del_ul_flt_rule_to_ipa();

		wwan_del_ul_flt_rule_to_ipa();

	/* clean up cached QMI msg/handlers */

	ipa_qmi_service_exit();

	ipa_cleanup_deregister_intf();

	ipa_cleanup_deregister_intf();

	atomic_set(&is_initialized, 0);

	atomic_set(&is_initialized, 0);

	pr_info("rmnet_ipa completed deinitialization\n");

	pr_info("rmnet_ipa completed deinitialization\n");
@@ -2228,6 +2226,9 @@ static int ssr_notifier_cb(struct notifier_block *this, 
		}

		}

		if (SUBSYS_BEFORE_POWERUP == code) {

		if (SUBSYS_BEFORE_POWERUP == code) {

			pr_info("IPA received MPSS BEFORE_POWERUP\n");

			pr_info("IPA received MPSS BEFORE_POWERUP\n");

			if (atomic_read(&is_ssr))

				/* clean up cached QMI msg/handlers */

				ipa_qmi_service_exit();

			ipa2_proxy_clk_vote();

			ipa2_proxy_clk_vote();

			pr_info("IPA BEFORE_POWERUP handling is complete\n");

			pr_info("IPA BEFORE_POWERUP handling is complete\n");

			return NOTIFY_DONE;

			return NOTIFY_DONE;