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

Commit 79badf5d authored by Andrei Danaila's avatar Andrei Danaila
Browse files

mhi: core: Remove race condition on LPM 



Eliminate race condition whereby the device could go into
a low power mode before the host has finished initializing.

CRs-Fixed: 836441
Change-Id: I9957e87b1bfe956963c1f74f0a02d6714e9afcbe
Signed-off-by: default avatarAndrei Danaila <adanaila@codeaurora.org>
parent f1d461b6

drivers/platform/msm/mhi/mhi_init.c

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ static enum MHI_STATUS mhi_init_device_ctrl(struct mhi_device_ctxt 
		return MHI_STATUS_ERROR;



	mhi_dev_ctxt->enable_lpm = 1;

	mhi_dev_ctxt->flags.mhi_initialized = 0;



	mhi_log(MHI_MSG_INFO, "Allocating control segment.\n");

	ctrl_seg_size += sizeof(struct mhi_control_seg);

drivers/platform/msm/mhi/mhi_states.c

+7 −5
Original line number Diff line number Diff line
@@ -159,12 +159,10 @@ static enum MHI_STATUS process_m0_transition( 
		atomic_set(&mhi_dev_ctxt->flags.pending_powerup, 0);

	}

	wake_up_interruptible(mhi_dev_ctxt->mhi_ev_wq.m0_event);

	if (ret_val == -ERESTARTSYS)

		mhi_log(MHI_MSG_CRITICAL,

			"Pending restart detected\n");

	write_lock_irqsave(&mhi_dev_ctxt->xfer_lock, flags);

	if ((!mhi_dev_ctxt->flags.pending_M3) &&

	   (mhi_dev_ctxt->flags.link_up))

	if (!mhi_dev_ctxt->flags.pending_M3 &&

	     mhi_dev_ctxt->flags.link_up &&

	     mhi_dev_ctxt->flags.mhi_initialized)

		mhi_deassert_device_wake(mhi_dev_ctxt);

	write_unlock_irqrestore(&mhi_dev_ctxt->xfer_lock, flags);
@@ -376,6 +374,7 @@ static enum MHI_STATUS process_ready_transition( 
	}



	mhi_dev_ctxt->flags.stop_threads = 0;

	mhi_assert_device_wake(mhi_dev_ctxt);

	mhi_reg_write_field(mhi_dev_ctxt,

			mhi_dev_ctxt->mmio_info.mmio_addr, MHICTRL,

			MHICTRL_MHISTATE_MASK,
@@ -600,6 +599,9 @@ static enum MHI_STATUS process_amss_transition( 
		ring_all_chan_dbs(mhi_dev_ctxt);

	}

	atomic_dec(&mhi_dev_ctxt->flags.data_pending);

	if (!mhi_dev_ctxt->flags.pending_M3 &&

	     mhi_dev_ctxt->flags.link_up)

		mhi_deassert_device_wake(mhi_dev_ctxt);

	mhi_log(MHI_MSG_INFO, "Exited\n");

	return MHI_STATUS_SUCCESS;

}