msm: ipa: Move the QMI for mhi pipe info to modem bootup

In Q6 standalone ssr, the mhi host is not aware of the ssr
so it will not stop/start the channel. In this case, the QMI
won't be send again so that Q6 will lose the pipe info.

The fix here is to move the QMI to modem bootup routine so
after ssr, this qmi would be sent again.

Change-Id: I3c9e4830359f05bc9ab729ffca30a1a0bcba7407
Signed-off-by: Bojun Pan <[email protected]>

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

@@ -14,7 +14,6 @@
 #include "gsi.h"
 #include "ipa_common_i.h"
 #include "ipa_i.h"
-#include "ipa_qmi_service.h"
 
 #define IPA_MHI_DRV_NAME "ipa_mhi"
 
@@ -101,33 +100,6 @@ bool ipa3_mhi_stop_gsi_channel(enum ipa_client_type client)
 }
 EXPORT_SYMBOL(ipa3_mhi_stop_gsi_channel);
 
-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;
@@ -542,10 +514,6 @@ 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();
 
@@ -591,14 +559,6 @@ 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/rmnet_ipa.c

@@ -1419,6 +1419,34 @@ static void apps_ipa_packet_receive_notify(void *priv,
 	}
 }
 
+/* Send MHI endpoint info to modem using QMI indication message */
+static int ipa_send_mhi_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);
+}
+
 /* Send RSC endpoint info to modem using QMI indication message */
 static int ipa_send_wan_pipe_ind_to_modem(int ingress_eps_mask)
 {
@@ -1463,7 +1491,7 @@ static int ipa_send_wan_pipe_ind_to_modem(int ingress_eps_mask)
 	}
 
 	if (req.num_eps > 0)
-		return ipa3_qmi_send_wan_pipe_indication(&req);
+		return ipa3_qmi_send_endp_desc_indication(&req);
 	else
 		return 0;
 }
@@ -4256,8 +4284,7 @@ void ipa3_q6_handshake_complete(bool ssr_bootup)
 		 */
 		rmnet_ipa_get_network_stats_and_update();
 	}
-
-	imp_handle_modem_ready();
+		imp_handle_modem_ready();
 }
 
 static inline bool rmnet_ipa3_check_any_client_inited