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

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

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

parents 3258c666 03ba1d00

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

+4 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2111,8 +2111,6 @@ static int ipa3_wwan_remove(struct platform_device *pdev) 
	ipa3_del_mux_qmap_hdrs();

	if (ipa3_qmi_ctx->modem_cfg_emb_pipe_flt == false)

		ipa3_wwan_del_ul_flt_rule_to_ipa();

	/* clean up cached QMI msg/handlers */

	ipa3_qmi_service_exit();

	ipa3_cleanup_deregister_intf();

	atomic_set(&is_initialized, 0);

	pr_info("rmnet_ipa completed deinitialization\n");
@@ -2240,6 +2238,9 @@ static int ipa3_ssr_notifier_cb(struct notifier_block *this, 
		}

		if (SUBSYS_BEFORE_POWERUP == code) {

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

			if (atomic_read(&is_ssr))

				/* clean up cached QMI msg/handlers */

				ipa3_qmi_service_exit();

			ipa3_proxy_clk_vote();

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

			return NOTIFY_DONE;