Merge "msm: ipa: add empty implementation for iommu functions" (4f1f762f) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/platform/msm/ipa/ipa.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -209,6 +209,26 @@ enum ipa_smmu_cb_type {

		static struct ipa_smmu_cb_ctx smmu_cb[IPA_SMMU_CB_MAX];

		#if !defined(CONFIG_ARM_DMA_USE_IOMMU) && !defined(CONFIG_ARM64_DMA_USE_IOMMU)
		struct dma_iommu_mapping *
		arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base,
		size_t size)
		{
		return NULL;
		}

		void arm_iommu_release_mapping(struct dma_iommu_mapping *mapping) { }

		int arm_iommu_attach_device(struct device *dev,
		struct dma_iommu_mapping *mapping)
		{
		return 0;
		}

		void arm_iommu_detach_device(struct device *dev) { }
		#endif


		struct iommu_domain *ipa_get_smmu_domain(void)
		{
		if (smmu_cb[IPA_SMMU_CB_AP].valid) {

drivers/platform/msm/ipa/ipa_qmi_service.h

+35 −22

Original line number	Diff line number	Diff line
		@@ -58,18 +58,6 @@ struct rmnet_mux_val {
		uint32_t hdr_hdl;
		};

		int rmnet_ipa_poll_tethering_stats(struct wan_ioctl_poll_tethering_stats *data);
		int rmnet_ipa_set_data_quota(struct wan_ioctl_set_data_quota *data);
		void ipa_broadcast_quota_reach_ind(uint32_t mux_id);

		int ipa_qmi_get_data_stats(struct ipa_get_data_stats_req_msg_v01 *req,
		struct ipa_get_data_stats_resp_msg_v01 *resp);
		int ipa_qmi_get_network_stats(struct ipa_get_apn_data_stats_req_msg_v01 *req,
		struct ipa_get_apn_data_stats_resp_msg_v01 *resp);
		int ipa_qmi_set_data_quota(struct ipa_set_data_usage_quota_req_msg_v01 *req);
		int ipa_qmi_stop_data_qouta(void);
		void ipa_q6_handshake_complete(bool);

		extern struct elem_info ipa_init_modem_driver_req_msg_data_v01_ei[];
		extern struct elem_info ipa_init_modem_driver_resp_msg_data_v01_ei[];
		extern struct elem_info ipa_indication_reg_req_msg_data_v01_ei[];
		@@ -145,6 +133,24 @@ void wan_ioctl_deinit(void);

		void ipa_qmi_stop_workqueues(void);

		int rmnet_ipa_poll_tethering_stats(struct wan_ioctl_poll_tethering_stats *data);

		int rmnet_ipa_set_data_quota(struct wan_ioctl_set_data_quota *data);

		void ipa_broadcast_quota_reach_ind(uint32_t mux_id);

		int ipa_qmi_get_data_stats(struct ipa_get_data_stats_req_msg_v01 *req,
		struct ipa_get_data_stats_resp_msg_v01 *resp);

		int ipa_qmi_get_network_stats(struct ipa_get_apn_data_stats_req_msg_v01 *req,
		struct ipa_get_apn_data_stats_resp_msg_v01 *resp);

		int ipa_qmi_set_data_quota(struct ipa_set_data_usage_quota_req_msg_v01 *req);

		int ipa_qmi_stop_data_qouta(void);

		void ipa_q6_handshake_complete(bool ssr_bootup);

		#else /* CONFIG_RMNET_IPA */

		static inline int ipa_qmi_service_init(bool load_uc, uint32_t wan_platform_type)
		@@ -224,44 +230,51 @@ static inline int vote_for_bus_bw(uint32_t *bw_mbps)
		return -EPERM;
		}

		int rmnet_ipa_poll_tethering_stats(struct wan_ioctl_poll_tethering_stats *data)
		static inline int rmnet_ipa_poll_tethering_stats(
		struct wan_ioctl_poll_tethering_stats *data)
		{
		return -EPERM;
		}

		int rmnet_ipa_set_data_quota(struct wan_ioctl_set_data_quota *data)
		static inline int rmnet_ipa_set_data_quota(
		struct wan_ioctl_set_data_quota *data)
		{
		return -EPERM;
		}

		void ipa_broadcast_quota_reach_ind(uint8_t mux_id)
		static inline void ipa_broadcast_quota_reach_ind(uint32_t mux_id)
		{
		return;
		}

		int ipa_qmi_get_data_stats(struct ipa_get_data_stats_req_msg_v01 *req,
		struct ipa_get_data_stats_resp_msg_v01 *resp);
		static inline int ipa_qmi_get_data_stats(
		struct ipa_get_data_stats_req_msg_v01 *req,
		struct ipa_get_data_stats_resp_msg_v01 *resp)
		{
		return -EPERM;
		}

		int ipa_qmi_get_network_stats(struct ipa_get_apn_data_stats_req_msg_v01 *req,
		struct ipa_get_apn_data_stats_resp_msg_v01 *resp);
		static inline int ipa_qmi_get_network_stats(
		struct ipa_get_apn_data_stats_req_msg_v01 *req,
		struct ipa_get_apn_data_stats_resp_msg_v01 *resp)
		{
		return -EPERM;
		}

		int ipa_qmi_set_data_quota(struct ipa_set_network_quota_req_msg_v01 *req)
		static inline int ipa_qmi_set_data_quota(
		struct ipa_set_data_usage_quota_req_msg_v01 *req)
		{
		return -EPERM;
		}

		int ipa_qmi_stop_data_qouta(void)
		static inline int ipa_qmi_stop_data_qouta(void)
		{
		return -EPERM;
		}

		void ipa_q6_handshake_complete(bool)
		static inline void ipa_q6_handshake_complete(bool ssr_bootup)
		{
		return;
		}
		#endif /* CONFIG_RMNET_IPA */