evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mhi: core: Remove race condition on LPM

Browse source 
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: Andrei Danaila <adanaila@codeaurora.org>
This commit is contained in:
Andrei Danaila 2015-05-12 12:15:29 -07:00 • committed by David Keitel
parent 978126e270
commit 271de9a9d9
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/platform/msm/mhi/mhi_init.c
View file

@ -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);

12
drivers/platform/msm/mhi/mhi_states.c
View file

@ -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;
}