Merge "msm: ipa3: make function names consistent with ipav2" (0130e341) · Commits · e / devices / android_kernel_xiaomi_markw

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -2013,13 +2013,13 @@ static int ipa3_q6_set_ex_path_to_apps(void)
		}

		/**
		* ipa3_q6_cleanup() - A cleanup for all Q6 related configuration
		* ipa3_q6_pre_shutdown_cleanup() - A cleanup for all Q6 related configuration
		* in IPA HW. This is performed in case of SSR.
		*
		* This is a mandatory procedure, in case one of the steps fails, the
		* AP needs to restart.
		*/
		void ipa3_q6_cleanup(void)
		void ipa3_q6_pre_shutdown_cleanup(void)
		{
		IPADBG_LOW("ENTER\n");

		@@ -2045,13 +2045,13 @@ void ipa3_q6_cleanup(void)
		}

		/*
		* ipa3_validate_q6_gsi_channel_empty() - Check if GSI channel related to Q6
		* producer client is empty. This is used in case of SSR.
		* ipa3_q6_post_shutdown_cleanup() - As part of this cleanup
		* check if GSI channel related to Q6 producer client is empty.
		*
		* Q6 GSI channel emptiness is needed to garantee no descriptors with invalid
		* info are injected into IPA RX from IPA_IF, while modem is restarting.
		*/
		void ipa3_validate_q6_gsi_channel_empty(void)
		void ipa3_q6_post_shutdown_cleanup(void)
		{
		int client_idx;

+2 −2

Original line number	Diff line number	Diff line
		@@ -2159,8 +2159,8 @@ int ipa3_write_qmapid_wdi_pipe(u32 clnt_hdl, u8 qmap_id);
		int ipa3_tag_process(struct ipa3_desc *desc, int num_descs,
		unsigned long timeout);

		void ipa3_q6_cleanup(void);
		void ipa3_validate_q6_gsi_channel_empty(void);
		void ipa3_q6_pre_shutdown_cleanup(void);
		void ipa3_q6_post_shutdown_cleanup(void);
		int ipa3_init_q6_smem(void);

		int ipa3_sps_connect_safe(struct sps_pipe h, struct sps_connect connect,

+2 −2

Original line number	Diff line number	Diff line
		@@ -2297,7 +2297,7 @@ static int ipa3_ssr_notifier_cb(struct notifier_block *this,
		case SUBSYS_BEFORE_SHUTDOWN:
		IPAWANINFO("IPA received MPSS BEFORE_SHUTDOWN\n");
		atomic_set(&rmnet_ipa3_ctx->is_ssr, 1);
		ipa3_q6_cleanup();
		ipa3_q6_pre_shutdown_cleanup();
		if (IPA_NETDEV())
		netif_stop_queue(IPA_NETDEV());
		ipa3_qmi_stop_workqueues();
		@@ -2310,7 +2310,7 @@ static int ipa3_ssr_notifier_cb(struct notifier_block *this,
		case SUBSYS_AFTER_SHUTDOWN:
		IPAWANINFO("IPA Received MPSS AFTER_SHUTDOWN\n");
		if (atomic_read(&rmnet_ipa3_ctx->is_ssr))
		ipa3_validate_q6_gsi_channel_empty();
		ipa3_q6_post_shutdown_cleanup();
		IPAWANINFO("IPA AFTER_SHUTDOWN handling is complete\n");
		break;
		case SUBSYS_BEFORE_POWERUP: