Merge "msm: ipa3: add support for MHI RESET" (10e9b11d) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/platform/msm/ipa/ipa_api.c

+2 −8

Original line number	Diff line number	Diff line
		@@ -2258,17 +2258,11 @@ EXPORT_SYMBOL(ipa_mhi_resume);
		*
		* This function is called by MHI client driver on MHI reset to destroy all IPA
		* MHI resources.
		*
		* Return codes: 0 : success
		* negative : error
		*/
		int ipa_mhi_destroy(void)
		void ipa_mhi_destroy(void)
		{
		int ret;

		IPA_API_DISPATCH_RETURN(ipa_mhi_destroy);
		IPA_API_DISPATCH(ipa_mhi_destroy);

		return ret;
		}
		EXPORT_SYMBOL(ipa_mhi_destroy);

+1 −1

Original line number	Diff line number	Diff line
		@@ -273,7 +273,7 @@ struct ipa_api_controller {

		int (*ipa_mhi_resume)(void);

		int (*ipa_mhi_destroy)(void);
		void (*ipa_mhi_destroy)(void);

		int (ipa_write_qmap_id)(struct ipa_ioc_write_qmapid param_in);

+1 −1

Original line number	Diff line number	Diff line
		@@ -1743,7 +1743,7 @@ int ipa2_mhi_suspend(bool force);

		int ipa2_mhi_resume(void);

		int ipa2_mhi_destroy(void);
		void ipa2_mhi_destroy(void);

		/*
		* mux id

+2 −6

Original line number	Diff line number	Diff line
		@@ -1817,24 +1817,20 @@ fail_resume_dl_channels:
		*
		* This function is called by MHI client driver on MHI reset to destroy all IPA
		* MHI resources.
		*
		* Return codes: 0 : success
		* negative : error
		*/
		int ipa2_mhi_destroy(void)
		void ipa2_mhi_destroy(void)
		{
		IPA_MHI_FUNC_ENTRY();

		if (unlikely(!ipa_mhi_ctx)) {
		IPA_MHI_ERR("IPA MHI was not initialized\n");
		return -EINVAL;
		return;
		}

		IPAERR("Not implemented Yet!\n");
		ipa_mhi_debugfs_destroy();

		IPA_MHI_FUNC_EXIT();
		return -EPERM;
		}

		/**

+2 −1

Original line number	Diff line number	Diff line
		@@ -2005,7 +2005,7 @@ int ipa3_mhi_suspend(bool force);

		int ipa3_mhi_resume(void);

		int ipa3_mhi_destroy(void);
		void ipa3_mhi_destroy(void);

		/*
		* mux id
		@@ -2227,6 +2227,7 @@ void ipa3_dma_async_memcpy_notify_cb(void *priv,
		int ipa3_uc_update_hw_flags(u32 flags);

		int ipa3_uc_mhi_init(void (ready_cb)(void), void (wakeup_request_cb)(void));
		void ipa3_uc_mhi_cleanup(void);
		int ipa3_uc_mhi_send_dl_ul_sync_info(union IpaHwMhiDlUlSyncCmdData_t cmd);
		int ipa3_uc_mhi_init_engine(struct ipa_mhi_msi_info *msi, u32 mmio_addr,
		u32 host_ctrl_addr, u32 host_data_addr, u32 first_ch_idx,