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

Merge "mhi: core: allow communication during shutdown"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-25 21:48:39 -07:00 • committed by Gerrit - the friendly Code Review server
commit f9d3e35e35
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/platform/msm/mhi/mhi_ssr.c
View file

@ -29,11 +29,9 @@ static int mhi_ssr_notify_cb(struct notifier_block *nb,
mhi_log(mhi_dev_ctxt, MHI_MSG_INFO, mhi_log(mhi_dev_ctxt, MHI_MSG_INFO,
"Received ESOC notifcation:%lu crashed:%d\n", action, crashed); "Received ESOC notifcation:%lu crashed:%d\n", action, crashed);
switch (action) { switch (action) {
case SUBSYS_BEFORE_SHUTDOWN: case SUBSYS_AFTER_SHUTDOWN:
/*
* update internal states only, we'll clean up MHI context /* Disable internal state, no more communication */
* after device shutdown completely.
*/
write_lock_irq(&mhi_dev_ctxt->pm_xfer_lock); write_lock_irq(&mhi_dev_ctxt->pm_xfer_lock);
cur_state = mhi_tryset_pm_state(mhi_dev_ctxt, cur_state = mhi_tryset_pm_state(mhi_dev_ctxt,
MHI_PM_LD_ERR_FATAL_DETECT); MHI_PM_LD_ERR_FATAL_DETECT);
@ -42,8 +40,6 @@ static int mhi_ssr_notify_cb(struct notifier_block *nb,
mhi_log(mhi_dev_ctxt, MHI_MSG_INFO, mhi_log(mhi_dev_ctxt, MHI_MSG_INFO,
"Failed to transition to state 0x%x from 0x%x\n", "Failed to transition to state 0x%x from 0x%x\n",
MHI_PM_LD_ERR_FATAL_DETECT, cur_state); MHI_PM_LD_ERR_FATAL_DETECT, cur_state);
break;
case SUBSYS_AFTER_SHUTDOWN:
if (mhi_dev_ctxt->mhi_pm_state != MHI_PM_DISABLE) if (mhi_dev_ctxt->mhi_pm_state != MHI_PM_DISABLE)
process_disable_transition(MHI_PM_SHUTDOWN_PROCESS, process_disable_transition(MHI_PM_SHUTDOWN_PROCESS,
mhi_dev_ctxt); mhi_dev_ctxt);