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

Commit 219b3fb4 authored by Mohit Sharma's avatar Mohit Sharma
Browse files

Revert "msm: ipa4: Adding changes to support load new GSI FW" 



This reverts commit 1e2f579c.

Change-Id: I7956dff315aeb857992e075d6c6d8c53773c9fb7
Signed-off-by: default avatarMohit Sharma <smohit@codeaurora.org>
parent db56eecb

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

+5 −47
Original line number Diff line number Diff line
@@ -6160,19 +6160,10 @@ static void ipa3_load_ipa_fw(struct work_struct *work) 


	if (ipa3_ctx->ipa3_hw_mode != IPA_HW_MODE_EMULATION &&

	    ((ipa3_ctx->platform_type != IPA_PLAT_TYPE_MDM) ||

	    (ipa3_ctx->ipa_hw_type >= IPA_HW_v3_5))) {

		/* some targets sharing same lunch option but

		 * using different signing images, adding support to

		 * load specific FW image to based on dt entry.

		 */

		if (ipa3_ctx->gsi_fw_file_name)

			result = ipa3_pil_load_ipa_fws(

						ipa3_ctx->gsi_fw_file_name);

		else

	    (ipa3_ctx->ipa_hw_type >= IPA_HW_v3_5)))

		result = ipa3_pil_load_ipa_fws(IPA_SUBSYSTEM_NAME);

	} else {

	else

		result = ipa3_manual_load_ipa_fws();

	}



	IPA_ACTIVE_CLIENTS_DEC_SIMPLE();
@@ -6198,10 +6189,6 @@ static void ipa3_load_ipa_fw(struct work_struct *work) 
		/* Unvoting will happen when uC loaded event received. */

		ipa3_proxy_clk_vote();



		if (ipa3_ctx->uc_fw_file_name)

			result = ipa3_pil_load_ipa_fws(

						ipa3_ctx->uc_fw_file_name);

		else

		result = ipa3_pil_load_ipa_fws(IPA_UC_SUBSYSTEM_NAME);

		if (result) {

			IPAERR("IPA uC loading process has failed result=%d\n",
@@ -6555,24 +6542,6 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
		resource_p->do_ram_collection_on_crash;

	ipa3_ctx->lan_rx_napi_enable = resource_p->lan_rx_napi_enable;



	if (resource_p->gsi_fw_file_name) {

		ipa3_ctx->gsi_fw_file_name =

			kzalloc(((strlen(resource_p->gsi_fw_file_name)+1) *

				sizeof(const char)), GFP_KERNEL);

		memcpy(ipa3_ctx->gsi_fw_file_name,

				(void const *)resource_p->gsi_fw_file_name,

				strlen(resource_p->gsi_fw_file_name));

	}



	if (resource_p->uc_fw_file_name) {

		ipa3_ctx->uc_fw_file_name =

			kzalloc(((strlen(resource_p->uc_fw_file_name)+1) *

				sizeof(const char)), GFP_KERNEL);

		memcpy(ipa3_ctx->uc_fw_file_name,

			(void const *)resource_p->uc_fw_file_name,

			strlen(resource_p->uc_fw_file_name));

	}



	if (ipa3_ctx->secure_debug_check_action == USE_SCM) {

		if (ipa_is_mem_dump_allowed())

			ipa3_ctx->sd_state = SD_ENABLED;
@@ -7342,18 +7311,7 @@ static int get_ipa_dts_configuration(struct platform_device *pdev, 
	IPADBG(": Enable LAN rx NAPI = %s\n",

		ipa_drv_res->lan_rx_napi_enable

		? "True" : "False");

	result = of_property_read_string(pdev->dev.of_node,

			"qcom,use-gsi-ipa-fw", &ipa_drv_res->gsi_fw_file_name);

	if (!result)

		IPADBG("GSI IPA FW using %s\n", ipa_drv_res->gsi_fw_file_name);

	else

		IPADBG("GSI IPA FW file not defined using default one\n");

	result = of_property_read_string(pdev->dev.of_node,

			"qcom,use-uc-ipa-fw", &ipa_drv_res->uc_fw_file_name);

	if (!result)

		IPADBG("uC IPA FW using = %s\n", ipa_drv_res->uc_fw_file_name);

	else

		IPADBG("uC IPA FW file not defined using default one\n");



	/* Get IPA wrapper address */

	resource = platform_get_resource_byname(pdev, IORESOURCE_MEM,

			"ipa-base");

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

+0 −6
Original line number Diff line number Diff line
@@ -1841,8 +1841,6 @@ struct ipa3_app_clock_vote { 
 * @lan_ndev: dummy netdev for LAN rx NAPI

 * @napi_lan_rx: NAPI object for LAN rx

 * @coal_cmd_pyld: holds the coslescing close frame command payload

 * @gsi_fw_file_name: GSI IPA fw file name

 * @uc_fw_file_name: uC IPA fw file name

 */

struct ipa3_context {

	struct ipa3_char_device_context cdev;
@@ -2016,8 +2014,6 @@ struct ipa3_context { 
	struct napi_struct napi_lan_rx;

	struct ipahal_imm_cmd_pyld *coal_cmd_pyld;

	struct ipa3_app_clock_vote app_clock_vote;

	char *gsi_fw_file_name;

	char *uc_fw_file_name;

};



struct ipa3_plat_drv_res {
@@ -2066,8 +2062,6 @@ struct ipa3_plat_drv_res { 
	bool ipa_endp_delay_wa;

	bool skip_ieob_mask_wa;

	bool ipa_wan_skb_page;

	const char *gsi_fw_file_name;

	const char *uc_fw_file_name;

};



/**