msm: ipa: Enhanced WLAN datapath changes for IPA

Add changes to support optimized data path over wifi.

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

drivers/platform/msm/include/linux/ipa_wdi3.h

@@ -1,7 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2018 - 2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022, Qualcomm Innovation Center, Inc. All rights reserved.
+ *
+ * Copyright (c) 2021-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _IPA_WDI3_H_
@@ -19,6 +20,7 @@
 	(IPA_HW_WDI3_IPA2FW_ER_DESC_SIZE))
 
 #define IPA_WDI_MAX_SUPPORTED_SYS_PIPE 3
+#define IPA_WDI_MAX_FILTER_INFO_COUNT 5
 
 typedef u32 ipa_wdi_hdl_t;
 
@@ -59,14 +61,94 @@ struct ipa_wdi_init_in_params {
     is ready.
  * @is_smmu_enable: is smmu enabled
  * @is_over_gsi: is wdi over GSI or uC
+ * @opt_wdi_dpath: is optimized data path enabled.
  */
 struct ipa_wdi_init_out_params {
 	bool is_uC_ready;
 	bool is_smmu_enabled;
 	bool is_over_gsi;
 	ipa_wdi_hdl_t hdl;
+	bool opt_wdi_dpath;
+};
+/**
+ * struct filter_tuple_info - Properties of filters installed with WLAN
+ *
+ * @version: IP version, 0 - IPv4, 1 - IPv6
+ * @ipv4_saddr: IPV4 source address
+ * @ipv4_daddr: IPV4 destination address
+ * @ipv6_saddr: IPV6 source address
+ * @ipv6_daddr: IPV6 destination address
+ * @ipv4_addr: IPV4  address
+ * @ipv6_addr: IPV6  address
+ * @protocol: trasport protocol being used
+ * @sport: source port
+ * @dport: destination port
+ * @out_hdl: handle given by WLAN for filter installation
+ */
+
+struct filter_tuple_info {
+	u8 version;
+	union {
+		struct {
+			__be32 ipv4_saddr;
+			__be32 ipv4_daddr;
+		} ipv4_addr;
+		struct {
+			__be32 ipv6_saddr[4];
+			__be32 ipv6_daddr[4];
+		} ipv6_addr;
+	};
+	u8 protocol;
+	__be16 sport;
+	__be16 dport;
+	u32 out_hdl;
 };
 
+/**
+ * struct ipa_wdi_opt_dpath_flt_add_cb_params - wdi filter add callback parameters
+ *
+ * @num_tuples: Number of filter tuples
+ * @ip_addr_port_tuple: IP info (source/destination IP, source/destination port)
+ */
+struct ipa_wdi_opt_dpath_flt_add_cb_params {
+	u8 num_tuples;
+	struct filter_tuple_info flt_info[IPA_WDI_MAX_FILTER_INFO_COUNT];
+};
+
+/**
+ * struct ipa_wdi_opt_dpath_flt_rem_cb_params - wdi filter remove callback parameters
+ *
+ * @num_tuples: Number of filters to be removed
+ * @hdl_info: array of handles of filters to be removed
+ */
+struct ipa_wdi_opt_dpath_flt_rem_cb_params {
+	u8 num_tuples;
+	u32 hdl_info[IPA_WDI_MAX_FILTER_INFO_COUNT];
+};
+
+/**
+ * struct ipa_wdi_opt_dpath_flt_rsrv_cb_params - wdi filter reserve callback parameters
+ *
+ * @num_filters: number of filters to be reserved
+ * @rsrv_timeout: reservation timeout in milliseconds
+ */
+struct ipa_wdi_opt_dpath_flt_rsrv_cb_params {
+	u8 num_filters;
+	u32 rsrv_timeout;
+};
+
+typedef int (*ipa_wdi_opt_dpath_flt_rsrv_cb)
+	(void *priv, struct ipa_wdi_opt_dpath_flt_rsrv_cb_params *in);
+
+typedef int (*ipa_wdi_opt_dpath_flt_rsrv_rel_cb)
+	(void *priv);
+
+typedef int (*ipa_wdi_opt_dpath_flt_add_cb)
+	(void *priv, struct ipa_wdi_opt_dpath_flt_add_cb_params *in_out);
+
+typedef int (*ipa_wdi_opt_dpath_flt_rem_cb)
+	(void *priv, struct ipa_wdi_opt_dpath_flt_rem_cb_params *in);
+
 /**
  * struct ipa_wdi_hdr_info - Header to install on IPA HW
  *
@@ -288,6 +370,83 @@ int ipa_wdi_get_capabilities(
 int ipa_wdi_init(struct ipa_wdi_init_in_params *in,
 	struct ipa_wdi_init_out_params *out);
 
+/**
+ * ipa_wdi_opt_dpath_register_flt_cb_per_inst - Client should call this function to
+ * register filter reservation/release  and filter addition/deletion callbacks
+ *
+ *
+ * @Return 0 on success, negative on failure
+ */
+int ipa_wdi_opt_dpath_register_flt_cb_per_inst(
+	ipa_wdi_hdl_t hdl,
+	ipa_wdi_opt_dpath_flt_rsrv_cb flt_rsrv_cb,
+	ipa_wdi_opt_dpath_flt_rsrv_rel_cb flt_rsrv_rel_cb,
+	ipa_wdi_opt_dpath_flt_add_cb flt_add_cb,
+	ipa_wdi_opt_dpath_flt_rem_cb flt_rem_cb);
+
+/**
+ * ipa_wdi_opt_dpath_notify_flt_rsvd_per_inst - Client should call this function to
+ * notify filter reservation event to IPA
+ *
+ *
+ * @Return 0 on success, negative on failure
+ */
+int ipa_wdi_opt_dpath_notify_flt_rsvd_per_inst(ipa_wdi_hdl_t hdl,
+	bool is_success);
+/**
+ * ipa_wdi_opt_dpath_notify_flt_rlsd_per_inst - Client should call this function to
+ * notify filter deletion event to IPA
+ *
+ *
+ * @Return 0 on success, negative on failure
+ */
+int ipa_wdi_opt_dpath_notify_flt_rlsd_per_inst(ipa_wdi_hdl_t hdl,
+	bool is_success);
+
+/**
+ * ipa_wdi_opt_dpath_rsrv_filter_req - Client should call this function to
+ * send filter reservation request to wlan
+ *
+ *
+ * @Return 0 on success, negative on failure
+ */
+int ipa_wdi_opt_dpath_rsrv_filter_req(
+	struct ipa_wlan_opt_dp_rsrv_filter_req_msg_v01 *req,
+	struct ipa_wlan_opt_dp_rsrv_filter_resp_msg_v01 *resp);
+
+/**
+ * ipa_wdi_opt_dpath_add_filter_req - Client should call this function to
+ * send filter add request to wlan
+ *
+ *
+ * @Return 0 on success, negative on failure
+ */
+int ipa_wdi_opt_dpath_add_filter_req(
+	struct ipa_wlan_opt_dp_add_filter_req_msg_v01 *req,
+	struct ipa_wlan_opt_dp_add_filter_complt_ind_msg_v01 *ind);
+
+/**
+ * ipa_wdi_opt_dpath_remove_filter_req - Client should call this function to
+ * send filter remove request to wlan
+ *
+ *
+ * @Return 0 on success, negative on failure
+ */
+int ipa_wdi_opt_dpath_remove_filter_req(
+		struct ipa_wlan_opt_dp_remove_filter_req_msg_v01 *req,
+		struct ipa_wlan_opt_dp_remove_filter_complt_ind_msg_v01 *ind);
+
+/**
+ * ipa_wdi_opt_dpath_remove_filter_req - Client should call this function to
+ * send release reservation request to wlan
+ *
+ *
+ * @Return 0 on success, negative on failure
+ */
+int ipa_wdi_opt_dpath_remove_all_filter_req(
+		struct ipa_wlan_opt_dp_remove_all_filter_req_msg_v01 *req,
+		struct ipa_wlan_opt_dp_remove_all_filter_resp_msg_v01 *resp);
+
 /** ipa_get_wdi_version - return wdi version
  *
  * @Return void
@@ -732,6 +891,56 @@ static inline int ipa_wdi_sw_stats(struct ipa_wdi_tx_info *info)
 	return -EPERM;
 }
 
+static inline int ipa_wdi_opt_dpath_register_flt_cb_per_inst(
+	ipa_wdi_hdl_t hdl,
+	ipa_wdi_opt_dpath_flt_rsrv_cb flt_rsrv_cb,
+	ipa_wdi_opt_dpath_flt_rsrv_rel_cb flt_rsrv_rel_cb,
+	ipa_wdi_opt_dpath_flt_add_cb flt_add_cb,
+	ipa_wdi_opt_dpath_flt_rem_cb flt_rem_cb)
+{
+	return -EPERM;
+}
+
+static inline int ipa_wdi_opt_dpath_notify_flt_rsvd_per_inst(ipa_wdi_hdl_t hdl,
+	bool is_success)
+{
+	return -EPERM;
+}
+
+static inline int ipa_wdi_opt_dpath_notify_flt_rlsd_per_inst(ipa_wdi_hdl_t hdl,
+	bool is_success)
+{
+	return -EPERM;
+}
+
+static int ipa_wdi_opt_dpath_rsrv_filter_req(
+	struct ipa_wlan_opt_dp_rsrv_filter_req_msg_v01 *req,
+	struct ipa_wlan_opt_dp_rsrv_filter_resp_msg_v01 *resp);
+{
+	return -EPERM;
+}
+
+static int ipa_wdi_opt_dpath_add_filter_req(
+	struct ipa_wlan_opt_dp_add_filter_req_msg_v01 *req,
+	struct ipa_wlan_opt_dp_add_filter_complt_ind_msg_v01 *ind)
+{
+	return -EPERM;
+}
+
+static int ipa_wdi_opt_dpath_remove_filter_req(
+		struct ipa_wlan_opt_dp_remove_filter_req_msg_v01 *req,
+		struct ipa_wlan_opt_dp_remove_filter_complt_ind_msg_v01 *ind)
+{
+	return -EPERM;
+}
+
+static int ipa_wdi_opt_dpath_remove_all_filter_req(
+		struct ipa_wlan_opt_dp_remove_all_filter_req_msg_v01 *req,
+		struct ipa_wlan_opt_dp_remove_all_filter_resp_msg_v01 *resp)
+{
+	return -EPERM;
+}
+
 #endif /* IS_ENABLED(CONFIG_IPA3) */
 
 #endif /* _IPA_WDI3_H_ */

drivers/platform/msm/include/uapi/linux/ipa_qmi_service_v01.h

@@ -1,7 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
  * Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022, Qualcomm Innovation Center, Inc. All rights reserved.
+ *
+ * Copyright (c) 2021-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 /*
@@ -41,6 +42,10 @@
 #define QMI_IPA_IPFLTR_NUM_IHL_RANGE_16_EQNS_V01 2
 #define QMI_IPA_MAX_FILTERS_V01 64
 #define QMI_IPA_IPFLTR_NUM_MEQ_128_EQNS_V01 2
+#define QMI_IPA_MAX_IPV4_ADD_LEN_V01 34
+#define QMI_IPA_MAX_IPV6_ADD_LEN_V01 35
+#define QMI_IPA_IPV6_WORD_ADDR_LEN_V01 4
+#define QMI_IPA_MAX_ETH_HDR_SIZE_V01 64
 #define QMI_IPA_ENDP_DESC_NUM_MAX_V01 31
 #define QMI_IPA_MAX_APN_V01 8
 /* Currently max we can use is only 1. But for scalability purpose
@@ -2816,6 +2821,286 @@ struct ipa_move_nat_table_complt_ind_msg_v01 {
 };  /* Message */
 #define QMI_IPA_NAT_TABLE_MOVE_COMPLETE_IND_MAX_MSG_LEN_V01 7
 
+/*
+ * Request Message; Sends IPA WLAN OPT DATA PATH RESERVED FILTER REQUEST
+ */
+struct ipa_wlan_opt_dp_rsrv_filter_req_msg_v01 {
+
+  /* Mandatory */
+  /*  Number of filters */
+	__u8 num_filters;
+  /* Mandatory */
+  /*  Timeout value in milisecond */
+	__u32 timeout_val_ms;
+  /* Mandatory */
+  /*  Q6 routing table index */
+	__u32 q6_rtng_table_index;
+
+};
+#define IPA_WLAN_OPT_DP_RSRV_FILTER_REQ_MSG_V01_MAX_MSG_LEN 18
+
+/*
+ * Response Message; Sent for IPA WLAN OPT DATA PATH RESERVED FILTER REQUEST
+ */
+struct ipa_wlan_opt_dp_rsrv_filter_resp_msg_v01 {
+
+	/* Mandatory */
+	/* Result Code */
+	struct ipa_qmi_response_type_v01 resp;
+	/*
+	 * Standard response type.
+	 * Standard response type. Contains the following data members:
+	 * qmi_result_type -- QMI_RESULT_SUCCESS or QMI_RESULT_FAILURE
+	 * qmi_error_type  -- Error code. Possible error code values are
+	 * described in the error codes section of each message definition.
+	 */
+};
+#define IPA_WLAN_OPT_DP_RSRV_FILTER_RESP_MSG_V01_MAX_MSG_LEN 7
+
+/*
+ * Response Message;  Indicates completion of reserve filter status
+ *	       Apps driver sends indication to the modem driver that filter reservation
+ *	       was successful.
+ */
+struct ipa_wlan_opt_dp_rsrv_filter_complt_ind_msg_v01 {
+
+	/* Mandatory */
+	/* Result Code */
+	struct ipa_qmi_response_type_v01 rsrv_filter_status;
+	/*
+	 * Standard response type.
+	 * Standard response type. Contains the following data members:
+	 * qmi_result_type -- QMI_RESULT_SUCCESS or QMI_RESULT_FAILURE
+	 * qmi_error_type  -- Error code. Possible error code values are
+	 * described in the error codes section of each message definition.
+	 */
+};
+#define IPA_WLAN_OPT_DP_RSRV_FILTER_COMPLT_IND_MSG_V01_MAX_MSG_LEN 7
+
+struct ip_hdr_v4_address_info_v01 {
+	/* V4 source IP address */
+	__u32 source;
+	/* V4 destination IP address */
+	__u32 dest;
+};
+
+struct ip_hdr_v6_address_info_v01 {
+	/* V6 source IP address */
+	__u32 source[QMI_IPA_IPV6_WORD_ADDR_LEN_V01];
+	/* V6 destination IP address */
+	__u32 dest[QMI_IPA_IPV6_WORD_ADDR_LEN_V01];
+};
+
+/** Request Message; Sends QMI_IPA_WLAN_OPT_DATAPATH_ADD_FILTER_REQ */
+struct ipa_wlan_opt_dp_add_filter_req_msg_v01 {
+  /* Mandatory */
+  /*  filter index */
+	__u32 filter_idx;
+  /* Mandatory */
+  /*  IP type */
+	enum ipa_ip_type_enum_v01 ip_type;
+  /* Optional */
+	__u8 v4_addr_valid;  /**< Must be set to true if v4_addr is being passed */
+  /*  IPv4 address */
+	struct ip_hdr_v4_address_info_v01 v4_addr;
+	__u8 v6_addr_valid;  /**< Must be set to true if v6_addr is being passed */
+  /*  IPv6 address */
+	struct ip_hdr_v6_address_info_v01 v6_addr;
+};
+#define IPA_WLAN_OPT_DP_ADD_FILTER_REQ_MSG_V01_MAX_MSG_LEN 60
+
+/*
+ * Response Message;  Indicates completion of add  filter status
+ *	       Apps driver sends indication to the modem driver that filter addition
+ *	       was successful.
+ */
+
+struct ipa_wlan_opt_dp_add_filter_resp_msg_v01 {
+
+	/* Mandatory */
+	/* Result Code */
+	struct ipa_qmi_response_type_v01 resp;
+	/*
+	 * Standard response type.
+	 * Standard response type. Contains the following data members:
+	 * qmi_result_type -- QMI_RESULT_SUCCESS or QMI_RESULT_FAILURE
+	 * qmi_error_type  -- Error code. Possible error code values are
+	 * described in the error codes section of each message definition.
+	 */
+};
+#define IPA_WLAN_OPT_DP_ADD_FILTER_RESP_MSG_V01_MAX_MSG_LEN 7
+
+/*
+ *	Indication Message; Indicates completion of add filter request
+ *	Apps driver sends indication to the modem driver that filter addition
+ *	was successful.
+ */
+struct ipa_wlan_opt_dp_add_filter_complt_ind_msg_v01 {
+  /* Mandatory */
+  /* Filter removal status */
+	struct ipa_qmi_response_type_v01 filter_add_status;
+  /*
+   * Standard response type.
+   * Standard response type. Contains the following data members:
+   * qmi_result_type -- QMI_RESULT_SUCCESS or QMI_RESULT_FAILURE
+   * qmi_error_type  -- Error code. Possible error code values are
+   * described in the error codes section of each message definition.
+   */
+
+  /* Mandatory */
+  /*  filter index */
+	__u32 filter_idx;
+
+  /* Optional */
+	__u8 filter_handle_valid;  /**< Must be set to true if filter_handle is being passed */
+
+  /* filter handle */
+	__u32 filter_handle;
+};
+#define IPA_WLAN_OPT_DP_ADD_FILTER_COMPLT_IND_MSG_V01_MAX_MSG_LEN 21
+
+/*
+ * Request Message; Sends QMI_IPA_WLAN_OPT_DATAPATH_REMOVE_FILTER_REQ
+ */
+struct ipa_wlan_opt_dp_remove_filter_req_msg_v01 {
+  /* Mandatory */
+  /*  filter index */
+	__u32 filter_idx;
+
+  /* Mandatory */
+  /*  filter handle */
+	__u32 filter_handle;
+};
+#define IPA_WLAN_OPT_DP_REMOVE_FILTER_REQ_MSG_V01_MAX_MSG_LEN 14
+
+/*
+ * Response Message;  Indicates completion of remove  filter status
+ * Apps driver sends indication to the modem driver that filter removal
+ * was successful.
+ */
+
+struct ipa_wlan_opt_dp_remove_filter_resp_msg_v01 {
+
+	/* Mandatory */
+	/* Result Code */
+	struct ipa_qmi_response_type_v01 resp;
+	/*
+	 * Standard response type.
+	 * Standard response type. Contains the following data members:
+	 * qmi_result_type -- QMI_RESULT_SUCCESS or QMI_RESULT_FAILURE
+	 * qmi_error_type  -- Error code. Possible error code values are
+	 * described in the error codes section of each message definition.
+	 */
+};
+#define IPA_WLAN_OPT_DP_REMOVE_FILTER_RESP_MSG_V01_MAX_MSG_LEN 7
+
+struct ipa_wlan_opt_dp_remove_filter_complt_ind_msg_v01 {
+  /* Mandatory */
+  /*  Filter removal status */
+	struct ipa_qmi_response_type_v01 filter_removal_status;
+  /*
+   * Standard response type.
+   * Standard response type. Contains the following data members:
+   * qmi_result_type -- QMI_RESULT_SUCCESS or QMI_RESULT_FAILURE
+   * qmi_error_type  -- Error code. Possible error code values are
+   * described in the error codes section of each message definition.
+   */
+
+  /* Mandatory */
+  /*  filter index */
+	__u32 filter_idx;
+};
+#define IPA_WLAN_OPT_DP_REM_FILTER_COMPLT_IND_MSG_V01_MAX_MSG_LEN 14
+
+/** Request Message; Sends QMI_IPA_WLAN_OPT_DATAPATH_REMOVE_ALL_FILTER_REQ */
+struct ipa_wlan_opt_dp_remove_all_filter_req_msg_v01 {
+
+  /* Optional */
+  /*  REMOVE ALL FILTER */
+	__u8 reserved_valid;  /**< Must be set to true if reserved is being passed */
+	__u8 reserved;
+
+};
+#define IPA_WLAN_OPT_DP_REM_ALL_FILTER_REQ_MSG_V01_MAX_MSG_LEN 4
+/*
+ * Response Message;  Indicates completion of remove  filter status
+ *	       Apps driver sends indication to the modem driver that filter removal
+ *	       was successful.
+ */
+
+struct ipa_wlan_opt_dp_remove_all_filter_resp_msg_v01 {
+
+	/* Mandatory */
+	/* Result Code */
+	struct ipa_qmi_response_type_v01 resp;
+	/*
+	 * Standard response type.
+	 * Standard response type. Contains the following data members:
+	 * qmi_result_type -- QMI_RESULT_SUCCESS or QMI_RESULT_FAILURE
+	 * qmi_error_type  -- Error code. Possible error code values are
+	 * described in the error codes section of each message definition.
+	 */
+};
+#define IPA_WLAN_OPT_DP_REMOVE_ALL_FILTER_RESP_MSG_V01_MAX_MSG_LEN 7
+
+struct ipa_wlan_opt_dp_remove_all_filter_complt_ind_msg_v01 {
+
+  /* Mandatory */
+  /*  Filter removal status */
+	struct ipa_qmi_response_type_v01 filter_removal_all_status;
+  /*
+   * Standard response type.
+   * Standard response type. Contains the following data members:
+   * qmi_result_type -- QMI_RESULT_SUCCESS or QMI_RESULT_FAILURE
+   * qmi_error_type  -- Error code. Possible error code values are
+   * described in the error codes section of each message definition.
+   */
+
+};
+#define IPA_WLAN_OPT_DP_REM_ALL_FILTER_COMPLT_IND_MSG_V01_MAX_MSG_LEN 7
+
+
+struct ipa_wlan_opt_dp_set_wlan_per_info_req_msg_v01 {
+
+  /* Mandatory */
+  /*  Source WLAN EP ID */
+	__u32 src_wlan_endp_id;
+  /* Mandatory */
+  /*  Destination WLAN EP ID */
+	__u32 dest_wlan_endp_id;
+  /* Mandatory */
+  /*  Destination APPS EP ID */
+	__u32 dest_apps_endp_id;
+  /* Mandatory */
+  /* HDR LEN */
+	__u32 hdr_len;
+  /* Mandatory */
+  /* ETH HDR Offset */
+	__u32 eth_hdr_offset;
+  /* Mandatory */
+  /*	PARTIAL HDR INFO */
+	__u8 hdr_info[QMI_IPA_MAX_ETH_HDR_SIZE_V01];
+};
+#define IPA_WLAN_OPT_DP_SET_WLAN_PER_INFO_REQ_MSG_V1_MAX_MSG_LEN 102
+
+/** Response Message; Sends QMI_IPA_WLAN_OPT_DATAPATH_SET_WLAN_PER_INFO_REQ */
+struct ipa_wlan_opt_dp_set_wlan_per_info_resp_msg_v01 {
+
+  /* Mandatory */
+  /*  Result Code */
+	struct ipa_qmi_response_type_v01 resp;
+  /*
+   * Standard response type.
+   * Standard response type. Contains the following data members:
+   * qmi_result_type -- QMI_RESULT_SUCCESS or QMI_RESULT_FAILURE
+   * qmi_error_type  -- Error code. Possible error code values are
+   * described in the error codes section of each message definition.
+   */
+
+};
+#define IPA_WLAN_OPT_DP_SET_WLAN_PER_INFO_RESP_MSG_V1_MAX_MSG_LEN 7
+
+
 /*Service Message Definition*/
 #define QMI_IPA_INDICATION_REGISTER_REQ_V01 0x0020
 #define QMI_IPA_INDICATION_REGISTER_RESP_V01 0x0020
@@ -2874,6 +3159,21 @@ struct ipa_move_nat_table_complt_ind_msg_v01 {
 #define QMI_IPA_MOVE_NAT_REQ_V01 0x0046
 #define QMI_IPA_MOVE_NAT_RESP_V01 0x0046
 #define QMI_IPA_MOVE_NAT_COMPLETE_IND_V01 0x0046
+#define QMI_IPA_WLAN_OPT_DATAPATH_RSRV_FILTER_REQ_V01 0x0049
+#define QMI_IPA_WLAN_OPT_DATAPATH_RSRV_FILTER_RESP_V01 0x0049
+#define QMI_IPA_WLAN_OPT_DATAPATH_RSRV_FILTER_COMPLT_IND_V01 0x0049
+#define QMI_IPA_WLAN_OPT_DATAPATH_ADD_FILTER_REQ_V01 0x004A
+#define QMI_IPA_WLAN_OPT_DATAPATH_ADD_FILTER_RESP_V01 0x004A
+#define QMI_IPA_WLAN_OPT_DATAPATH_ADD_FILTER_COMPLT_IND_V01 0x004A
+#define QMI_IPA_WLAN_OPT_DATAPATH_REMOVE_FILTER_REQ_V01 0x004B
+#define QMI_IPA_WLAN_OPT_DATAPATH_REMOVE_FILTER_RESP_V01 0x004B
+#define QMI_IPA_WLAN_OPT_DATAPATH_REMOVE_FILTER_COMPLT_IND_V01 0x004B
+#define QMI_IPA_WLAN_OPT_DATAPATH_REMOVE_ALL_FILTER_REQ_V01 0x004C
+#define QMI_IPA_WLAN_OPT_DATAPATH_REMOVE_ALL_FILTER_RESP_V01 0x004C
+#define QMI_IPA_WLAN_OPT_DATAPATH_REMOVE_ALL_FILTER_COMPLT_IND_V01 0x004C
+#define QMI_IPA_WLAN_OPT_DATAPATH_SET_WLAN_PER_INFO_REQ_V01 0x004D
+#define QMI_IPA_WLAN_OPT_DATAPATH_SET_WLAN_PER_INFO_RESP_V01 0x004D
+
 
 /* add for max length*/
 #define QMI_IPA_INIT_MODEM_DRIVER_REQ_MAX_MSG_LEN_V01 197

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

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ *
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include "ipa_wdi3.h"
@@ -53,12 +54,21 @@ struct ipa_wdi_intf_info {
 	u32 partial_hdr_hdl[IPA_IP_MAX];
 	struct list_head link;
 };
+struct ipa_wdi_opt_dpath_info {
+	ipa_wdi_opt_dpath_flt_rsrv_cb flt_rsrv_cb;
+	ipa_wdi_opt_dpath_flt_rsrv_rel_cb flt_rsrv_rel_cb;
+	ipa_wdi_opt_dpath_flt_add_cb flt_add_cb;
+	ipa_wdi_opt_dpath_flt_rem_cb flt_rem_cb;
+	u32 q6_rtng_table_index;
+	u32 hdr_len;
+};
 
 struct ipa_wdi_context {
 	struct list_head head_intf_list;
 	struct completion wdi_completion;
 	struct mutex lock;
 	enum ipa_wdi_version wdi_version;
+	void *priv;
 	u8 is_smmu_enabled;
 	u32 tx_pipe_hdl;
 	u32 rx_pipe_hdl;
@@ -70,6 +80,7 @@ struct ipa_wdi_context {
 #ifdef IPA_WAN_MSG_IPv6_ADDR_GW_LEN
 	ipa_wdi_meter_notifier_cb wdi_notify;
 #endif
+	struct ipa_wdi_opt_dpath_info opt_dpath_info;
 };
 
 static struct ipa_wdi_context *ipa_wdi_ctx_list[IPA_WDI_INST_MAX];
@@ -234,6 +245,7 @@ int ipa_wdi_init_per_inst(struct ipa_wdi_init_in_params *in,
 
 	ipa_wdi_ctx_list[hdl]->inst_id = in->inst_id;
 	ipa_wdi_ctx_list[hdl]->wdi_version = in->wdi_version;
+	ipa_wdi_ctx_list[hdl]->priv = in->priv;
 	uc_ready_params.notify = in->notify;
 	uc_ready_params.priv = in->priv;
 
@@ -263,6 +275,13 @@ int ipa_wdi_init_per_inst(struct ipa_wdi_init_in_params *in,
 	else
 		out->is_over_gsi = false;
 
+	if (ipa3_ctx->ipa_wdi_opt_dpath)
+		out->opt_wdi_dpath = true;
+	else
+		out->opt_wdi_dpath = false;
+
+	IPA_WDI_DBG("opt_wdi_dpath enabled: %d, hdl: %d\n", out->opt_wdi_dpath, hdl);
+
 	out->hdl = hdl;
 
 	return 0;
@@ -341,7 +360,9 @@ int ipa_wdi_reg_intf_per_inst(
 	strlcpy(new_intf->netdev_name, in->netdev_name,
 		sizeof(new_intf->netdev_name));
 	new_intf->hdr_len = in->hdr_info[0].hdr_len;
-
+	if (ipa3_ctx->ipa_wdi_opt_dpath)
+		ipa_wdi_ctx_list[in->hdl]->opt_dpath_info.hdr_len =
+			new_intf->hdr_len;
 	/* add partial header */
 	len = sizeof(struct ipa_ioc_add_hdr) + 2 * sizeof(struct ipa_hdr_add);
 	hdr = kzalloc(len, GFP_KERNEL);
@@ -961,6 +982,416 @@ int ipa_wdi_release_smmu_mapping_per_inst(ipa_wdi_hdl_t hdl,
 }
 EXPORT_SYMBOL(ipa_wdi_release_smmu_mapping_per_inst);
 
+
+/**
+ * ipa_wdi_opt_dpath_register_flt_cb_per_inst - Client should call this function to
+ * register filter reservation/release  and filter addition/deletion callbacks
+ *
+ *
+ * @Return 0 on success, negative on failure
+ */
+int ipa_wdi_opt_dpath_register_flt_cb_per_inst(
+	ipa_wdi_hdl_t hdl,
+	ipa_wdi_opt_dpath_flt_rsrv_cb flt_rsrv_cb,
+	ipa_wdi_opt_dpath_flt_rsrv_rel_cb flt_rsrv_rel_cb,
+	ipa_wdi_opt_dpath_flt_add_cb flt_add_cb,
+	ipa_wdi_opt_dpath_flt_rem_cb flt_rem_cb)
+{
+	int ret = 0;
+
+	if (hdl < 0 || hdl >= IPA_WDI_INST_MAX) {
+		IPA_WDI_ERR("Invalid Handle %d\n",hdl);
+		return -EFAULT;
+	}
+
+	if (!ipa_wdi_ctx_list[hdl]) {
+		IPA_WDI_ERR("wdi ctx is not initialized.\n");
+		return -EPERM;
+	}
+
+	ipa_wdi_ctx_list[hdl]->opt_dpath_info.flt_rsrv_cb = flt_rsrv_cb;
+	ipa_wdi_ctx_list[hdl]->opt_dpath_info.flt_rsrv_rel_cb = flt_rsrv_rel_cb;
+	ipa_wdi_ctx_list[hdl]->opt_dpath_info.flt_add_cb = flt_add_cb;
+	ipa_wdi_ctx_list[hdl]->opt_dpath_info.flt_rem_cb = flt_rem_cb;
+
+	IPADBG("wdi_opt_dpath_register_flt_cb: callbacks registered.\n");
+
+	return ret;
+
+}
+EXPORT_SYMBOL(ipa_wdi_opt_dpath_register_flt_cb_per_inst);
+
+/**
+ * ipa_wdi_opt_dpath_notify_flt_rsvd_per_inst_internal - Client should call this function to
+ * notify filter reservation event to IPA
+ *
+ *
+ * @Return 0 on success, negative on failure
+ */
+int ipa_wdi_opt_dpath_notify_flt_rsvd_per_inst
+	(ipa_wdi_hdl_t hdl,	bool is_success)
+{
+	int ret = 0;
+	struct ipa_wlan_opt_dp_rsrv_filter_complt_ind_msg_v01 ind;
+
+	if (hdl < 0 || hdl >= IPA_WDI_INST_MAX) {
+		IPA_WDI_ERR("Invalid Handle %d\n",hdl);
+		return -EFAULT;
+	}
+
+	if (!ipa_wdi_ctx_list[hdl]) {
+		IPA_WDI_ERR("wdi ctx is not initialized.\n");
+		return -EPERM;
+	}
+
+	if (ipa_wdi_ctx_list[hdl]->wdi_version >= IPA_WDI_1 &&
+		ipa_wdi_ctx_list[hdl]->wdi_version < IPA_WDI_3 &&
+		hdl > 0) {
+		IPA_WDI_ERR("More than one instance not supported for WDI ver = %d\n",
+					ipa_wdi_ctx_list[hdl]->wdi_version);
+		return -EPERM;
+	}
+
+	memset(&ind, 0, sizeof(ind));
+	ind.rsrv_filter_status.result = (is_success == true) ? IPA_QMI_RESULT_SUCCESS_V01:IPA_QMI_RESULT_FAILURE_V01;
+	ind.rsrv_filter_status.error = IPA_QMI_ERR_NONE_V01;
+	ret = ipa3_qmi_send_wdi_opt_dpath_rsrv_flt_ind(&ind);
+
+	return ret;
+}
+EXPORT_SYMBOL(ipa_wdi_opt_dpath_notify_flt_rsvd_per_inst);
+
+
+/**
+ * ipa_wdi_opt_dpath_notify_flt_rlsd_per_inst_internal - Client should call this function to
+ * notify filter release event to IPA
+ *
+ *
+ * @Return 0 on success, negative on failure
+ */
+int ipa_wdi_opt_dpath_notify_flt_rlsd_per_inst
+	(ipa_wdi_hdl_t hdl,	bool is_success)
+{
+	int ret = 0;
+	struct ipa_wlan_opt_dp_remove_all_filter_complt_ind_msg_v01 ind;
+
+	if (hdl < 0 || hdl >= IPA_WDI_INST_MAX) {
+		IPA_WDI_ERR("Invalid Handle %d\n",hdl);
+		return -EFAULT;
+	}
+
+	if (!ipa_wdi_ctx_list[hdl]) {
+		IPA_WDI_ERR("wdi ctx is not initialized.\n");
+		return -EPERM;
+	}
+
+	memset(&ind, 0, sizeof(ind));
+	ind.filter_removal_all_status.result =
+		(is_success == true) ? IPA_QMI_RESULT_SUCCESS_V01:IPA_QMI_RESULT_FAILURE_V01;
+	ind.filter_removal_all_status.error = IPA_QMI_ERR_NONE_V01;
+	ret = ipa3_qmi_send_wdi_opt_dpath_rmv_all_flt_ind(&ind);
+
+	return ret;
+}
+EXPORT_SYMBOL(ipa_wdi_opt_dpath_notify_flt_rlsd_per_inst);
+
+
+/**
+ * ipa_wdi_opt_dpath_rsrv_filter_req_internal() - Sends WLAN DP filter reservation
+ * from IPA Q6 to WLAN
+ * @req:	[in] filter reservation parameters from IPA Q6
+ *
+ * Returns:	0 on success, negative on failure
+ *
+ *
+ */
+int ipa_wdi_opt_dpath_rsrv_filter_req(
+		struct ipa_wlan_opt_dp_rsrv_filter_req_msg_v01 *req,
+		struct ipa_wlan_opt_dp_rsrv_filter_resp_msg_v01 *resp)
+{
+	int ret = 0;
+	int ipa_ep_idx_tx, ipa_ep_idx_rx;
+	struct ipa_wdi_opt_dpath_flt_rsrv_cb_params rsrv_filter_req;
+	struct ipa_wlan_opt_dp_set_wlan_per_info_req_msg_v01 set_wlan_ep_req;
+
+	memset(resp, 0, sizeof(struct ipa_wlan_opt_dp_rsrv_filter_resp_msg_v01));
+	memset(&rsrv_filter_req, 0, sizeof(struct ipa_wdi_opt_dpath_flt_rsrv_cb_params));
+	memset(&set_wlan_ep_req, 0, sizeof(struct ipa_wlan_opt_dp_set_wlan_per_info_req_msg_v01));
+
+	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_cb)
+	{
+		IPAERR("filter resserve cb not registered");
+		resp->resp.result = IPA_QMI_RESULT_FAILURE_V01;
+		resp->resp.error = IPA_QMI_ERR_INTERNAL_V01;
+		return -1;
+	}
+
+	if (ipa_wdi_ctx_list[0]->wdi_version >= IPA_WDI_3) {
+		if (IPA_CLIENT_IS_WLAN0_INSTANCE(ipa_wdi_ctx_list[0]->inst_id)) {
+			ipa_ep_idx_rx = ipa_get_ep_mapping(IPA_CLIENT_WLAN2_PROD);
+			ipa_ep_idx_tx = ipa_get_ep_mapping(IPA_CLIENT_WLAN2_CONS);
+		} else {
+			ipa_ep_idx_rx = ipa_get_ep_mapping(IPA_CLIENT_WLAN3_PROD);
+			ipa_ep_idx_tx = ipa_get_ep_mapping(IPA_CLIENT_WLAN4_CONS);
+		}
+	} else {
+		ipa_ep_idx_rx = ipa_get_ep_mapping(IPA_CLIENT_WLAN1_PROD);
+		ipa_ep_idx_tx = ipa_get_ep_mapping(IPA_CLIENT_WLAN1_CONS);
+	}
+
+	if (ipa_ep_idx_tx <= 0 || ipa_ep_idx_rx <= 0) {
+		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;
+	}
+
+	IPADBG("ep_tx = %d\n", ipa_ep_idx_tx);
+	IPADBG("ep_rx = %d\n", ipa_ep_idx_rx);
+
+	set_wlan_ep_req.dest_wlan_endp_id = ipa_ep_idx_tx;
+	set_wlan_ep_req.src_wlan_endp_id = ipa_ep_idx_rx;
+	set_wlan_ep_req.dest_apps_endp_id = ipa_get_ep_mapping(IPA_CLIENT_APPS_LAN_CONS);
+	set_wlan_ep_req.hdr_len = ((ipa_wdi_ctx_list[0]->opt_dpath_info.hdr_len) ?
+			ipa_wdi_ctx_list[0]->opt_dpath_info.hdr_len :
+			ETH_HLEN);
+
+	ipa3_qmi_send_wdi_opt_dpath_ep_info(&set_wlan_ep_req);
+
+	rsrv_filter_req.num_filters = req->num_filters;
+	rsrv_filter_req.rsrv_timeout = req->timeout_val_ms;
+	ret =
+		ipa_wdi_ctx_list[0]->opt_dpath_info.flt_rsrv_cb(
+			ipa_wdi_ctx_list[0]->priv, &rsrv_filter_req);
+
+	if (!ret) {
+
+		ipa_wdi_ctx_list[0]->opt_dpath_info.q6_rtng_table_index =
+			req->q6_rtng_table_index;
+
+		ipa3_enable_wdi3_opt_dpath(ipa_ep_idx_rx,
+			ipa_wdi_ctx_list[0]->opt_dpath_info.q6_rtng_table_index);
+	}
+
+	resp->resp.result = ret;
+	resp->resp.error = IPA_QMI_ERR_NONE_V01;
+
+	return ret;
+
+}
+EXPORT_SYMBOL(ipa_wdi_opt_dpath_rsrv_filter_req);
+
+
+/**
+ * ipa_wdi_opt_dpath_add_filter_req_internal() - Sends WLAN DP filter info
+ * from IPA Q6 to WLAN
+ * @req:	[in] filter add parameters from IPA Q6
+ *
+ * Returns:	0 on success, negative on failure
+ *
+ *
+ */
+
+int ipa_wdi_opt_dpath_add_filter_req(
+		struct ipa_wlan_opt_dp_add_filter_req_msg_v01 *req,
+		struct ipa_wlan_opt_dp_add_filter_complt_ind_msg_v01 *ind)
+{
+	int ret = 0;
+
+	struct ipa_wdi_opt_dpath_flt_add_cb_params flt_add_req;
+
+	memset(ind, 0, sizeof(struct ipa_wlan_opt_dp_add_filter_complt_ind_msg_v01));
+	memset(&flt_add_req, 0, sizeof(struct ipa_wdi_opt_dpath_flt_add_cb_params));
+
+	if (!ipa_wdi_ctx_list[0]) {
+		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;
+		return -EPERM;
+	}
+
+	if (!ipa_wdi_ctx_list[0]->opt_dpath_info.flt_add_cb) {
+		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;
+	}
+
+	if (req->ip_type != QMI_IPA_IP_TYPE_V4_V01 &&
+		req->ip_type != QMI_IPA_IP_TYPE_V6_V01) {
+		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;
+		return -1;
+	}
+
+	flt_add_req.num_tuples = 1;
+	flt_add_req.flt_info[0].version = (req->ip_type == QMI_IPA_IP_TYPE_V4_V01) ? 0 : 1;
+	if (!flt_add_req.flt_info[0].version) {
+		flt_add_req.flt_info[0].ipv4_addr.ipv4_saddr = req->v4_addr.source;
+		flt_add_req.flt_info[0].ipv4_addr.ipv4_daddr = req->v4_addr.dest;
+		IPADBG("IPv4 saddr:0x%x, daddr:0x%x\n",
+			flt_add_req.flt_info[0].ipv4_addr.ipv4_saddr,
+			flt_add_req.flt_info[0].ipv4_addr.ipv4_daddr);
+	} else {
+		memcpy(flt_add_req.flt_info[0].ipv6_addr.ipv6_saddr,
+			req->v6_addr.source,
+			sizeof(req->v6_addr.source));
+		memcpy(flt_add_req.flt_info[0].ipv6_addr.ipv6_daddr,
+			req->v6_addr.dest,
+			sizeof(req->v6_addr.dest));
+		IPADBG("IPv6 saddr:0x%x:%x:%x:%x, daddr:0x%x:%x:%x:%x\n",
+			flt_add_req.flt_info[0].ipv6_addr.ipv6_saddr[0],
+			flt_add_req.flt_info[0].ipv6_addr.ipv6_saddr[1],
+			flt_add_req.flt_info[0].ipv6_addr.ipv6_saddr[2],
+			flt_add_req.flt_info[0].ipv6_addr.ipv6_saddr[3],
+			flt_add_req.flt_info[0].ipv6_addr.ipv6_daddr[0],
+			flt_add_req.flt_info[0].ipv6_addr.ipv6_daddr[1],
+			flt_add_req.flt_info[0].ipv6_addr.ipv6_daddr[2],
+			flt_add_req.flt_info[0].ipv6_addr.ipv6_daddr[3]);
+	}
+
+	ret =
+		ipa_wdi_ctx_list[0]->opt_dpath_info.flt_add_cb
+			(ipa_wdi_ctx_list[0]->priv, &flt_add_req);
+
+	ind->filter_idx = req->filter_idx;
+	ind->filter_handle_valid = true;
+	ind->filter_handle = flt_add_req.flt_info[0].out_hdl;
+	ind->filter_add_status.result = ret;
+	ind->filter_add_status.error = IPA_QMI_ERR_NONE_V01;
+
+	return ret;
+
+}
+EXPORT_SYMBOL(ipa_wdi_opt_dpath_add_filter_req);
+
+/**
+ * ipa_wdi_opt_dpath_remove_filter_req_internal() - Sends WLAN DP filter info
+ * from IPA Q6 to WLAN
+ * @req:	[in] filter removal parameters from IPA Q6
+ *
+ * Returns:	0 on success, negative on failure
+ *
+ *
+ */
+
+int ipa_wdi_opt_dpath_remove_filter_req(
+			struct ipa_wlan_opt_dp_remove_filter_req_msg_v01 *req,
+			struct ipa_wlan_opt_dp_remove_filter_complt_ind_msg_v01 *ind)
+{
+	int ret = 0;
+
+	struct ipa_wdi_opt_dpath_flt_rem_cb_params flt_rem_req;
+
+	memset(ind, 0, sizeof(struct ipa_wlan_opt_dp_remove_filter_complt_ind_msg_v01));
+	memset(&flt_rem_req, 0, sizeof(struct ipa_wdi_opt_dpath_flt_rem_cb_params));
+
+
+	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;
+		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;
+	}
+
+	flt_rem_req.num_tuples = 1;
+	flt_rem_req.hdl_info[0] = req->filter_handle;
+
+	ret =
+		ipa_wdi_ctx_list[0]->opt_dpath_info.flt_rem_cb
+			(ipa_wdi_ctx_list[0]->priv, &flt_rem_req);
+
+	ind->filter_idx = req->filter_idx;
+	ind->filter_removal_status.result = ret;
+	ind->filter_removal_status.error = IPA_QMI_ERR_NONE_V01;
+
+	return ret;
+
+}
+EXPORT_SYMBOL(ipa_wdi_opt_dpath_remove_filter_req);
+
+
+
+/**
+ * ipa_wdi_opt_dpath_remove_all_filter_req() - Sends WLAN DP filter info
+ * from IPA Q6 to WLAN
+ * @req:	[in] filter removal parameters from IPA Q6
+ *
+ * Returns:	0 on success, negative on failure
+ *
+ *
+ */
+
+int ipa_wdi_opt_dpath_remove_all_filter_req(
+			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 ret = 0;
+	int ipa_ep_idx_rx;
+
+	memset(resp, 0, sizeof(struct ipa_wlan_opt_dp_remove_all_filter_resp_msg_v01));
+
+	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;
+	}
+
+	ret =
+		ipa_wdi_ctx_list[0]->opt_dpath_info.flt_rsrv_rel_cb(
+			ipa_wdi_ctx_list[0]->priv);
+
+	if (ipa_wdi_ctx_list[0]->wdi_version >= IPA_WDI_3) {
+		if (IPA_CLIENT_IS_WLAN0_INSTANCE(ipa_wdi_ctx_list[0]->inst_id)) {
+			ipa_ep_idx_rx = ipa_get_ep_mapping(IPA_CLIENT_WLAN2_PROD);
+		} else {
+			ipa_ep_idx_rx = ipa_get_ep_mapping(IPA_CLIENT_WLAN3_PROD);
+		}
+	} else {
+		ipa_ep_idx_rx = ipa_get_ep_mapping(IPA_CLIENT_WLAN1_PROD);
+	}
+
+	if (ipa_ep_idx_rx <= 0) {
+		IPA_WDI_ERR("Either RX ep is not configured. \n");
+		return -EFAULT;
+	}
+
+	ipa3_disable_wdi3_opt_dpath(ipa_ep_idx_rx);
+
+	resp->resp.result = ret;
+	resp->resp.error = IPA_QMI_ERR_NONE_V01;
+
+	return ret;
+
+}
+EXPORT_SYMBOL(ipa_wdi_opt_dpath_remove_all_filter_req);
+
+
 /**
  * clean up WDI IPA offload data path
  *

drivers/platform/msm/ipa/ipa_common_i.h

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
+ *
+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _IPA_COMMON_I_H_
@@ -628,6 +630,10 @@ int ipa3_enable_wdi3_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx,
 int ipa3_disable_wdi3_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx,
 	int ipa_ep_idx_tx1);
 
+int ipa3_enable_wdi3_opt_dpath(int ipa_ep_idx_rx, u32 rt_tbl_idx);
+
+int ipa3_disable_wdi3_opt_dpath(int ipa_ep_idx_rx);
+
 const char *ipa_get_version_string(enum ipa_hw_type ver);
 int ipa3_start_gsi_channel(u32 clnt_hdl);
 

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

@@ -5449,6 +5449,20 @@ void ipa3_q6_pre_shutdown_cleanup(void)
 			ipa3_set_reset_client_cons_pipe_sus_holb(true,
 				IPA_CLIENT_MHI2_CONS);
 	}
+	if (ipa3_ctx->ipa_wdi_opt_dpath){
+
+		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");
+	}
 
 	if (ipa3_q6_clean_q6_tables()) {
 		IPAERR("Failed to clean Q6 tables\n");
@@ -9287,6 +9301,7 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p,
 	ipa3_ctx->uc_act_tbl_valid = false;
 	ipa3_ctx->uc_act_tbl_total = 0;
 	ipa3_ctx->uc_act_tbl_next_index = 0;
+	ipa3_ctx->ipa_wdi_opt_dpath = resource_p->ipa_wdi_opt_dpath;
 
 	if (resource_p->gsi_fw_file_name) {
 		ipa3_ctx->gsi_fw_file_name =
@@ -10577,6 +10592,13 @@ static int get_ipa_dts_configuration(struct platform_device *pdev,
 		ipa_drv_res->ipa_mhi_proxy
 		? "True" : "False");
 
+	ipa_drv_res->ipa_wdi_opt_dpath =
+		of_property_read_bool(pdev->dev.of_node,
+		"qcom,ipa-wdi-opt-dpath");
+	IPADBG(": Use optimized datapath = %s\n",
+		ipa_drv_res->ipa_wdi_opt_dpath
+		? "True" : "False");
+
 	/* Get IPA wrapper address */
 	result = of_property_read_u32(pdev->dev.of_node, "qcom,ipa-cfg-offset",
 		&ipa_drv_res->ipa_cfg_offset);

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

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
+ *
+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include "ipa_i.h"
@@ -2012,6 +2014,72 @@ void ipa3_delete_dflt_flt_rules(u32 ipa_ep_idx)
 	mutex_unlock(&ipa3_ctx->lock);
 }
 
+void ipa3_install_dl_opt_wdi_dpath_flt_rules(u32 ipa_ep_idx, u32 rt_tbl_idx)
+{
+	struct ipa3_flt_tbl *tbl;
+	struct ipa3_ep_context *ep;
+	struct ipa_flt_rule_i rule;
+
+	if (ipa_ep_idx >= ipa3_get_max_num_pipes()) {
+		IPAERR("invalid ipa_ep_idx=%u\n", ipa_ep_idx);
+		ipa_assert();
+		return;
+	}
+
+	ep = &ipa3_ctx->ep[ipa_ep_idx];
+
+	if (!ipa_is_ep_support_flt(ipa_ep_idx)) {
+		IPADBG("cannot add flt rules to non filtering pipe num %d\n",
+			ipa_ep_idx);
+		return;
+	}
+
+	memset(&rule, 0, sizeof(rule));
+
+	mutex_lock(&ipa3_ctx->lock);
+	tbl = &ipa3_ctx->flt_tbl[ipa_ep_idx][IPA_IP_v4];
+	rule.eq_attrib_type = true;
+	rule.eq_attrib.rule_eq_bitmap = 1 << 5;
+	rule.eq_attrib.num_offset_meq_32 = 1;
+	rule.action = IPA_PASS_TO_ROUTING;
+	rule.rt_tbl_idx = rt_tbl_idx;
+	__ipa_add_flt_rule(tbl, IPA_IP_v4, &rule, false,
+			&ep->dl_flt4_rule_hdl, false);
+	ipa3_ctx->ctrl->ipa3_commit_flt(IPA_IP_v4);
+
+	tbl = &ipa3_ctx->flt_tbl[ipa_ep_idx][IPA_IP_v6];
+	rule.eq_attrib_type = true;
+	rule.eq_attrib.rule_eq_bitmap = 1 << 5;
+	rule.eq_attrib.num_offset_meq_32 = 1;
+	rule.action = IPA_PASS_TO_ROUTING;
+	rule.rt_tbl_idx = rt_tbl_idx;
+	__ipa_add_flt_rule(tbl, IPA_IP_v6, &rule, false,
+			&ep->dl_flt6_rule_hdl, false);
+	ipa3_ctx->ctrl->ipa3_commit_flt(IPA_IP_v6);
+	mutex_unlock(&ipa3_ctx->lock);
+}
+
+void ipa3_delete_dl_opt_wdi_dpath_flt_rules(u32 ipa_ep_idx)
+{
+	struct ipa3_ep_context *ep = &ipa3_ctx->ep[ipa_ep_idx];
+	struct ipa3_flt_tbl *tbl;
+
+	mutex_lock(&ipa3_ctx->lock);
+	if (ep->dl_flt4_rule_hdl) {
+		tbl = &ipa3_ctx->flt_tbl[ipa_ep_idx][IPA_IP_v4];
+		__ipa_del_flt_rule(ep->dl_flt4_rule_hdl);
+		ipa3_ctx->ctrl->ipa3_commit_flt(IPA_IP_v4);
+		ep->dl_flt4_rule_hdl = 0;
+	}
+	if (ep->dl_flt6_rule_hdl) {
+		tbl = &ipa3_ctx->flt_tbl[ipa_ep_idx][IPA_IP_v6];
+		__ipa_del_flt_rule(ep->dl_flt6_rule_hdl);
+		ipa3_ctx->ctrl->ipa3_commit_flt(IPA_IP_v6);
+		ep->dl_flt6_rule_hdl = 0;
+	}
+	mutex_unlock(&ipa3_ctx->lock);
+}
+
 /**
  * ipa3_set_flt_tuple_mask() - Sets the flt tuple masking for the given pipe
  *  Pipe must be for AP EP (not modem) and support filtering

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

@@ -140,6 +140,14 @@ enum {
 #define IPA_WDI2_OVER_GSI() (ipa3_ctx->ipa_wdi2_over_gsi \
 		&& (ipa_get_wdi_version() == IPA_WDI_2))
 
+#define WLAN_IPA_EVENT(m) (m == WLAN_STA_CONNECT || \
+		m == WLAN_AP_CONNECT || \
+		m == WLAN_CLIENT_CONNECT_EX || \
+		m == WLAN_CLIENT_CONNECT || \
+		m == WLAN_STA_DISCONNECT || \
+		m == WLAN_AP_DISCONNECT || \
+		m == WLAN_CLIENT_DISCONNECT)
+
 #define IPADBG(fmt, args...) \
 	do { \
 		pr_debug(DRV_NAME " %s:%d " fmt, __func__, __LINE__, ## args);\
@@ -1104,6 +1112,8 @@ struct ipa3_ep_context {
 	atomic_t avail_fifo_desc;
 	u32 dflt_flt4_rule_hdl;
 	u32 dflt_flt6_rule_hdl;
+	u32 dl_flt4_rule_hdl;
+	u32 dl_flt6_rule_hdl;
 	bool skip_ep_cfg;
 	bool keep_ipa_awake;
 	struct ipa3_wlan_stats wstats;
@@ -2412,6 +2422,7 @@ struct ipa3_context {
 	bool ipa_config_is_auto;
 	bool ipa_wdi2_over_gsi;
 	bool ipa_wdi3_over_gsi;
+	bool ipa_wdi_opt_dpath;
 	bool ipa_endp_delay_wa;
 	bool lan_coal_enable;
 	bool ipa_fltrt_not_hashable;
@@ -2687,6 +2698,7 @@ struct ipa3_plat_drv_res {
 	bool use_pm_wrapper;
 	bool use_tput_est_ep;
 	bool ulso_wa;
+	bool ipa_wdi_opt_dpath;
 	u8 coal_ipv4_id_ignore;
 };
 
@@ -3387,6 +3399,8 @@ int __ipa_commit_hdr_v3_0(void);
 void ipa3_skb_recycle(struct sk_buff *skb);
 void ipa3_install_dflt_flt_rules(u32 ipa_ep_idx);
 void ipa3_delete_dflt_flt_rules(u32 ipa_ep_idx);
+void ipa3_install_dl_opt_wdi_dpath_flt_rules(u32 ipa_ep_idx, u32 rt_tbl_idx);
+void ipa3_delete_dl_opt_wdi_dpath_flt_rules(u32 ipa_ep_idx);
 
 int ipa3_remove_secondary_flow_ctrl(int gsi_chan_hdl);
 int ipa3_enable_data_path(u32 clnt_hdl);

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

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
+ *
+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/fs.h>
@@ -515,6 +517,12 @@ int ipa_send_msg(struct ipa_msg_meta *meta, void *buff,
 		return -EINVAL;
 	}
 
+	if (ipa3_ctx->ipa_wdi_opt_dpath && WLAN_IPA_EVENT(meta->msg_type)) {
+		IPAERR_RL("Opt data path enabled, ignore message type %d\n",
+			meta->msg_type);
+		return 0;
+	}
+
 	msg = kzalloc(sizeof(struct ipa3_push_msg), GFP_KERNEL);
 	if (msg == NULL)
 		return -ENOMEM;

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

@@ -17,6 +17,8 @@
 
 #include "ipa_qmi_service.h"
 #include "ipa_mhi_proxy.h"
+#include "ipa_i.h"
+
 
 #define IPA_Q6_SVC_VERS 1
 #define IPA_A5_SVC_VERS 1
@@ -1682,6 +1684,162 @@ static void ipa3_q6_clnt_bw_change_ind_cb(struct qmi_handle *handle,
 
 }
 
+static void ipa3_handle_ipa_wlan_opt_dp_rsrv_filter_req(struct qmi_handle *qmi_handle,
+	struct sockaddr_qrtr *sq,
+	struct qmi_txn *txn,
+	const void *decoded_msg)
+{
+	struct ipa_wlan_opt_dp_rsrv_filter_resp_msg_v01 resp;
+	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 ;
+
+	memset(&resp, 0, sizeof(resp));
+
+	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);
+
+	rc = ipa_wdi_opt_dpath_rsrv_filter_req(req, &resp);
+
+	IPAWANDBG("qmi_snd_rsp: result %d, err %d\n",
+		resp.resp.result, resp.resp.error);
+
+	rc = 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)
+		IPAWANERR("Reserve filter rules response failed\n");
+	else
+		IPAWANDBG("Replied to install filter request\n");
+}
+
+static void ipa3_handle_ipa_wlan_opt_dp_remove_all_filter_req(struct qmi_handle *qmi_handle,
+	struct sockaddr_qrtr *sq,
+	struct qmi_txn *txn,
+	const void *decoded_msg)
+{
+	struct ipa_wlan_opt_dp_remove_all_filter_resp_msg_v01 resp;
+	int rc = 0 ;
+
+	memset(&resp, 0, sizeof(resp));
+
+	IPAWANDBG("remove_all_filter_req:\n");
+
+	rc = ipa_wdi_opt_dpath_remove_all_filter_req(
+		(struct ipa_wlan_opt_dp_remove_all_filter_req_msg_v01 *)decoded_msg, &resp);
+
+	IPAWANDBG("qmi_snd_rsp: result %d, err %d\n",
+		resp.resp.result, resp.resp.error);
+
+	rc = 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)
+		IPAWANERR("Remove all filter rules failed\n");
+	else
+		IPAWANDBG("Replied to remove all filter request\n");
+}
+
+static void ipa3_handle_ipa_wlan_opt_dp_add_filter_req(struct qmi_handle *qmi_handle,
+	struct sockaddr_qrtr *sq,
+	struct qmi_txn *txn,
+	const void *decoded_msg)
+{
+	struct ipa_wlan_opt_dp_add_filter_resp_msg_v01 resp;
+	struct ipa_wlan_opt_dp_add_filter_complt_ind_msg_v01 ind;
+	struct ipa_wlan_opt_dp_add_filter_req_msg_v01 *req =
+		(struct ipa_wlan_opt_dp_add_filter_req_msg_v01 *)decoded_msg;
+	int rc = 0 ;
+
+	memset(&resp, 0, sizeof(resp));
+	memset(&ind, 0, sizeof(ind));
+
+	/* cache the client sq */
+	memcpy(&ipa3_qmi_ctx->client_sq, sq, sizeof(*sq));
+
+	rc = qmi_send_response(qmi_handle, sq, txn,
+		QMI_IPA_WLAN_OPT_DATAPATH_ADD_FILTER_RESP_V01,
+		IPA_WLAN_OPT_DP_ADD_FILTER_RESP_MSG_V01_MAX_MSG_LEN,
+		ipa_wlan_opt_dp_add_filter_resp_msg_data_v01_ei,
+		&resp);
+
+	IPAWANDBG("add_filter_req: filter_idx %d, iptype %d\n",
+		req->filter_idx, req->ip_type);
+
+	rc = ipa_wdi_opt_dpath_add_filter_req(
+		req,&ind);
+
+	IPAWANDBG("qmi_snd_rsp: flt_idx %d, flt_hdl%d\n",
+		ind.filter_idx, ind.filter_handle);
+
+	IPAWANDBG("qmi_snd_rsp: result %d, err %d\n",
+		ind.filter_add_status.result, ind.filter_add_status.error);
+
+	rc = qmi_send_indication(qmi_handle,
+		&ipa3_qmi_ctx->client_sq,
+		QMI_IPA_WLAN_OPT_DATAPATH_ADD_FILTER_COMPLT_IND_V01,
+		IPA_WLAN_OPT_DP_ADD_FILTER_COMPLT_IND_MSG_V01_MAX_MSG_LEN,
+		ipa_wlan_opt_dp_add_filter_complt_ind_msg_v01_ei,
+		&ind);
+
+	if (rc < 0)
+		IPAWANERR("Add  filter rules failed\n");
+	else
+		IPAWANDBG("Replied to add filter request\n");
+}
+
+static void ipa3_handle_ipa_wlan_opt_dp_remove_filter_req(struct qmi_handle *qmi_handle,
+	struct sockaddr_qrtr *sq,
+	struct qmi_txn *txn,
+	const void *decoded_msg)
+{
+	struct ipa_wlan_opt_dp_remove_filter_resp_msg_v01 resp;
+	struct ipa_wlan_opt_dp_remove_filter_complt_ind_msg_v01 ind;
+	struct ipa_wlan_opt_dp_remove_filter_req_msg_v01 *req =
+		(struct ipa_wlan_opt_dp_remove_filter_req_msg_v01 *)decoded_msg;
+	int rc = 0 ;
+
+	memset(&resp, 0, sizeof(resp));
+	memset(&ind, 0, sizeof(ind));
+
+	/* cache the client sq */
+	memcpy(&ipa3_qmi_ctx->client_sq, sq, sizeof(*sq));
+
+	IPAWANDBG("remove_filter_req: filter_idx %d, filter_hdl %d\n",
+		req->filter_idx, req->filter_handle);
+
+	rc = qmi_send_response(qmi_handle, sq, txn,
+		QMI_IPA_WLAN_OPT_DATAPATH_REMOVE_FILTER_RESP_V01,
+		IPA_WLAN_OPT_DP_REMOVE_FILTER_RESP_MSG_V01_MAX_MSG_LEN,
+		ipa_wlan_opt_dp_remove_filter_resp_msg_data_v01_ei,
+		&resp);
+
+	rc = ipa_wdi_opt_dpath_remove_filter_req(
+		req,&ind);
+
+	IPAWANDBG("qmi_snd_rsp: result %d, err %d\n",
+		ind.filter_removal_status.result, ind.filter_removal_status.error);
+
+
+	rc = qmi_send_indication(qmi_handle,
+		&ipa3_qmi_ctx->client_sq,
+		QMI_IPA_WLAN_OPT_DATAPATH_REMOVE_FILTER_COMPLT_IND_V01,
+		IPA_WLAN_OPT_DP_REM_FILTER_COMPLT_IND_MSG_V01_MAX_MSG_LEN,
+		ipa_wlan_opt_dp_remove_filter_complt_ind_msg_data_v01_ei,
+		&ind);
+
+	if (rc < 0)
+		IPAWANERR("Remove filter rules failed\n");
+	else
+		IPAWANDBG("Replied to remove filter request\n");
+}
+
 static void ipa3_q6_clnt_svc_arrive(struct work_struct *work)
 {
 	int rc;
@@ -1912,6 +2070,34 @@ static struct qmi_msg_handler server_handlers[] = {
 		.decoded_size = sizeof(struct ipa_move_nat_req_msg_v01),
 		.fn = ipa3_handle_move_nat_req,
 	},
+	{
+		.type = QMI_REQUEST,
+		.msg_id = QMI_IPA_WLAN_OPT_DATAPATH_RSRV_FILTER_REQ_V01,
+		.ei = ipa_wlan_opt_dp_rsrv_filter_req_msg_data_v01_ei,
+		.decoded_size = sizeof(struct ipa_wlan_opt_dp_rsrv_filter_req_msg_v01),
+		.fn = ipa3_handle_ipa_wlan_opt_dp_rsrv_filter_req,
+	},
+	{
+		.type = QMI_REQUEST,
+		.msg_id = QMI_IPA_WLAN_OPT_DATAPATH_ADD_FILTER_REQ_V01,
+		.ei = ipa_wlan_opt_dp_add_filter_req_msg_data_v01_ei,
+		.decoded_size = sizeof(struct ipa_wlan_opt_dp_add_filter_req_msg_v01),
+		.fn = ipa3_handle_ipa_wlan_opt_dp_add_filter_req,
+	},
+	{
+		.type = QMI_REQUEST,
+		.msg_id = QMI_IPA_WLAN_OPT_DATAPATH_REMOVE_FILTER_REQ_V01,
+		.ei = ipa_wlan_opt_dp_remove_filter_req_msg_data_v01_ei,
+		.decoded_size = sizeof(struct ipa_wlan_opt_dp_remove_filter_req_msg_v01),
+		.fn = ipa3_handle_ipa_wlan_opt_dp_remove_filter_req,
+	},
+	{
+		.type = QMI_REQUEST,
+		.msg_id = QMI_IPA_WLAN_OPT_DATAPATH_REMOVE_ALL_FILTER_REQ_V01,
+		.ei = ipa_wlan_opt_dp_remove_all_filter_req_msg_data_v01_ei,
+		.decoded_size = sizeof(struct ipa_wlan_opt_dp_remove_all_filter_req_msg_v01),
+		.fn = ipa3_handle_ipa_wlan_opt_dp_remove_all_filter_req,
+	},
 	{},
 
 };
@@ -2501,6 +2687,90 @@ int ipa3_qmi_send_mhi_ready_indication(
 		req);
 }
 
