Commit 3e60c9f0 authored by Bhaumik Bhatt's avatar Bhaumik Bhatt Committed by Greg Kroah-Hartman
Browse files

bus: mhi: core: Use macros for execution environment features 

The implementation for execution environment specific functionality
is spread out. Use macros that help determine the paths to be taken.

Link: https://lore.kernel.org/r/1636409978-31847-1-git-send-email-quic_bbhatt@quicinc.com


Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: default avatarBhaumik Bhatt <bbhatt@codeaurora.org>
Signed-off-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20211216081227.237749-4-manivannan.sadhasivam@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f77097ec

drivers/bus/mhi/core/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl) 
	}



	/* wait for ready on pass through or any other execution environment */

	if (mhi_cntrl->ee != MHI_EE_EDL && mhi_cntrl->ee != MHI_EE_PBL)

	if (!MHI_FW_LOAD_CAPABLE(mhi_cntrl->ee))

		goto fw_load_ready_state;



	fw_name = (mhi_cntrl->ee == MHI_EE_EDL) ?

drivers/bus/mhi/core/internal.h

+2 −1
Original line number Diff line number Diff line
@@ -390,7 +390,8 @@ 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_POWER_UP_CAPABLE(ee) (MHI_IN_PBL(ee) || ee == MHI_EE_AMSS)

#define MHI_FW_LOAD_CAPABLE(ee) (ee == MHI_EE_PBL || ee == MHI_EE_EDL)

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

				 ee == MHI_EE_FP)

drivers/bus/mhi/core/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ int mhi_async_power_up(struct mhi_controller *mhi_cntrl) 
	write_unlock_irq(&mhi_cntrl->pm_lock);



	/* Confirm that the device is in valid exec env */

	if (!MHI_IN_PBL(current_ee) && current_ee != MHI_EE_AMSS) {

	if (!MHI_POWER_UP_CAPABLE(current_ee)) {

		dev_err(dev, "%s is not a valid EE for power on\n",

			TO_MHI_EXEC_STR(current_ee));

		ret = -EIO;