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

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

Merge "mhi: core: update MHI host support for WLAN FW execution environment"

parents 6913685d 8ad12ed3

Documentation/devicetree/bindings/bus/mhi.txt

+2 −2
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ mhi channel node properties: 
		BIT(0) = Channel supported in PBL EE

		BIT(1) = Channel supported in SBL EE

		BIT(2) = Channel supported in AMSS EE

		BIT(3) = Channel supported in BHIe EE

		BIT(4) = Channel supported in RDDM EE

		BIT(3) = Channel supported in RDDM EE

		BIT(4) = Channel supported in WFW EE

		BIT(5) = Channel supported in PTHRU EE

		BIT(6) = Channel supported in EDL EE

drivers/bus/mhi/core/mhi_boot.c

+2 −2
Original line number Diff line number Diff line
@@ -556,9 +556,9 @@ void mhi_fw_load_worker(struct work_struct *work) 
		goto error_read;

	}



	/* wait for BHIE event */

	/* wait for SBL event */

	ret = wait_event_timeout(mhi_cntrl->state_event,

				 mhi_cntrl->ee == MHI_EE_BHIE ||

				 mhi_cntrl->ee == MHI_EE_SBL ||

				 MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state),

				 msecs_to_jiffies(mhi_cntrl->timeout_ms));

drivers/bus/mhi/core/mhi_init.c

+2 −3
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ const char * const mhi_ee_str[MHI_EE_MAX] = { 
	[MHI_EE_PBL] = "PBL",

	[MHI_EE_SBL] = "SBL",

	[MHI_EE_AMSS] = "AMSS",

	[MHI_EE_BHIE] = "BHIE",

	[MHI_EE_RDDM] = "RDDM",

	[MHI_EE_WFW] = "WFW",

	[MHI_EE_PTHRU] = "PASS THRU",

	[MHI_EE_EDL] = "EDL",

	[MHI_EE_DISABLE_TRANSITION] = "DISABLE",
@@ -38,8 +38,7 @@ const char * const mhi_state_tran_str[MHI_ST_TRANSITION_MAX] = { 
	[MHI_ST_TRANSITION_PBL] = "PBL",

	[MHI_ST_TRANSITION_READY] = "READY",

	[MHI_ST_TRANSITION_SBL] = "SBL",

	[MHI_ST_TRANSITION_AMSS] = "AMSS",

	[MHI_ST_TRANSITION_BHIE] = "BHIE",

	[MHI_ST_TRANSITION_MISSION_MODE] = "MISSION MODE",

};



const char * const mhi_state_str[MHI_STATE_MAX] = {

drivers/bus/mhi/core/mhi_internal.h

+4 −3
Original line number Diff line number Diff line
@@ -382,12 +382,13 @@ extern const char * const mhi_ee_str[MHI_EE_MAX]; 
#define MHI_IN_PBL(ee) (ee == MHI_EE_PBL || ee == MHI_EE_PTHRU || \

			ee == MHI_EE_EDL)



#define MHI_IN_MISSION_MODE(ee) (ee == MHI_EE_AMSS || ee == MHI_EE_WFW)



enum MHI_ST_TRANSITION {

	MHI_ST_TRANSITION_PBL,

	MHI_ST_TRANSITION_READY,

	MHI_ST_TRANSITION_SBL,

	MHI_ST_TRANSITION_AMSS,

	MHI_ST_TRANSITION_BHIE,

	MHI_ST_TRANSITION_MISSION_MODE,

	MHI_ST_TRANSITION_MAX,

};
@@ -480,9 +481,9 @@ enum mhi_ch_ee_mask { 
	MHI_CH_EE_PBL = BIT(MHI_EE_PBL),

	MHI_CH_EE_SBL = BIT(MHI_EE_SBL),

	MHI_CH_EE_AMSS = BIT(MHI_EE_AMSS),

	MHI_CH_EE_BHIE = BIT(MHI_EE_BHIE),

	MHI_CH_EE_RDDM = BIT(MHI_EE_RDDM),

	MHI_CH_EE_PTHRU = BIT(MHI_EE_PTHRU),

	MHI_CH_EE_WFW = BIT(MHI_EE_WFW),

	MHI_CH_EE_EDL = BIT(MHI_EE_EDL),

};

drivers/bus/mhi/core/mhi_main.c

+3 −4
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ static void mhi_create_time_sync_dev(struct mhi_controller *mhi_cntrl) 
	if (!mhi_tsync || !mhi_tsync->db)

		return;



	if (mhi_cntrl->ee != MHI_EE_AMSS)

	if (!MHI_IN_MISSION_MODE(mhi_cntrl->ee))

		return;



	mhi_dev = mhi_alloc_device(mhi_cntrl);
@@ -973,15 +973,14 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl, 
			case MHI_EE_SBL:

				st = MHI_ST_TRANSITION_SBL;

				break;

			case MHI_EE_WFW:

			case MHI_EE_AMSS:

				st = MHI_ST_TRANSITION_AMSS;

				st = MHI_ST_TRANSITION_MISSION_MODE;

				break;

			case MHI_EE_RDDM:

				mhi_cntrl->status_cb(mhi_cntrl,

						     mhi_cntrl->priv_data,

						     MHI_CB_EE_RDDM);

				/* fall thru to wake up the event */

			case MHI_EE_BHIE:

				write_lock_irq(&mhi_cntrl->pm_lock);

				mhi_cntrl->ee = event;

				write_unlock_irq(&mhi_cntrl->pm_lock);