msm: ipa: Update filter idx in indication when add/ remove fails

Changes to update filter index to failure indication, when wdi filter
add/remove fails from  ipa driver layer

Change-Id: I3b590594befe252913dde43fe408a4cd96b9249c
Signed-off-by: Chaitanya Pratapa <[email protected]>

drivers/platform/msm/ipa/ipa_clients/ipa_wdi3.c

@@ -61,6 +61,7 @@ struct ipa_wdi_opt_dpath_info {
 	ipa_wdi_opt_dpath_flt_rem_cb flt_rem_cb;
 	u32 q6_rtng_table_index;
 	u32 hdr_len;
+	atomic_t rsrv_req;
 };
 
 struct ipa_wdi_context {
@@ -1127,10 +1128,10 @@ int ipa_wdi_opt_dpath_rsrv_filter_req(
 
 	if (!ipa_wdi_ctx_list[0]->opt_dpath_info.flt_rsrv_cb)
 	{
-		IPAERR("filter resserve cb not registered");
+		IPAERR("filter reserve cb not registered");
 		resp->resp.result = IPA_QMI_RESULT_FAILURE_V01;
 		resp->resp.error = IPA_QMI_ERR_INTERNAL_V01;
-		return -1;
+		return -EPERM;
 	}
 
 	if (ipa_wdi_ctx_list[0]->wdi_version >= IPA_WDI_3) {
@@ -1150,7 +1151,7 @@ int ipa_wdi_opt_dpath_rsrv_filter_req(
 		IPA_WDI_ERR("Either TX/RX ep is not configured. \n");
 		resp->resp.result = IPA_QMI_RESULT_FAILURE_V01;
 		resp->resp.error = IPA_QMI_ERR_INTERNAL_V01;
-		return -EFAULT;
+		return -EPERM;
 	}
 
 	IPADBG("ep_tx = %d\n", ipa_ep_idx_tx);
@@ -1173,6 +1174,8 @@ int ipa_wdi_opt_dpath_rsrv_filter_req(
 
 	if (!ret) {
 
+		atomic_set(&ipa_wdi_ctx_list[0]->opt_dpath_info.rsrv_req, 1);
+
 		ipa_wdi_ctx_list[0]->opt_dpath_info.q6_rtng_table_index =
 			req->q6_rtng_table_index;
 
@@ -1214,6 +1217,7 @@ int ipa_wdi_opt_dpath_add_filter_req(
 		IPA_WDI_ERR("wdi ctx is not initialized.\n");
 		ind->filter_add_status.result = IPA_QMI_RESULT_FAILURE_V01;
 		ind->filter_add_status.error = IPA_QMI_ERR_INTERNAL_V01;
+		ind->filter_idx = req->filter_idx;
 		return -EPERM;
 	}
 
@@ -1221,7 +1225,8 @@ int ipa_wdi_opt_dpath_add_filter_req(
 		IPAERR("filter add cb not registered");
 		ind->filter_add_status.result = IPA_QMI_RESULT_FAILURE_V01;
 		ind->filter_add_status.error = IPA_QMI_ERR_INTERNAL_V01;
-		return -1;
+		ind->filter_idx = req->filter_idx;
+		return -EPERM;
 	}
 
 	if (req->ip_type != QMI_IPA_IP_TYPE_V4_V01 &&
@@ -1229,6 +1234,7 @@ int ipa_wdi_opt_dpath_add_filter_req(
 		IPAERR("Invalid IP Type: %d\n", req->ip_type);
 		ind->filter_add_status.result = IPA_QMI_RESULT_FAILURE_V01;
 		ind->filter_add_status.error = IPA_QMI_ERR_INTERNAL_V01;
+		ind->filter_idx = req->filter_idx;
 		return -1;
 	}
 
@@ -1297,17 +1303,19 @@ int ipa_wdi_opt_dpath_remove_filter_req(
 
 	if (!ipa_wdi_ctx_list[0]) {
 		IPA_WDI_ERR("wdi ctx is not initialized.\n");
-		ind->filter_removal_status.result = IPA_QMI_RESULT_FAILURE_V01;
-		ind->filter_removal_status.error = IPA_QMI_ERR_INTERNAL_V01;
+		ind->filter_removal_status.result = IPA_QMI_RESULT_SUCCESS_V01;
+		ind->filter_removal_status.error = IPA_QMI_ERR_NONE_V01;
+		ind->filter_idx = req->filter_idx;
 		return -EPERM;
 	}
 
 	if (!ipa_wdi_ctx_list[0]->opt_dpath_info.flt_rem_cb)
 	{
-		IPAERR("filter add cb not registered");
-		ind->filter_removal_status.result = IPA_QMI_RESULT_FAILURE_V01;
-		ind->filter_removal_status.error = IPA_QMI_ERR_INTERNAL_V01;
-		return -1;
+		IPAERR("filter remove cb not registered");
+		ind->filter_removal_status.result = IPA_QMI_RESULT_SUCCESS_V01;
+		ind->filter_removal_status.error = IPA_QMI_ERR_NONE_V01;
+		ind->filter_idx = req->filter_idx;
+		return -EPERM;
 	}
 
 	flt_rem_req.num_tuples = 1;
@@ -1349,19 +1357,24 @@ int ipa_wdi_opt_dpath_remove_all_filter_req(
 
 	if (!ipa_wdi_ctx_list[0]) {
 		IPA_WDI_ERR("wdi ctx is not initialized.\n");
-		resp->resp.result = IPA_QMI_RESULT_FAILURE_V01;
-		resp->resp.error = IPA_QMI_ERR_INTERNAL_V01;
 		return -EPERM;
 	}
 
 	if (!ipa_wdi_ctx_list[0]->opt_dpath_info.flt_rsrv_rel_cb)
 	{
-		IPAERR("filter add cb not registered");
-		resp->resp.result = IPA_QMI_RESULT_FAILURE_V01;
-		resp->resp.error = IPA_QMI_ERR_INTERNAL_V01;
-		return -1;
+		IPAERR("filter release cb not registered");
+		return -EPERM;
 	}
 
+
+	if (!atomic_read(&ipa_wdi_ctx_list[0]->opt_dpath_info.rsrv_req))
+	{
+		IPAERR("Reservation request not sent. IGNORE");
+		return 0;
+	}
+
+	atomic_set(&ipa_wdi_ctx_list[0]->opt_dpath_info.rsrv_req, 0);
+
 	ret =
 		ipa_wdi_ctx_list[0]->opt_dpath_info.flt_rsrv_rel_cb(
 			ipa_wdi_ctx_list[0]->priv);
@@ -1378,7 +1391,7 @@ int ipa_wdi_opt_dpath_remove_all_filter_req(
 
 	if (ipa_ep_idx_rx <= 0) {
 		IPA_WDI_ERR("Either RX ep is not configured. \n");
-		return -EFAULT;
+		return 0;
 	}
 
 	ipa3_disable_wdi3_opt_dpath(ipa_ep_idx_rx);

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

@@ -5453,15 +5453,10 @@ void ipa3_q6_pre_shutdown_cleanup(void)
 
 		struct ipa_wlan_opt_dp_remove_all_filter_req_msg_v01 req;
 		struct ipa_wlan_opt_dp_remove_all_filter_resp_msg_v01 resp;
-		int rc = 0 ;
 
 		memset(&req, 0, sizeof(struct ipa_wlan_opt_dp_remove_all_filter_req_msg_v01));
 
-		rc = ipa_wdi_opt_dpath_remove_all_filter_req(&req, &resp);
-		if (rc < 0)
-			IPAWANERR("Remove all filter rules failed\n");
-		else
-			IPAWANDBG("Remove all filter successful\n");
+		ipa_wdi_opt_dpath_remove_all_filter_req(&req, &resp);
 	}
 
 	if (ipa3_q6_clean_q6_tables()) {

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

@@ -1690,11 +1690,13 @@ static void ipa3_handle_ipa_wlan_opt_dp_rsrv_filter_req(struct qmi_handle *qmi_h
 	const void *decoded_msg)
 {
 	struct ipa_wlan_opt_dp_rsrv_filter_resp_msg_v01 resp;
+	struct ipa_wlan_opt_dp_rsrv_filter_complt_ind_msg_v01 ind;
 	struct ipa_wlan_opt_dp_rsrv_filter_req_msg_v01 *req =
 		(struct ipa_wlan_opt_dp_rsrv_filter_req_msg_v01 *)decoded_msg;
-	int rc = 0 ;
+	int rc = 0, rc1 = 0;
 
 	memset(&resp, 0, sizeof(resp));
+	memset(&ind, 0, sizeof(ind));
 
 	IPAWANDBG("rsrv_filter_req: num_fltrs %d, timeout_val %d, rtng_table %d\n",
 		req->num_filters, req->timeout_val_ms, req->q6_rtng_table_index);
@@ -1704,16 +1706,22 @@ static void ipa3_handle_ipa_wlan_opt_dp_rsrv_filter_req(struct qmi_handle *qmi_h
 	IPAWANDBG("qmi_snd_rsp: result %d, err %d\n",
 		resp.resp.result, resp.resp.error);
 
-	rc = qmi_send_response(qmi_handle, sq, txn,
+	rc1 = qmi_send_response(qmi_handle, sq, txn,
 		QMI_IPA_WLAN_OPT_DATAPATH_RSRV_FILTER_RESP_V01,
 		IPA_WLAN_OPT_DP_RSRV_FILTER_RESP_MSG_V01_MAX_MSG_LEN,
 		ipa_wlan_opt_dp_rsrv_filter_resp_msg_data_v01_ei,
 		&resp);
 
-	if (rc < 0)
+	if (rc1 < 0)
 		IPAWANERR("Reserve filter rules response failed\n");
 	else
 		IPAWANDBG("Replied to install filter request\n");
+
+	/* If rsrv filter request, fails, send indication immediately. */
+	if (rc < 0) {
+		ind.rsrv_filter_status = resp.resp;
+		ipa3_qmi_send_wdi_opt_dpath_rsrv_flt_ind(&ind);
+	}
 }
 
 static void ipa3_handle_ipa_wlan_opt_dp_remove_all_filter_req(struct qmi_handle *qmi_handle,
@@ -1722,9 +1730,11 @@ static void ipa3_handle_ipa_wlan_opt_dp_remove_all_filter_req(struct qmi_handle
 	const void *decoded_msg)
 {
 	struct ipa_wlan_opt_dp_remove_all_filter_resp_msg_v01 resp;
-	int rc = 0 ;
+	struct ipa_wlan_opt_dp_remove_all_filter_complt_ind_msg_v01 ind;
+	int rc = 0, rc1 = 0;
 
 	memset(&resp, 0, sizeof(resp));
+	memset(&ind, 0, sizeof(ind));
 
 	IPAWANDBG("remove_all_filter_req:\n");
 
@@ -1734,16 +1744,23 @@ static void ipa3_handle_ipa_wlan_opt_dp_remove_all_filter_req(struct qmi_handle
 	IPAWANDBG("qmi_snd_rsp: result %d, err %d\n",
 		resp.resp.result, resp.resp.error);
 
-	rc = qmi_send_response(qmi_handle, sq, txn,
+	rc1 = qmi_send_response(qmi_handle, sq, txn,
 		QMI_IPA_WLAN_OPT_DATAPATH_REMOVE_ALL_FILTER_RESP_V01,
 		IPA_WLAN_OPT_DP_REMOVE_ALL_FILTER_RESP_MSG_V01_MAX_MSG_LEN,
 		ipa_wlan_opt_dp_remove_all_filter_resp_msg_data_v01_ei,
 		&resp);
 
-	if (rc < 0)
+	if (rc1 < 0)
 		IPAWANERR("Remove all filter rules failed\n");
 	else
 		IPAWANDBG("Replied to remove all filter request\n");
+
+	/* If remove filter request fails, send indication immediately. */
+	if (rc < 0) {
+		ind.filter_removal_all_status = resp.resp;
+		ipa3_qmi_send_wdi_opt_dpath_rmv_all_flt_ind(&ind);
+	}
+
 }
 
 static void ipa3_handle_ipa_wlan_opt_dp_add_filter_req(struct qmi_handle *qmi_handle,