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

Commit a88867c2 authored by Sagar Dharia's avatar Sagar Dharia
Browse files

slim_msm: Handle external-modem shutdown differently than restart 



External modem may shutdown in cases other than subsystem-restart.
In that case, the power-up notification may not happen.
Handle such a scenario and make sure runtime-pm vote is not held
for more time than required, and that slave-device up/down/reset
notifications happen as expected if slimbus was down.

CRs-Fixed: 645450
Change-Id: I5fef2393c835d06c5ce1dc4f9cb62d418620211b
Signed-off-by: default avatarSagar Dharia <sdharia@codeaurora.org>
parent e223bf28

drivers/slimbus/slim-msm-ngd.c

+12 −3
Original line number Original line Diff line number Diff line
@@ -196,31 +196,40 @@ static int mdm_ssr_notify_cb(struct notifier_block *n, unsigned long code, 
		dev_err(dev->dev,

		dev_err(dev->dev,

			"SLIM %lu external_modem SSR notify cb", code);

			"SLIM %lu external_modem SSR notify cb", code);

		/* vote for runtime-pm so that ADSP doesn't go down */

		/* vote for runtime-pm so that ADSP doesn't go down */

		pm_runtime_get_sync(dev->dev);

		msm_slim_get_ctrl(dev);

		/*

		/*

		 * checking framer here will wake-up ADSP and may avoid framer

		 * checking framer here will wake-up ADSP and may avoid framer

		 * handover later

		 * handover later

		 */

		 */

		msm_slim_qmi_check_framer_request(dev);

		msm_slim_qmi_check_framer_request(dev);

		dev->mdm.state = MSM_CTRL_DOWN;

		dev->mdm.state = MSM_CTRL_DOWN;

		msm_slim_put_ctrl(dev);

		break;

		break;

	case SUBSYS_AFTER_POWERUP:

	case SUBSYS_AFTER_POWERUP:

		if (dev->mdm.state != MSM_CTRL_DOWN)

		if (dev->mdm.state != MSM_CTRL_DOWN)

			return NOTIFY_DONE;

			return NOTIFY_DONE;

		dev_err(dev->dev,

		dev_err(dev->dev,

			"SLIM %lu external_modem SSR notify cb", code);

			"SLIM %lu external_modem SSR notify cb", code);

		/* vote for runtime-pm so that ADSP doesn't go down */

		msm_slim_get_ctrl(dev);

		msm_slim_qmi_check_framer_request(dev);

		msm_slim_qmi_check_framer_request(dev);

		/* If NGD enumeration is lost, we will need to power us up */

		/* If NGD enumeration is lost, we will need to power us up */

		ngd = dev->base + NGD_BASE(dev->ctrl.nr, dev->ver);

		ngd = dev->base + NGD_BASE(dev->ctrl.nr, dev->ver);

		laddr = readl_relaxed(ngd + NGD_STATUS);

		laddr = readl_relaxed(ngd + NGD_STATUS);

		if (!(laddr & NGD_LADDR)) {

		if (!(laddr & NGD_LADDR)) {

			/* runtime-pm state should be consistent with HW */

			pm_runtime_disable(dev->dev);

			pm_runtime_set_suspended(dev->dev);

			dev->state = MSM_CTRL_DOWN;

			pr_err("SLIM MDM SSR (active framer on MDM) dev-down");

			pr_err("SLIM MDM SSR (active framer on MDM) dev-down");

			list_for_each_entry(sbdev, &ctrl->devs, dev_list)

			list_for_each_entry(sbdev, &ctrl->devs, dev_list)

				slim_report_absent(sbdev);

				slim_report_absent(sbdev);

		}

			ngd_slim_power_up(dev, true);

			ngd_slim_power_up(dev, true);

		msm_slim_put_ctrl(dev);

			pm_runtime_set_active(dev->dev);

			pm_runtime_enable(dev->dev);

		}

		dev->mdm.state = MSM_CTRL_AWAKE;

		dev->mdm.state = MSM_CTRL_AWAKE;

		msm_slim_put_ctrl(dev);

		break;

		break;

	default:

	default:

		break;

		break;