Merge "msm:ipa:mhi: send qmi endp_desc notification to Q6" (3fd2e037) · Commits · e / devices / android_kernel_xiaomi_nabu

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

+42 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2019 The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2020 The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -60,8 +60,8 @@
		#define IPA_MHI_FUNC_EXIT() \
		IPA_MHI_DBG("EXIT\n")

		#define IPA_MHI_MAX_UL_CHANNELS 1
		#define IPA_MHI_MAX_DL_CHANNELS 2
		#define IPA_MHI_MAX_UL_CHANNELS 2
		#define IPA_MHI_MAX_DL_CHANNELS 3

		/* bit #40 in address should be asserted for MHI transfers over pcie */
		#define IPA_MHI_HOST_ADDR_COND(addr) \
		@@ -106,6 +106,33 @@ bool ipa3_mhi_stop_gsi_channel(enum ipa_client_type client)
		return false;
		}

		static int ipa3_mhi_send_endp_ind_to_modem(void)
		{
		struct ipa_endp_desc_indication_msg_v01 req;
		struct ipa_ep_id_type_v01 *ep_info;
		int ipa_mhi_prod_ep_idx =
		ipa3_get_ep_mapping(IPA_CLIENT_MHI_LOW_LAT_PROD);
		int ipa_mhi_cons_ep_idx =
		ipa3_get_ep_mapping(IPA_CLIENT_MHI_LOW_LAT_CONS);

		memset(&req, 0, sizeof(struct ipa_endp_desc_indication_msg_v01));
		req.ep_info_len = 2;
		req.ep_info_valid = true;
		req.num_eps_valid = true;
		req.num_eps = 2;
		ep_info = &req.ep_info[0];
		ep_info->ep_id = ipa_mhi_cons_ep_idx;
		ep_info->ic_type = DATA_IC_TYPE_MHI_V01;
		ep_info->ep_type = DATA_EP_DESC_TYPE_EMB_FLOW_CTL_PROD_V01;
		ep_info->ep_status = DATA_EP_STATUS_CONNECTED_V01;
		ep_info = &req.ep_info[1];
		ep_info->ep_id = ipa_mhi_prod_ep_idx;
		ep_info->ic_type = DATA_IC_TYPE_MHI_V01;
		ep_info->ep_type = DATA_EP_DESC_TYPE_EMB_FLOW_CTL_CONS_V01;
		ep_info->ep_status = DATA_EP_STATUS_CONNECTED_V01;
		return ipa3_qmi_send_endp_desc_indication(&req);
		}

		static int ipa3_mhi_reset_gsi_channel(enum ipa_client_type client)
		{
		int res;
		@@ -532,6 +559,10 @@ int ipa3_connect_mhi_pipe(struct ipa_mhi_connect_params_internal *in,
		int ipa_ep_idx;
		int res;
		enum ipa_client_type client;
		int ipa_mhi_prod_ep_idx =
		ipa3_get_ep_mapping(IPA_CLIENT_MHI_LOW_LAT_PROD);
		int ipa_mhi_cons_ep_idx =
		ipa3_get_ep_mapping(IPA_CLIENT_MHI_LOW_LAT_CONS);

		IPA_MHI_FUNC_ENTRY();

		@@ -577,6 +608,14 @@ int ipa3_connect_mhi_pipe(struct ipa_mhi_connect_params_internal *in,
		ipa3_ctx->skip_ep_cfg_shadow[ipa_ep_idx] = ep->skip_ep_cfg;
		IPA_MHI_DBG("client %d (ep: %d) connected\n", client, ipa_ep_idx);

		if ((client == IPA_CLIENT_MHI_LOW_LAT_PROD \|\|
		client == IPA_CLIENT_MHI_LOW_LAT_CONS) &&
		ipa_mhi_prod_ep_idx != -1 &&
		ipa3_ctx->ep[ipa_mhi_prod_ep_idx].valid &&
		ipa_mhi_cons_ep_idx != -1 &&
		ipa3_ctx->ep[ipa_mhi_cons_ep_idx].valid)
		ipa3_mhi_send_endp_ind_to_modem();

		IPA_MHI_FUNC_EXIT();

		return 0;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2330,7 +2330,7 @@ int ipa3_qmi_send_mhi_cleanup_request(struct ipa_mhi_cleanup_req_msg_v01 *req)
		resp.resp.error, "ipa_mhi_cleanup_req_msg");
		}

		int ipa3_qmi_send_rsc_pipe_indication(
		int ipa3_qmi_send_endp_desc_indication(
		struct ipa_endp_desc_indication_msg_v01 *req)
		{
		IPAWANDBG("Sending QMI_IPA_ENDP_DESC_INDICATION_V01\n");

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -349,7 +349,7 @@ int ipa3_qmi_get_per_client_packet_stats(
		int ipa3_qmi_send_mhi_ready_indication(
		struct ipa_mhi_ready_indication_msg_v01 *req);

		int ipa3_qmi_send_rsc_pipe_indication(
		int ipa3_qmi_send_endp_desc_indication(
		struct ipa_endp_desc_indication_msg_v01 *req);

		int ipa3_qmi_send_mhi_cleanup_request(struct ipa_mhi_cleanup_req_msg_v01 *req);
		@@ -494,13 +494,11 @@ static inline int ipa3_qmi_send_mhi_ready_indication(
		return -EPERM;
		}

		#ifdef CONFIG_RMNET_IPA3
		static int ipa3_qmi_send_rsc_pipe_indication(
		static inline int ipa3_qmi_send_endp_desc_indication(
		struct ipa_endp_desc_indication_msg_v01 *req)
		{
		return -EPERM;
		}
		#endif /* CONFIG_RMNET_IPA3 */

		static inline int ipa3_qmi_send_mhi_cleanup_request(
		struct ipa_mhi_cleanup_req_msg_v01 *req)

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1503,7 +1503,7 @@ static int ipa_send_rsc_pipe_ind_to_modem(void)
		ep_info->ic_type = DATA_IC_TYPE_AP_V01;
		ep_info->ep_type = DATA_EP_DESC_TYPE_RSC_PROD_V01;
		ep_info->ep_status = DATA_EP_STATUS_CONNECTED_V01;
		return ipa3_qmi_send_rsc_pipe_indication(&req);
		return ipa3_qmi_send_endp_desc_indication(&req);
		}

		static int handle3_ingress_format(struct net_device *dev,