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

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

Merge "msm: ipa3: Add retry attempts for subsystem loading"

parents 8e10232f e0f12e04

drivers/platform/msm/ipa/ipa_v3/ipa.c

+19 −11
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
#endif



#define DRV_NAME "ipa"



#define DELAY_BEFORE_FW_LOAD 500

#define IPA_SUBSYSTEM_NAME "ipa_fws"

#define IPA_UC_SUBSYSTEM_NAME "ipa_uc"
@@ -126,6 +126,7 @@ static int ipa3_alloc_pkt_init(void); 


static void ipa3_load_ipa_fw(struct work_struct *work);

static DECLARE_WORK(ipa3_fw_loading_work, ipa3_load_ipa_fw);

static DECLARE_DELAYED_WORK(ipa3_fw_load_failure_handle, ipa3_load_ipa_fw);



static void ipa_dec_clients_disable_clks_on_wq(struct work_struct *work);

static DECLARE_DELAYED_WORK(ipa_dec_clients_disable_clks_on_wq_work,
@@ -6812,13 +6813,15 @@ static void ipa3_load_ipa_fw(struct work_struct *work) 
	IPADBG("Entry\n");



	IPA_ACTIVE_CLIENTS_INC_SIMPLE();



	if(!ipa3_ctx->ipa_pil_load)

	{

		result = ipa3_attach_to_smmu();

		if (result) {

			IPAERR("IPA attach to smmu failed %d\n", result);

			IPA_ACTIVE_CLIENTS_DEC_SIMPLE();

			return;

		}

	}



	if (ipa3_ctx->ipa3_hw_mode != IPA_HW_MODE_EMULATION &&

	    ((ipa3_ctx->platform_type != IPA_PLAT_TYPE_MDM) ||
@@ -6836,13 +6839,18 @@ static void ipa3_load_ipa_fw(struct work_struct *work) 
		result = ipa3_manual_load_ipa_fws();

	}



	IPA_ACTIVE_CLIENTS_DEC_SIMPLE();



	if (result) {

		IPAERR("IPA FW loading process has failed result=%d\n",

			result);



		ipa3_ctx->ipa_pil_load++;

		IPA_ACTIVE_CLIENTS_DEC_SIMPLE();

		IPADBG("IPA firmware loading deffered to a work queue\n");

		queue_delayed_work(ipa3_ctx->transport_power_mgmt_wq,

			&ipa3_fw_load_failure_handle,

			msecs_to_jiffies(DELAY_BEFORE_FW_LOAD));

		return;

	}

	IPA_ACTIVE_CLIENTS_DEC_SIMPLE();

	mutex_lock(&ipa3_ctx->fw_load_data.lock);

	ipa3_ctx->fw_load_data.state = IPA_FW_LOAD_STATE_LOADED;

	mutex_unlock(&ipa3_ctx->fw_load_data.lock);
@@ -6902,7 +6910,7 @@ static void ipa_fw_load_sm_handle_event(enum ipa_fw_load_event ev) 
		if (ipa3_ctx->fw_load_data.state == IPA_FW_LOAD_STATE_INIT) {

			ipa3_ctx->fw_load_data.state =

				IPA_FW_LOAD_STATE_SMMU_DONE;

			goto out;

			goto sched_fw_load;

		}

		if (ipa3_ctx->fw_load_data.state ==

			IPA_FW_LOAD_STATE_FWFILE_READY) {

drivers/platform/msm/ipa/ipa_v3/ipa_i.h

+2 −0
Original line number Diff line number Diff line
@@ -2155,6 +2155,8 @@ struct ipa3_context { 
	bool modem_load_ipa_fw;

	bool fnr_stats_not_supported;

	bool is_device_crashed;

	int ipa_pil_load;



};



struct ipa3_plat_drv_res {