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

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

Merge "mhi: core: add a timeout when waiting for MHI state BHI event."

parents a787a9a8 fdaa2412

drivers/platform/msm/mhi/mhi_bhi.c

+5 −4
Original line number Diff line number Diff line
@@ -537,11 +537,12 @@ void bhi_firmware_download(struct work_struct *work) 


	mhi_log(mhi_dev_ctxt, MHI_MSG_INFO, "Enter\n");



	wait_event_interruptible(*mhi_dev_ctxt->mhi_ev_wq.bhi_event,

	ret = wait_event_interruptible_timeout(

		*mhi_dev_ctxt->mhi_ev_wq.bhi_event,

		mhi_dev_ctxt->mhi_state == MHI_STATE_BHI ||

		mhi_dev_ctxt->mhi_pm_state == MHI_PM_LD_ERR_FATAL_DETECT);

	if (mhi_dev_ctxt->mhi_pm_state == MHI_PM_LD_ERR_FATAL_DETECT ||

	    mhi_dev_ctxt->mhi_state != MHI_STATE_BHI) {

		mhi_dev_ctxt->mhi_pm_state == MHI_PM_LD_ERR_FATAL_DETECT,

		msecs_to_jiffies(MHI_MAX_STATE_TRANSITION_TIMEOUT));

	if (!ret || mhi_dev_ctxt->mhi_pm_state == MHI_PM_LD_ERR_FATAL_DETECT) {

		mhi_log(mhi_dev_ctxt, MHI_MSG_ERROR,

			"MHI is not in valid state for firmware download\n");

		return;

drivers/platform/msm/mhi/mhi_macros.h

+1 −2
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ 
#define CMD_EL_PER_RING 128

#define ELEMENT_GAP 1

#define MHI_EPID 4

#define MHI_MAX_RESUME_TIMEOUT 5000

#define MHI_MAX_SUSPEND_TIMEOUT 5000

#define MHI_MAX_STATE_TRANSITION_TIMEOUT 5000

#define MHI_MAX_CMD_TIMEOUT 500

#define MHI_RPM_AUTOSUSPEND_TMR_VAL_MS 1000

#define MAX_BUF_SIZE 32

drivers/platform/msm/mhi/mhi_pm.c

+6 −6
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int mhi_pm_initiate_m3(struct mhi_device_ctxt *mhi_dev_ctxt, 
		mhi_dev_ctxt->mhi_state == MHI_STATE_M0 ||

		mhi_dev_ctxt->mhi_state == MHI_STATE_M1 ||

		mhi_dev_ctxt->mhi_pm_state == MHI_PM_LD_ERR_FATAL_DETECT,

		msecs_to_jiffies(MHI_MAX_RESUME_TIMEOUT));

		msecs_to_jiffies(MHI_MAX_STATE_TRANSITION_TIMEOUT));

	if (!r || mhi_dev_ctxt->mhi_pm_state == MHI_PM_LD_ERR_FATAL_DETECT) {

		mhi_log(mhi_dev_ctxt, MHI_MSG_ERROR,

			"Failed to get M0||M1 event or LD pm_state:0x%x state:%s\n",
@@ -142,7 +142,7 @@ static int mhi_pm_initiate_m3(struct mhi_device_ctxt *mhi_dev_ctxt, 
	r = wait_event_timeout(*mhi_dev_ctxt->mhi_ev_wq.m3_event,

		mhi_dev_ctxt->mhi_state == MHI_STATE_M3 ||

		mhi_dev_ctxt->mhi_pm_state == MHI_PM_LD_ERR_FATAL_DETECT,

		msecs_to_jiffies(MHI_MAX_SUSPEND_TIMEOUT));

		msecs_to_jiffies(MHI_MAX_STATE_TRANSITION_TIMEOUT));

	if (!r || mhi_dev_ctxt->mhi_pm_state == MHI_PM_LD_ERR_FATAL_DETECT) {

		mhi_log(mhi_dev_ctxt, MHI_MSG_ERROR,

			"Failed to get M3 event, timeout, current state:%s\n",
@@ -180,7 +180,7 @@ static int mhi_pm_initiate_m0(struct mhi_device_ctxt *mhi_dev_ctxt) 
		mhi_dev_ctxt->mhi_state == MHI_STATE_M0 ||

		mhi_dev_ctxt->mhi_state == MHI_STATE_M1 ||

		mhi_dev_ctxt->mhi_pm_state == MHI_PM_LD_ERR_FATAL_DETECT,

		msecs_to_jiffies(MHI_MAX_RESUME_TIMEOUT));

		msecs_to_jiffies(MHI_MAX_STATE_TRANSITION_TIMEOUT));

	if (!r || mhi_dev_ctxt->mhi_pm_state == MHI_PM_LD_ERR_FATAL_DETECT) {

		mhi_log(mhi_dev_ctxt, MHI_MSG_ERROR,

			"Failed to get M0 event, timeout or LD\n");
@@ -322,9 +322,6 @@ static int mhi_pm_slave_mode_power_on(struct mhi_device_ctxt *mhi_dev_ctxt) 
	else

		ret_val = 0;



	/* wait for firmware download to complete */

	flush_work(&mhi_dev_ctxt->bhi_ctxt.fw_load_work);



	if (ret_val) {

		read_lock_irq(&mhi_dev_ctxt->pm_xfer_lock);

		mhi_dev_ctxt->deassert_wake(mhi_dev_ctxt);
@@ -333,6 +330,9 @@ static int mhi_pm_slave_mode_power_on(struct mhi_device_ctxt *mhi_dev_ctxt) 


unlock_pm_lock:



	/* wait for firmware download to complete */

	flush_work(&mhi_dev_ctxt->bhi_ctxt.fw_load_work);



	mhi_log(mhi_dev_ctxt, MHI_MSG_INFO, "Exit with ret:%d\n", ret_val);

	mutex_unlock(&mhi_dev_ctxt->pm_lock);

	return ret_val;