From dd0fe1d092738a2aca0c2b8389b0bce8f853964c Mon Sep 17 00:00:00 2001 From: Bhaumik Bhatt Date: Fri, 14 Feb 2020 15:59:10 -0800 Subject: [PATCH] mhi: core: unconditionally trigger resume to assert device wake In order to ensure that a DRV resume follows immediately after a client calls device wake assert or deassert, MHI core driver must unconditionally increment the PM runtime usage count and post a wake source before waiting for the state change. Change-Id: I50228742c090a5df6fcb06f89f53723179bcd76d Signed-off-by: Bhaumik Bhatt --- drivers/bus/mhi/core/mhi_pm.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/bus/mhi/core/mhi_pm.c b/drivers/bus/mhi/core/mhi_pm.c index 71c07fb84811..bcb9e52fc16a 100644 --- a/drivers/bus/mhi/core/mhi_pm.c +++ b/drivers/bus/mhi/core/mhi_pm.c @@ -1499,10 +1499,11 @@ int __mhi_device_get_sync(struct mhi_controller *mhi_cntrl) read_lock_bh(&mhi_cntrl->pm_lock); mhi_cntrl->wake_get(mhi_cntrl, true); - if (MHI_PM_IN_SUSPEND_STATE(mhi_cntrl->pm_state)) - mhi_trigger_resume(mhi_cntrl); read_unlock_bh(&mhi_cntrl->pm_lock); + pm_wakeup_hard_event(&mhi_cntrl->mhi_dev->dev); + mhi_cntrl->runtime_get(mhi_cntrl, mhi_cntrl->priv_data); + mhi_force_reg_write(mhi_cntrl); ret = wait_event_timeout(mhi_cntrl->state_event, @@ -1517,9 +1518,11 @@ int __mhi_device_get_sync(struct mhi_controller *mhi_cntrl) read_lock_bh(&mhi_cntrl->pm_lock); mhi_cntrl->wake_put(mhi_cntrl, false); read_unlock_bh(&mhi_cntrl->pm_lock); + mhi_cntrl->runtime_put(mhi_cntrl, mhi_cntrl->priv_data); return -EIO; } + mhi_cntrl->runtime_put(mhi_cntrl, mhi_cntrl->priv_data); return 0; } @@ -1579,9 +1582,7 @@ void mhi_device_put(struct mhi_device *mhi_dev, int vote) if (vote & MHI_VOTE_DEVICE) { atomic_dec(&mhi_dev->dev_vote); read_lock_bh(&mhi_cntrl->pm_lock); - if (MHI_PM_IN_SUSPEND_STATE(mhi_cntrl->pm_state)) - mhi_trigger_resume(mhi_cntrl); - + mhi_trigger_resume(mhi_cntrl); mhi_cntrl->wake_put(mhi_cntrl, false); read_unlock_bh(&mhi_cntrl->pm_lock); }