From fd0368882b1fdb496e71c9dcfc97b98d0f01680c Mon Sep 17 00:00:00 2001
From: Jeevan Kukkalli <quic_jeevank@quicinc.com>
Date: Mon, 26 Dec 2022 21:19:38 +0530
Subject: [PATCH] qcacmn: Enable FPMO filter settings

Enable code to set FPMO filter registers

Change-Id: I12c58da32dc15cd3f729f3a3d006eec86b27e47c
CRs-Fixed: 3378372
---
 dp/wifi3.0/dp_htt.c                        |  2 --
 dp/wifi3.0/dp_internal.h                   |  6 ++++++
 dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.c | 10 ++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/dp/wifi3.0/dp_htt.c b/dp/wifi3.0/dp_htt.c
index cac8bc8682..55ef806ea3 100644
--- a/dp/wifi3.0/dp_htt.c
+++ b/dp/wifi3.0/dp_htt.c
@@ -1651,13 +1651,11 @@ int htt_h2t_rx_ring_cfg(struct htt_soc *htt_soc, int pdev_id,
 
 	dp_mon_rx_enable_pkt_tlv_offset(soc->dp_soc, msg_word, htt_tlv_filter);
 
-#ifdef FW_SUPPORT_NOT_YET
 	/* word 20 and 21*/
 	msg_word += 4;
 	*msg_word = 0;
 
 	dp_mon_rx_enable_fpmo(soc->dp_soc, msg_word, htt_tlv_filter);
-#endif/* FW_SUPPORT_NOT_YET */
 
 	/* "response_required" field should be set if a HTT response message is
 	 * required after setting up the ring.
diff --git a/dp/wifi3.0/dp_internal.h b/dp/wifi3.0/dp_internal.h
index 8236b61c01..e381325d45 100644
--- a/dp/wifi3.0/dp_internal.h
+++ b/dp/wifi3.0/dp_internal.h
@@ -966,6 +966,12 @@ dp_mon_rx_enable_pkt_tlv_offset(struct dp_soc *soc, uint32_t *msg_word,
 {
 }
 
+static inline void
+dp_mon_rx_enable_fpmo(struct dp_soc *soc, uint32_t *msg_word,
+		      struct htt_rx_ring_tlv_filter *tlv_filter)
+{
+}
+
 #ifdef WLAN_TELEMETRY_STATS_SUPPORT
 static inline
 void dp_monitor_peer_telemetry_stats(struct dp_peer *peer,
diff --git a/dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.c b/dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.c
index 7f4e1c6483..2c0772cd96 100644
--- a/dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.c
+++ b/dp/wifi3.0/monitor/2.0/dp_mon_filter_2.0.c
@@ -246,7 +246,6 @@ void
 dp_rx_mon_enable_fpmo(uint32_t *msg_word,
 		      struct htt_rx_ring_tlv_filter *tlv_filter)
 {
-#ifdef FW_SUPPORT_NOT_YET
 	if (!msg_word || !tlv_filter)
 		return;
 
@@ -388,7 +387,7 @@ dp_rx_mon_enable_fpmo(uint32_t *msg_word,
 			(tlv_filter->fpmo_ctrl_filter &
 			FILTER_CTRL_CFEND_CFACK) ? 1 : 0);
 
-		/* word 18 */
+		/* word 21 */
 		msg_word++;
 		*msg_word = 0;
 
@@ -407,15 +406,14 @@ dp_rx_mon_enable_fpmo(uint32_t *msg_word,
 			FILTER_DATA_NULL) ? 1 : 0);
 
 	} else {
-		/* clear word 18 if fpmo is disabled
-		 * word 17 is already cleared by caller
+		/* clear word 21 if fpmo is disabled
+		 * word 20 is already cleared by caller
 		 */
 
-		/* word 18 */
+		/* word 21 */
 		msg_word++;
 		*msg_word = 0;
 	}
-#endif
 }
 
 static void