qcacmn: Waikiki CFR HAL changes

Waikiki CFR HAL changes

CRs-Fixed: 3057984
Change-Id: Ibe19f580eff3d70764abc4031665d3c1299cdb8f

hal/wifi3.0/be/hal_be_generic_api.h

@@ -478,7 +478,7 @@ hal_rx_status_get_tlv_info_generic_be(void *rx_tlv_hdr, void *ppduinfo,
 		ppdu_info->rx_state = HAL_RX_MON_PPDU_END;
 		break;
 
-	case WIFIPHYRX_PKT_END_E:
+	case WIFIPHYRX_LOCATION_E:
 		hal_rx_get_rtt_info(hal_soc_hdl, rx_tlv, ppdu_info);
 		break;
 
@@ -1427,6 +1427,11 @@ hal_rx_status_get_tlv_info_generic_be(void *rx_tlv_hdr, void *ppduinfo,
 		ppdu_info->sw_frame_group_id =
 			HAL_RX_GET_SW_FRAME_GROUP_ID(rx_tlv);
 
+		ppdu_info->rx_user_status[user_id].sw_peer_id =
+			HAL_RX_GET(rx_mpdu_start,
+				   RX_MPDU_INFO,
+				   SW_PEER_ID);
+
 		if (ppdu_info->sw_frame_group_id ==
 		    HAL_MPDU_SW_FRAME_GROUP_NULL_DATA) {
 			ppdu_info->rx_status.frame_control_info_valid =

hal/wifi3.0/qcn9224/hal_9224.c

@@ -796,8 +796,8 @@ void hal_rx_get_rtt_info_9224(void *rx_tlv, void *ppdu_info_hdl)
 
 	ppdu_info->cfr_info.chan_capture_status =
 	HAL_RX_GET(rx_tlv,
-		   RX_LOCATION_INFO,
-		   RESERVED_3);
+		   PHYRX_LOCATION_RX_LOCATION_INFO_DETAILS,
+		   RTT_CFR_STATUS);
 
 	ppdu_info->cfr_info.rx_start_ts =
 	HAL_RX_GET(rx_tlv,
@@ -811,23 +811,27 @@ void hal_rx_get_rtt_info_9224(void *rx_tlv, void *ppdu_info_hdl)
 
 	ppdu_info->cfr_info.agc_gain_info0 =
 	HAL_RX_GET(rx_tlv,
-		   PHYRX_PKT_END_INFO,
-		   PHY_TIMESTAMP_1_LOWER_32);
+		   PHYRX_LOCATION_RX_LOCATION_INFO_DETAILS,
+		   GAIN_CHAIN0);
+
+	ppdu_info->cfr_info.agc_gain_info0 |=
+	(((uint32_t)HAL_RX_GET(rx_tlv,
+		    PHYRX_LOCATION_RX_LOCATION_INFO_DETAILS,
+		    GAIN_CHAIN1)) << 16);
 
 	ppdu_info->cfr_info.agc_gain_info1 =
 	HAL_RX_GET(rx_tlv,
-		   PHYRX_PKT_END_INFO,
-		   PHY_TIMESTAMP_1_UPPER_32);
+		   PHYRX_LOCATION_RX_LOCATION_INFO_DETAILS,
+		   GAIN_CHAIN2);
 
-	ppdu_info->cfr_info.agc_gain_info2 =
-	HAL_RX_GET(rx_tlv,
-		   PHYRX_PKT_END_INFO,
-		   PHY_TIMESTAMP_2_LOWER_32);
+	ppdu_info->cfr_info.agc_gain_info1 |=
+	(((uint32_t)HAL_RX_GET(rx_tlv,
+		    PHYRX_LOCATION_RX_LOCATION_INFO_DETAILS,
+		    GAIN_CHAIN3)) << 16);
 
-	ppdu_info->cfr_info.agc_gain_info3 =
-	HAL_RX_GET(rx_tlv,
-		   PHYRX_PKT_END_INFO,
-		   PHY_TIMESTAMP_2_UPPER_32);
+	ppdu_info->cfr_info.agc_gain_info2 = 0;
+
+	ppdu_info->cfr_info.agc_gain_info3 = 0;
 }
 #endif
 

hal/wifi3.0/qcn9224/hal_9224_rx.h

@@ -100,47 +100,5 @@ RX_MSDU_DETAILS_RX_MSDU_DESC_INFO_DETAILS_RESERVED_0A_OFFSET))
 
 #if defined(QCA_WIFI_WCN9224) && defined(WLAN_CFR_ENABLE) && \
 	defined(WLAN_ENH_CFR_ENABLE)
-
-static inline
-void hal_rx_get_bb_info_9224(void *rx_tlv,
-			     void *ppdu_info_hdl)
-{
-	struct hal_rx_ppdu_info *ppdu_info  = ppdu_info_hdl;
-
-	ppdu_info->cfr_info.bb_captured_channel =
-	  HAL_RX_GET(rx_tlv, RXPCU_PPDU_END_INFO, BB_CAPTURED_CHANNEL);
-
-	ppdu_info->cfr_info.bb_captured_timeout =
-	  HAL_RX_GET(rx_tlv, RXPCU_PPDU_END_INFO, BB_CAPTURED_TIMEOUT);
-
-	ppdu_info->cfr_info.bb_captured_reason =
-	  HAL_RX_GET(rx_tlv, RXPCU_PPDU_END_INFO, BB_CAPTURED_REASON);
-}
-
-static inline
-void hal_rx_get_rtt_info_9224(void *rx_tlv,
-			      void *ppdu_info_hdl)
-{
-	struct hal_rx_ppdu_info *ppdu_info  = ppdu_info_hdl;
-
-	ppdu_info->cfr_info.rx_location_info_valid =
-		HAL_RX_GET(rx_tlv, PHYRX_LOCATION,
-			   RX_LOCATION_INFO_DETAILS_RX_LOCATION_INFO_VALID);
-
-	ppdu_info->cfr_info.rtt_che_buffer_pointer_low32 =
-	HAL_RX_GET(rx_tlv,
-		   RX_LOCATION_INFO,
-		   RTT_CHE_BUFFER_POINTER_LOW32);
-
-	ppdu_info->cfr_info.rtt_che_buffer_pointer_high8 =
-	HAL_RX_GET(rx_tlv,
-		   RX_LOCATION_INFO,
-		   RTT_CHE_BUFFER_POINTER_HIGH8);
-
-	ppdu_info->cfr_info.chan_capture_status =
-	HAL_RX_GET(rx_tlv,
-		   RX_LOCATION_INFO,
-		   RESERVED_3);
-}
 #endif
 #endif