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

Commit 3acd0858 authored by Siva Kumar Akkireddi's avatar Siva Kumar Akkireddi Committed by Hemant Kumar
Browse files

Revert "mhi: core: Force PM state to M0 while processing BW scaling event" 



This reverts commit 6beaad9d. In case
low priority work processes the empty bw scaling event it returns
without decrementing the dev wake count. This results into assert
in case of a esoc power off.

Change-Id: I4948ec53a76d18a337281a993b11225dfc907f2e
Signed-off-by: default avatarSiva Kumar Akkireddi <sivaa@codeaurora.org>
parent b0974d6b

drivers/bus/mhi/core/mhi_main.c

+13 −12
Original line number Diff line number Diff line
@@ -1406,25 +1406,29 @@ int mhi_process_bw_scale_ev_ring(struct mhi_controller *mhi_cntrl, 
	struct mhi_link_info link_info, *cur_info = &mhi_cntrl->mhi_link_info;

	int result, ret = 0;



	mutex_lock(&mhi_cntrl->pm_mutex);



	if (unlikely(MHI_EVENT_ACCESS_INVALID(mhi_cntrl->pm_state))) {

		MHI_LOG("No EV access, PM_STATE:%s\n",

			to_mhi_pm_state_str(mhi_cntrl->pm_state));

		ret = -EIO;

		goto exit_no_lock;

		goto exit_bw_process;

	}



	ret = __mhi_device_get_sync(mhi_cntrl);

	if (ret)

		goto exit_no_lock;



	mutex_lock(&mhi_cntrl->pm_mutex);

	/*

	 * BW change is not process during suspend since we're suspending link,

	 * host will process it during resume

	 */

	if (MHI_PM_IN_SUSPEND_STATE(mhi_cntrl->pm_state)) {

		ret = -EACCES;

		goto exit_bw_process;

	}



	spin_lock_bh(&mhi_event->lock);

	dev_rp = mhi_to_virtual(ev_ring, er_ctxt->rp);



	if (ev_ring->rp == dev_rp) {

		spin_unlock_bh(&mhi_event->lock);

		MHI_VERB("no pending event found\n");

		goto exit_bw_process;

	}
@@ -1469,16 +1473,13 @@ int mhi_process_bw_scale_ev_ring(struct mhi_controller *mhi_cntrl, 
		mhi_write_reg(mhi_cntrl, mhi_cntrl->bw_scale_db, 0,

			      MHI_BW_SCALE_RESULT(result,

						  link_info.sequence_num));



	mhi_cntrl->wake_put(mhi_cntrl, false);

	read_unlock_bh(&mhi_cntrl->pm_lock);



exit_bw_process:

	mutex_unlock(&mhi_cntrl->pm_mutex);



exit_no_lock:

	MHI_VERB("exit er_index:%u\n", mhi_event->er_index);



	mutex_unlock(&mhi_cntrl->pm_mutex);



	return ret;

}