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

Commit b5fd6155 authored by Rishabh Bhatnagar's avatar Rishabh Bhatnagar Committed by Gerrit - the friendly Code Review server
Browse files

esoc: Protect the crash shutdown path against reboot notifier 



SSR shutdown and reboot notifier both invoke clients hooks.
These hooks can be invoked at the same time leading to a race.
Synchronize the two paths.

Change-Id: Ibd0f7248956d60d5831068ffcf88895adb1cd30d
Signed-off-by: default avatarRishabh Bhatnagar <rishabhb@codeaurora.org>
parent 6b3ddc57

drivers/esoc/esoc-mdm-drv.c

+13 −13
Original line number Original line Diff line number Diff line
@@ -276,7 +276,7 @@ static void mdm_crash_shutdown(const struct subsys_desc *mdm_subsys) 
static int mdm_subsys_shutdown(const struct subsys_desc *crashed_subsys,

static int mdm_subsys_shutdown(const struct subsys_desc *crashed_subsys,

							bool force_stop)

							bool force_stop)

{

{

	int ret;

	int ret = 0;

	struct esoc_clink *esoc_clink =

	struct esoc_clink *esoc_clink =

	 container_of(crashed_subsys, struct esoc_clink, subsys);

	 container_of(crashed_subsys, struct esoc_clink, subsys);

	struct mdm_drv *mdm_drv = esoc_get_drv_data(esoc_clink);

	struct mdm_drv *mdm_drv = esoc_get_drv_data(esoc_clink);
@@ -284,14 +284,16 @@ static int mdm_subsys_shutdown(const struct subsys_desc *crashed_subsys, 




	esoc_mdm_log("Shutdown request from SSR\n");

	esoc_mdm_log("Shutdown request from SSR\n");





	mutex_lock(&mdm_drv->poff_lock);

	if (mdm_drv->mode == CRASH || mdm_drv->mode == PEER_CRASH) {

	if (mdm_drv->mode == CRASH || mdm_drv->mode == PEER_CRASH) {

		esoc_mdm_log("Shutdown in crash mode\n");

		esoc_mdm_log("Shutdown in crash mode\n");

		if (mdm_dbg_stall_cmd(ESOC_PREPARE_DEBUG))

		if (mdm_dbg_stall_cmd(ESOC_PREPARE_DEBUG)) {

			/* We want to mask debug command.

			/* We want to mask debug command.

			 * In this case return success

			 * In this case return success

			 * to move to next stage

			 * to move to next stage

			 */

			 */

			return 0;

			goto unlock;

		}





		esoc_clink_queue_request(ESOC_REQ_CRASH_SHUTDOWN, esoc_clink);

		esoc_clink_queue_request(ESOC_REQ_CRASH_SHUTDOWN, esoc_clink);

		esoc_client_link_power_off(esoc_clink, ESOC_HOOK_MDM_CRASH);

		esoc_client_link_power_off(esoc_clink, ESOC_HOOK_MDM_CRASH);
@@ -302,16 +304,14 @@ static int mdm_subsys_shutdown(const struct subsys_desc *crashed_subsys, 
		if (ret) {

		if (ret) {

			esoc_mdm_log("ESOC_PREPARE_DEBUG command failed\n");

			esoc_mdm_log("ESOC_PREPARE_DEBUG command failed\n");

			dev_err(&esoc_clink->dev, "failed to enter debug\n");

			dev_err(&esoc_clink->dev, "failed to enter debug\n");

			return ret;

			goto unlock;

		}

		}

		mdm_drv->mode = IN_DEBUG;

		mdm_drv->mode = IN_DEBUG;

	} else if (!force_stop) {

	} else if (!force_stop) {

		esoc_mdm_log("Graceful shutdown mode\n");

		esoc_mdm_log("Graceful shutdown mode\n");

		mutex_lock(&mdm_drv->poff_lock);

		if (mdm_drv->mode == PWR_OFF) {

		if (mdm_drv->mode == PWR_OFF) {

			mutex_unlock(&mdm_drv->poff_lock);

			esoc_mdm_log("mdm already powered-off\n");

			esoc_mdm_log("mdm already powered-off\n");

			return 0;

			goto unlock;

		}

		}

		if (esoc_clink->subsys.sysmon_shutdown_ret) {

		if (esoc_clink->subsys.sysmon_shutdown_ret) {

			esoc_mdm_log(

			esoc_mdm_log(
@@ -324,8 +324,7 @@ static int mdm_subsys_shutdown(const struct subsys_desc *crashed_subsys, 
				 * we return success, and leave the state

				 * we return success, and leave the state

				 * of the command engine as is.

				 * of the command engine as is.

				 */

				 */

				mutex_unlock(&mdm_drv->poff_lock);

				goto unlock;

				return 0;

			}

			}

			dev_dbg(&esoc_clink->dev, "Sending sysmon-shutdown\n");

			dev_dbg(&esoc_clink->dev, "Sending sysmon-shutdown\n");

			esoc_mdm_log("Executing the ESOC_PWR_OFF command\n");

			esoc_mdm_log("Executing the ESOC_PWR_OFF command\n");
@@ -335,17 +334,18 @@ static int mdm_subsys_shutdown(const struct subsys_desc *crashed_subsys, 
			esoc_mdm_log(

			esoc_mdm_log(

			"Executing the ESOC_PWR_OFF command failed\n");

			"Executing the ESOC_PWR_OFF command failed\n");

			dev_err(&esoc_clink->dev, "failed to exe power off\n");

			dev_err(&esoc_clink->dev, "failed to exe power off\n");

			mutex_unlock(&mdm_drv->poff_lock);

			goto unlock;

			return ret;

		}

		}

		esoc_client_link_power_off(esoc_clink, ESOC_HOOK_MDM_DOWN);

		esoc_client_link_power_off(esoc_clink, ESOC_HOOK_MDM_DOWN);

		/* Pull the reset line low to turn off the device */

		/* Pull the reset line low to turn off the device */

		clink_ops->cmd_exe(ESOC_FORCE_PWR_OFF, esoc_clink);

		clink_ops->cmd_exe(ESOC_FORCE_PWR_OFF, esoc_clink);

		mdm_drv->mode = PWR_OFF;

		mdm_drv->mode = PWR_OFF;

		mutex_unlock(&mdm_drv->poff_lock);

	}

	}

	esoc_mdm_log("Shutdown completed\n");

	esoc_mdm_log("Shutdown completed\n");

	return 0;



unlock:

	mutex_unlock(&mdm_drv->poff_lock);

	return ret;

}

}





static void mdm_subsys_retry_powerup_cleanup(struct esoc_clink *esoc_clink,

static void mdm_subsys_retry_powerup_cleanup(struct esoc_clink *esoc_clink,