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

Commit 6df48c2f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mhi: core: Process bandwidth scaling event after force suspend"

parents c40a2dd4 285907ab

drivers/bus/mhi/core/mhi_main.c

+3 −0
Original line number Diff line number Diff line
@@ -1453,6 +1453,9 @@ int mhi_process_bw_scale_ev_ring(struct mhi_controller *mhi_cntrl, 
		goto exit_no_lock;

	}



	if (mhi_cntrl->need_force_m3 && !mhi_cntrl->force_m3_done)

		goto exit_no_lock;



	ret = __mhi_device_get_sync(mhi_cntrl);

	if (ret)

		goto exit_no_lock;

drivers/bus/mhi/core/mhi_pm.c

+2 −0
Original line number Diff line number Diff line
@@ -634,6 +634,8 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl, 
	flush_work(&mhi_cntrl->fw_worker);

	flush_work(&mhi_cntrl->low_priority_worker);



	mhi_cntrl->force_m3_done = false;



	if (sfr_info && sfr_info->buf_addr) {

		mhi_free_coherent(mhi_cntrl, sfr_info->len, sfr_info->buf_addr,

				  sfr_info->dma_addr);

include/linux/mhi.h

+2 −0
Original line number Diff line number Diff line
@@ -380,6 +380,8 @@ struct mhi_controller { 
	/* controller specific data */

	const char *name;

	bool power_down;

	bool need_force_m3;

	bool force_m3_done;

	void *priv_data;

	void *log_buf;

	struct dentry *dentry;