+int ipa3_qmi_send_wdi_opt_dpath_rsrv_flt_ind(
+	struct ipa_wlan_opt_dp_rsrv_filter_complt_ind_msg_v01 *ind)
+{
+	IPAWANDBG("Sending QMI_IPA_WLAN_OPT_DATAPATH_RSRV_FILTER_COMPLT_IND_V01 \n");
+
+	if (unlikely(!ipa3_svc_handle))
+		return -ETIMEDOUT;
+
+	IPAWANDBG("wdi_opt_dpath_rsrv_flt_ind: result %d, err %d\n",
+		ind->rsrv_filter_status.result,
+		ind->rsrv_filter_status.error);
+
+	return qmi_send_indication(ipa3_svc_handle,
+		&ipa3_qmi_ctx->client_sq,
+		QMI_IPA_WLAN_OPT_DATAPATH_RSRV_FILTER_COMPLT_IND_V01,
+		IPA_WLAN_OPT_DP_RSRV_FILTER_COMPLT_IND_MSG_V01_MAX_MSG_LEN,
+		ipa_wlan_opt_dp_rsrv_filter_complt_ind_msg_data_v01_ei,
+		ind);
+}
+EXPORT_SYMBOL(ipa3_qmi_send_wdi_opt_dpath_rsrv_flt_ind);
+
+int ipa3_qmi_send_wdi_opt_dpath_rmv_all_flt_ind(
+	struct ipa_wlan_opt_dp_remove_all_filter_complt_ind_msg_v01 *ind)
+{
+	IPAWANDBG("Sending QMI_IPA_WLAN_OPT_DATAPATH_REMOVE_ALL_FILTER_COMPLT_IND_V01\n");
+
+	if (unlikely(!ipa3_svc_handle))
+		return -ETIMEDOUT;
+
+	IPAWANDBG("wdi_opt_dpath_rmv_all_flt_ind: result %d, err %d\n",
+		ind->filter_removal_all_status.result,
+		ind->filter_removal_all_status.error);
+
+	return qmi_send_indication(ipa3_svc_handle,
+		&ipa3_qmi_ctx->client_sq,
+		QMI_IPA_WLAN_OPT_DATAPATH_REMOVE_ALL_FILTER_COMPLT_IND_V01,
+		IPA_WLAN_OPT_DP_REM_ALL_FILTER_COMPLT_IND_MSG_V01_MAX_MSG_LEN,
+		ipa_wlan_opt_dp_remove_all_filter_complt_ind_msg_data_v01_ei,
+		ind);
+}
+EXPORT_SYMBOL(ipa3_qmi_send_wdi_opt_dpath_rmv_all_flt_ind);
+
+
+int ipa3_qmi_send_wdi_opt_dpath_ep_info(
+	struct ipa_wlan_opt_dp_set_wlan_per_info_req_msg_v01 *req)
+{
+	struct ipa_msg_desc req_desc, resp_desc;
+	int rc;
+	struct ipa_wlan_opt_dp_set_wlan_per_info_resp_msg_v01 resp;
+
+	memset(&resp, 0, sizeof(struct ipa_wlan_opt_dp_set_wlan_per_info_resp_msg_v01));
+
+	req_desc.max_msg_len = IPA_WLAN_OPT_DP_SET_WLAN_PER_INFO_REQ_MSG_V1_MAX_MSG_LEN;
+	req_desc.msg_id = QMI_IPA_WLAN_OPT_DATAPATH_SET_WLAN_PER_INFO_REQ_V01;
+	req_desc.ei_array = ipa_wlan_opt_dp_set_wlan_per_info_req_msg_data_v01_ei;
+
+	resp_desc.max_msg_len = IPA_WLAN_OPT_DP_SET_WLAN_PER_INFO_RESP_MSG_V1_MAX_MSG_LEN;
+	resp_desc.msg_id = QMI_IPA_WLAN_OPT_DATAPATH_SET_WLAN_PER_INFO_RESP_V01;
+	resp_desc.ei_array = ipa_wlan_opt_dp_set_wlan_per_info_resp_msg_data_v01;
+
+	IPAWANDBG("Sending QMI_IPA_WLAN_OPT_DATAPATH_SET_WLAN_PER_INFO_REQ_V01\n");
+
+	if (unlikely(!ipa_q6_clnt))
+		return -ETIMEDOUT;
+	rc = ipa3_qmi_send_req_wait(ipa_q6_clnt,
+		&req_desc, req,
+		&resp_desc, &resp,
+		QMI_SEND_STATS_REQ_TIMEOUT_MS);
+
+	if (rc < 0) {
+		IPAWANERR("QMI send Req %d failed, rc= %d\n",
+			QMI_IPA_GET_APN_DATA_STATS_REQ_V01,
+			rc);
+		return rc;
+	}
+
+	IPAWANDBG("QMI_IPA_WLAN_OPT_DATAPATH_SET_WLAN_PER_INFO_RESP_V01 received\n");
+
+	return ipa3_check_qmi_response(rc,
+		QMI_IPA_WLAN_OPT_DATAPATH_SET_WLAN_PER_INFO_REQ_V01, resp.resp.result,
+		resp.resp.error, "ipa_wlan_opt_dp_set_wlan_per_info_req_msg_v01");
+}
+EXPORT_SYMBOL(ipa3_qmi_send_wdi_opt_dpath_ep_info);
+
 int ipa3_qmi_send_mhi_cleanup_request(struct ipa_mhi_cleanup_req_msg_v01 *req)
 {
 

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

@@ -2,7 +2,7 @@
 /*
  * Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.
  *
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef IPA_QMI_SERVICE_H
@@ -221,7 +221,20 @@ extern struct qmi_elem_info ipa_bw_change_ind_msg_v01_ei[];
 extern struct qmi_elem_info ipa_move_nat_req_msg_v01_ei[];
 extern struct qmi_elem_info ipa_move_nat_resp_msg_v01_ei[];
 extern struct qmi_elem_info ipa_move_nat_table_complt_ind_msg_v01_ei[];
-
+extern struct qmi_elem_info ipa_wlan_opt_dp_rsrv_filter_req_msg_data_v01_ei[];
+extern struct qmi_elem_info ipa_wlan_opt_dp_rsrv_filter_resp_msg_data_v01_ei[];
+extern struct qmi_elem_info ipa_wlan_opt_dp_rsrv_filter_complt_ind_msg_data_v01_ei[];
+extern struct qmi_elem_info ipa_wlan_opt_dp_add_filter_req_msg_data_v01_ei[];
+extern struct qmi_elem_info ipa_wlan_opt_dp_add_filter_resp_msg_data_v01_ei[];
+extern struct qmi_elem_info ipa_wlan_opt_dp_add_filter_complt_ind_msg_v01_ei[];
+extern struct qmi_elem_info ipa_wlan_opt_dp_remove_filter_req_msg_data_v01_ei[];
+extern struct qmi_elem_info ipa_wlan_opt_dp_remove_filter_resp_msg_data_v01_ei[];
+extern struct qmi_elem_info ipa_wlan_opt_dp_remove_filter_complt_ind_msg_data_v01_ei[];
+extern struct qmi_elem_info ipa_wlan_opt_dp_remove_all_filter_req_msg_data_v01_ei[];
+extern struct qmi_elem_info ipa_wlan_opt_dp_remove_all_filter_resp_msg_data_v01_ei[];
+extern struct qmi_elem_info ipa_wlan_opt_dp_remove_all_filter_complt_ind_msg_data_v01_ei[];
+extern struct qmi_elem_info ipa_wlan_opt_dp_set_wlan_per_info_req_msg_data_v01_ei[];
+extern struct qmi_elem_info ipa_wlan_opt_dp_set_wlan_per_info_resp_msg_data_v01[];
 /**
  * struct ipa3_rmnet_context - IPA rmnet context
  * @ipa_rmnet_ssr: support modem SSR
@@ -355,6 +368,15 @@ 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_wdi_opt_dpath_rsrv_flt_ind(
+	struct ipa_wlan_opt_dp_rsrv_filter_complt_ind_msg_v01 *ind);
+
+int ipa3_qmi_send_wdi_opt_dpath_rmv_all_flt_ind(
+	struct ipa_wlan_opt_dp_remove_all_filter_complt_ind_msg_v01 *ind);
+
+int ipa3_qmi_send_wdi_opt_dpath_ep_info(
+	struct ipa_wlan_opt_dp_set_wlan_per_info_req_msg_v01 *req);
+
 int ipa3_qmi_send_endp_desc_indication(
 	struct ipa_endp_desc_indication_msg_v01 *req);
 
@@ -515,6 +537,24 @@ static inline int ipa3_qmi_send_mhi_ready_indication(
 	return -EPERM;
 }
 
+static int ipa3_qmi_send_wdi_opt_dpath_rsrv_flt_ind(
+	struct ipa_wlan_opt_dp_remove_all_filter_complt_ind_msg_v01 *ind)
+{
+	return -EPERM;
+}
+
+static int ipa3_qmi_send_wdi_opt_dpath_rmv_all_flt_ind(
+	struct ipa_wlan_opt_dp_remove_all_filter_complt_ind_msg_v01 *ind)
+{
+	return -EPERM;
+}
+
+static int ipa3_qmi_send_wdi_opt_dpath_ep_info(
+	struct ipa_wlan_opt_dp_set_wlan_per_info_req_msg_v01 *req)
+{
+	return -EPERM;
+}
+
 static inline int ipa3_qmi_send_endp_desc_indication(
 	struct ipa_endp_desc_indication_msg_v01 *req)
 {

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

@@ -2,7 +2,7 @@
 /*
  * Copyright (c) 2013-2019, 2021 The Linux Foundation. All rights reserved.
  *
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/ipa_qmi_service_v01.h>
@@ -5454,4 +5454,501 @@ struct qmi_elem_info ipa_move_nat_resp_msg_v01_ei[] = {
 		.array_type = NO_ARRAY,
 		.tlv_type = QMI_COMMON_TLV_TYPE,
 	},
-};
+};
+
+struct qmi_elem_info ipa_wlan_opt_dp_rsrv_filter_req_msg_data_v01_ei[] = {
+	{
+		.data_type	= QMI_UNSIGNED_1_BYTE,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint8_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x01,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_rsrv_filter_req_msg_v01,
+			num_filters),
+	},
+	{
+		.data_type	= QMI_UNSIGNED_4_BYTE,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint32_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x02,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_rsrv_filter_req_msg_v01,
+			timeout_val_ms),
+	},
+	{
+		.data_type	= QMI_UNSIGNED_4_BYTE,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint32_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x03,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_rsrv_filter_req_msg_v01,
+			q6_rtng_table_index),
+	},
+	{
+		.data_type	= QMI_EOTI,
+		.array_type	= NO_ARRAY,
+		.tlv_type	= QMI_COMMON_TLV_TYPE,
+	},
+};
+
+struct qmi_elem_info ipa_wlan_opt_dp_rsrv_filter_resp_msg_data_v01_ei[] = {
+	{
+		.data_type      = QMI_STRUCT,
+		.elem_len       = 1,
+		.elem_size      = sizeof(struct qmi_response_type_v01),
+		.array_type     = NO_ARRAY,
+		.tlv_type       = 0x02,
+		.offset         = offsetof(
+			struct ipa_wlan_opt_dp_rsrv_filter_resp_msg_v01,
+			resp),
+		.ei_array      = qmi_response_type_v01_ei,
+	},
+	{
+		.data_type	= QMI_EOTI,
+		.array_type	= NO_ARRAY,
+		.tlv_type	= QMI_COMMON_TLV_TYPE,
+	},
+};
+
+struct qmi_elem_info ipa_wlan_opt_dp_rsrv_filter_complt_ind_msg_data_v01_ei[] = {
+	{
+		.data_type      = QMI_STRUCT,
+		.elem_len       = 1,
+		.elem_size      = sizeof(struct qmi_response_type_v01),
+		.array_type     = NO_ARRAY,
+		.tlv_type       = 0x02,
+		.offset         = offsetof(
+			struct ipa_wlan_opt_dp_rsrv_filter_complt_ind_msg_v01,
+			rsrv_filter_status),
+		.ei_array      = qmi_response_type_v01_ei,
+	},
+		{
+		.data_type	= QMI_EOTI,
+		.array_type	= NO_ARRAY,
+		.tlv_type	= QMI_COMMON_TLV_TYPE,
+	},
+};
+
+struct qmi_elem_info ip_hdr_v4_address_info_data_v01_ei[] = {
+	{
+		.data_type	= QMI_UNSIGNED_4_BYTE,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint32_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= QMI_COMMON_TLV_TYPE,
+		.offset		= offsetof(struct ip_hdr_v4_address_info_v01,
+					source),
+	},
+	{
+		.data_type = QMI_UNSIGNED_4_BYTE,
+		.elem_len = 1,
+		.elem_size = sizeof(uint32_t),
+		.array_type = NO_ARRAY,
+		.tlv_type = QMI_COMMON_TLV_TYPE,
+		.offset = offsetof(struct ip_hdr_v4_address_info_v01,
+		dest),
+	},
+	{
+		.data_type = QMI_EOTI,
+		.array_type = NO_ARRAY,
+		.tlv_type = QMI_COMMON_TLV_TYPE,
+	},
+};
+
+struct qmi_elem_info ip_hdr_v6_address_info_data_v01_ei[] = {
+	{
+		.data_type	= QMI_UNSIGNED_4_BYTE,
+		.elem_len	= QMI_IPA_IPV6_WORD_ADDR_LEN_V01,
+		.elem_size	= sizeof(uint32_t),
+		.array_type	= STATIC_ARRAY,
+		.tlv_type	= QMI_COMMON_TLV_TYPE,
+		.offset		= offsetof(
+			struct ip_hdr_v6_address_info_v01,
+			source),
+	},
+	{
+		.data_type	= QMI_UNSIGNED_4_BYTE,
+		.elem_len	= QMI_IPA_IPV6_WORD_ADDR_LEN_V01,
+		.elem_size	= sizeof(uint32_t),
+		.array_type	= STATIC_ARRAY,
+		.tlv_type	= QMI_COMMON_TLV_TYPE,
+		.offset		= offsetof(
+			struct ip_hdr_v6_address_info_v01,
+			dest),
+	},
+	{
+		.data_type = QMI_EOTI,
+		.array_type = NO_ARRAY,
+		.tlv_type = QMI_COMMON_TLV_TYPE,
+	},
+};
+
+
+struct qmi_elem_info ipa_wlan_opt_dp_add_filter_req_msg_data_v01_ei[] = {
+	{
+		.data_type	= QMI_UNSIGNED_4_BYTE,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint32_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x01,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_add_filter_req_msg_v01,
+			filter_idx),
+	},
+	{
+		.data_type	= QMI_UNSIGNED_4_BYTE,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint32_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x02,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_add_filter_req_msg_v01,
+			ip_type),
+	},
+	{
+		.data_type	= QMI_OPT_FLAG,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint8_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x10,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_add_filter_req_msg_v01,
+			v4_addr_valid),
+	},
+	{
+		.data_type = QMI_STRUCT,
+		.elem_len = 1,
+		.elem_size = sizeof(struct ip_hdr_v4_address_info_v01),
+		.array_type = NO_ARRAY,
+		.tlv_type = 0x10,
+		.offset = offsetof(struct ipa_wlan_opt_dp_add_filter_req_msg_v01,
+		v4_addr),
+		.ei_array = ip_hdr_v4_address_info_data_v01_ei,
+	},
+	{
+		.data_type	= QMI_OPT_FLAG,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint8_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x11,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_add_filter_req_msg_v01,
+			v6_addr_valid),
+	},
+	{
+		.data_type = QMI_STRUCT,
+		.elem_len = 1,
+		.elem_size = sizeof(struct ip_hdr_v6_address_info_v01),
+		.array_type = NO_ARRAY,
+		.tlv_type = 0x11,
+		.offset = offsetof(struct ipa_wlan_opt_dp_add_filter_req_msg_v01,
+		v6_addr),
+		.ei_array = ip_hdr_v6_address_info_data_v01_ei,
+	},
+	{
+		.data_type	= QMI_EOTI,
+		.array_type	= NO_ARRAY,
+		.tlv_type	= QMI_COMMON_TLV_TYPE,
+	},
+};
+
+struct qmi_elem_info ipa_wlan_opt_dp_add_filter_resp_msg_data_v01_ei[] = {
+	{
+		.data_type      = QMI_STRUCT,
+		.elem_len       = 1,
+		.elem_size      = sizeof(struct qmi_response_type_v01),
+		.array_type     = NO_ARRAY,
+		.tlv_type       = 0x02,
+		.offset         = offsetof(
+			struct ipa_wlan_opt_dp_add_filter_resp_msg_v01,
+			resp),
+		.ei_array      = qmi_response_type_v01_ei,
+	},
+	{
+		.data_type	= QMI_EOTI,
+		.array_type	= NO_ARRAY,
+		.tlv_type	= QMI_COMMON_TLV_TYPE,
+	},
+};
+
+struct qmi_elem_info ipa_wlan_opt_dp_add_filter_complt_ind_msg_v01_ei[] = {
+	{
+		.data_type      = QMI_STRUCT,
+		.elem_len       = 1,
+		.elem_size      = sizeof(struct qmi_response_type_v01),
+		.array_type     = NO_ARRAY,
+		.tlv_type       = 0x02,
+		.offset         = offsetof(
+			struct ipa_wlan_opt_dp_add_filter_complt_ind_msg_v01,
+			filter_add_status),
+		.ei_array      = qmi_response_type_v01_ei,
+	},
+	{
+		.data_type	= QMI_UNSIGNED_4_BYTE,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint32_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x03,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_add_filter_complt_ind_msg_v01,
+			filter_idx),
+	},
+	{
+		.data_type	= QMI_OPT_FLAG,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint8_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x10,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_add_filter_complt_ind_msg_v01,
+			filter_handle_valid),
+	},
+
+	{
+		.data_type	= QMI_UNSIGNED_4_BYTE,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint32_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x10,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_add_filter_complt_ind_msg_v01,
+			filter_handle),
+	},
+	{
+		.data_type	= QMI_EOTI,
+		.array_type	= NO_ARRAY,
+		.tlv_type	= QMI_COMMON_TLV_TYPE,
+	},
+};
+
+struct qmi_elem_info ipa_wlan_opt_dp_remove_filter_req_msg_data_v01_ei[] = {
+	{
+		.data_type	= QMI_UNSIGNED_4_BYTE,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint32_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x01,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_remove_filter_req_msg_v01,
+			filter_idx),
+	},
+	{
+		.data_type	= QMI_UNSIGNED_4_BYTE,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint32_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x02,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_remove_filter_req_msg_v01,
+			filter_handle),
+	},
+	{
+		.data_type	= QMI_EOTI,
+		.array_type	= NO_ARRAY,
+		.tlv_type	= QMI_COMMON_TLV_TYPE,
+	},
+};
+
+struct qmi_elem_info ipa_wlan_opt_dp_remove_filter_resp_msg_data_v01_ei[] = {
+	{
+		.data_type      = QMI_STRUCT,
+		.elem_len       = 1,
+		.elem_size      = sizeof(struct qmi_response_type_v01),
+		.array_type     = NO_ARRAY,
+		.tlv_type       = 0x02,
+		.offset         = offsetof(
+			struct ipa_wlan_opt_dp_remove_filter_resp_msg_v01,
+			resp),
+		.ei_array      = qmi_response_type_v01_ei,
+	},
+	{
+		.data_type	= QMI_EOTI,
+		.array_type	= NO_ARRAY,
+		.tlv_type	= QMI_COMMON_TLV_TYPE,
+	},
+};
+
+struct qmi_elem_info ipa_wlan_opt_dp_remove_filter_complt_ind_msg_data_v01_ei[] = {
+	{
+		.data_type      = QMI_STRUCT,
+		.elem_len       = 1,
+		.elem_size      = sizeof(struct qmi_response_type_v01),
+		.array_type     = NO_ARRAY,
+		.tlv_type       = 0x02,
+		.offset         = offsetof(
+			struct ipa_wlan_opt_dp_remove_filter_complt_ind_msg_v01,
+			filter_removal_status),
+		.ei_array      = qmi_response_type_v01_ei,
+	},
+	{
+		.data_type	= QMI_UNSIGNED_4_BYTE,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint32_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x03,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_remove_filter_complt_ind_msg_v01,
+			filter_idx),
+	},
+	{
+		.data_type	= QMI_EOTI,
+		.array_type	= NO_ARRAY,
+		.tlv_type	= QMI_COMMON_TLV_TYPE,
+	},
+};
+
+struct qmi_elem_info ipa_wlan_opt_dp_remove_all_filter_req_msg_data_v01_ei[] = {
+	{
+		.data_type	= QMI_OPT_FLAG,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint8_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x10,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_remove_all_filter_req_msg_v01,
+			reserved_valid),
+	},
+	{
+		.data_type	= QMI_UNSIGNED_1_BYTE,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint8_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x10,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_remove_all_filter_req_msg_v01,
+			reserved),
+	},
+	{
+		.data_type	= QMI_EOTI,
+		.array_type	= NO_ARRAY,
+		.tlv_type	= QMI_COMMON_TLV_TYPE,
+	},
+};
+
+struct qmi_elem_info ipa_wlan_opt_dp_remove_all_filter_resp_msg_data_v01_ei[] = {
+	{
+		.data_type      = QMI_STRUCT,
+		.elem_len       = 1,
+		.elem_size      = sizeof(struct qmi_response_type_v01),
+		.array_type     = NO_ARRAY,
+		.tlv_type       = 0x02,
+		.offset         = offsetof(
+			struct ipa_wlan_opt_dp_remove_all_filter_resp_msg_v01,
+			resp),
+		.ei_array      = qmi_response_type_v01_ei,
+	},
+	{
+		.data_type	= QMI_EOTI,
+		.array_type	= NO_ARRAY,
+		.tlv_type	= QMI_COMMON_TLV_TYPE,
+	},
+};
+
+struct qmi_elem_info ipa_wlan_opt_dp_remove_all_filter_complt_ind_msg_data_v01_ei[] = {
+	{
+		.data_type      = QMI_STRUCT,
+		.elem_len       = 1,
+		.elem_size      = sizeof(struct qmi_response_type_v01),
+		.array_type     = NO_ARRAY,
+		.tlv_type       = 0x02,
+		.offset         = offsetof(
+			struct ipa_wlan_opt_dp_remove_all_filter_complt_ind_msg_v01,
+			filter_removal_all_status),
+		.ei_array      = qmi_response_type_v01_ei,
+	},
+	{
+		.data_type	= QMI_EOTI,
+		.array_type	= NO_ARRAY,
+		.tlv_type	= QMI_COMMON_TLV_TYPE,
+	},
+};
+
+struct qmi_elem_info ipa_wlan_opt_dp_set_wlan_per_info_req_msg_data_v01_ei[] = {
+	{
+		.data_type	= QMI_UNSIGNED_4_BYTE,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint32_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x01,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_set_wlan_per_info_req_msg_v01,
+			src_wlan_endp_id),
+	},
+	{
+		.data_type	= QMI_UNSIGNED_4_BYTE,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint32_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x02,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_set_wlan_per_info_req_msg_v01,
+			dest_wlan_endp_id),
+	},
+	{
+		.data_type	= QMI_UNSIGNED_4_BYTE,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint32_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x03,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_set_wlan_per_info_req_msg_v01,
+			dest_apps_endp_id),
+	},
+	{
+		.data_type	= QMI_UNSIGNED_4_BYTE,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint32_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x04,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_set_wlan_per_info_req_msg_v01,
+			hdr_len),
+	},
+	{
+		.data_type	= QMI_UNSIGNED_4_BYTE,
+		.elem_len	= 1,
+		.elem_size	= sizeof(uint32_t),
+		.array_type	= NO_ARRAY,
+		.tlv_type	= 0x05,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_set_wlan_per_info_req_msg_v01,
+			eth_hdr_offset),
+	},
+	{
+		.data_type	= QMI_UNSIGNED_1_BYTE,
+		.elem_len	= 64,
+		.elem_size	= sizeof(uint8_t),
+		.array_type	= STATIC_ARRAY,
+		.tlv_type	= 0x06,
+		.offset		= offsetof(
+			struct ipa_wlan_opt_dp_set_wlan_per_info_req_msg_v01,
+			hdr_info),
+	},
+	{
+		.data_type	= QMI_EOTI,
+		.array_type	= NO_ARRAY,
+		.tlv_type	= QMI_COMMON_TLV_TYPE,
+	},
+};
+
+struct qmi_elem_info ipa_wlan_opt_dp_set_wlan_per_info_resp_msg_data_v01[] = {
+	{
+		.data_type      = QMI_STRUCT,
+		.elem_len       = 1,
+		.elem_size      = sizeof(struct qmi_response_type_v01),
+		.array_type     = NO_ARRAY,
+		.tlv_type       = 0x02,
+		.offset         = offsetof(
+			struct ipa_wlan_opt_dp_set_wlan_per_info_resp_msg_v01,
+			resp),
+		.ei_array      = qmi_response_type_v01_ei,
+	},
+	{
+		.data_type	= QMI_EOTI,
+		.array_type	= NO_ARRAY,
+		.tlv_type	= QMI_COMMON_TLV_TYPE,
+	},
+};

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

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2018 - 2021, The Linux Foundation. All rights reserved.
+ *
+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include "ipa_i.h"
@@ -1026,6 +1028,10 @@ int ipa3_disconn_wdi3_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx,
 
 	if (ipa3_ctx->ipa_hw_type >= IPA_HW_v4_5)
 		ipa3_uc_debug_stats_dealloc(IPA_HW_PROTOCOL_WDI3);
+
+	if (ipa3_ctx->ipa_wdi_opt_dpath)
+		ipa3_disable_wdi3_opt_dpath(ipa_ep_idx_rx);
+
 	ipa3_delete_dflt_flt_rules(ipa_ep_idx_rx);
 	memset(ep_rx, 0, sizeof(struct ipa3_ep_context));
 	IPADBG("rx client (ep: %d) disconnected\n", ipa_ep_idx_rx);
@@ -1393,3 +1399,45 @@ int ipa3_get_wdi3_gsi_stats(struct ipa_uc_dbg_ring_stats *stats)
 
 	return 0;
 }
+
+int ipa3_enable_wdi3_opt_dpath(int ipa_ep_idx_rx, u32 rt_tbl_idx)
+{
+	int result = 0;
+
+	/* wdi3 only support over gsi */
+	if (ipa_get_wdi_version() < IPA_WDI_3) {
+		IPAERR("wdi3 over uc offload not supported");
+		WARN_ON(1);
+		return -EFAULT;
+	}
+
+	IPADBG("ep_rx = %d\n", ipa_ep_idx_rx);
+	IPADBG("rt_tbl_idx = %d\n", rt_tbl_idx);
+
+	/* Install default filter rules.*/
+	ipa3_install_dl_opt_wdi_dpath_flt_rules(ipa_ep_idx_rx, rt_tbl_idx);
+
+	return result;
+}
+EXPORT_SYMBOL(ipa3_enable_wdi3_opt_dpath);
+
+int ipa3_disable_wdi3_opt_dpath(int ipa_ep_idx_rx)
+{
+	int result = 0;
+
+	/* wdi3 only support over gsi */
+	if (ipa_get_wdi_version() < IPA_WDI_3) {
+		IPAERR("wdi3 over uc offload not supported");
+		WARN_ON(1);
+		return -EFAULT;
+	}
+
+	IPADBG("ep_rx = %d\n", ipa_ep_idx_rx);
+
+	/* Install default filter rules.*/
+	ipa3_delete_dl_opt_wdi_dpath_flt_rules(ipa_ep_idx_rx);
+
+	return result;
+}
+EXPORT_SYMBOL(ipa3_disable_wdi3_opt_dpath);
+