Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4bd71be authored by Wu Gao's avatar Wu Gao Committed by Madan Koyyalamudi
Browse files

qcacmn: Populate additional params to CFR info for QCA6490 

HAL changes to populate agc gain, CFO, rx_start_ts, mcs_rate and
gi_type to CFR info for QCA6490.

Change-Id: I6f6f47c87d40bd661162f764fb3a360230a56457
CRs-Fixed: 3086667
parent 9a4fd7c0

hal/wifi3.0/qca6490/hal_6490_rx.h

+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -462,6 +463,45 @@ void hal_rx_get_rtt_info_6490(void *rx_tlv, 
	HAL_RX_GET(rx_tlv,

		   PHYRX_PKT_END_13_RX_PKT_END_DETAILS_RX_LOCATION_INFO_DETAILS,

		   RESERVED_8);

	ppdu_info->cfr_info.rx_start_ts =

	HAL_RX_GET(rx_tlv,

		   PHYRX_PKT_END_9_RX_PKT_END_DETAILS_RX_LOCATION_INFO_DETAILS,

		   RX_START_TS);



	ppdu_info->cfr_info.rtt_cfo_measurement = (int16_t)

	HAL_RX_GET(rx_tlv,

		   PHYRX_PKT_END_13_RX_PKT_END_DETAILS_RX_LOCATION_INFO_DETAILS,

		   RTT_CFO_MEASUREMENT);



	ppdu_info->cfr_info.agc_gain_info0 =

	HAL_RX_GET(rx_tlv,

		   PHYRX_PKT_END_1_RX_PKT_END_DETAILS,

		   PHY_TIMESTAMP_1_LOWER_32);



	ppdu_info->cfr_info.agc_gain_info1 =

	HAL_RX_GET(rx_tlv,

		   PHYRX_PKT_END_2_RX_PKT_END_DETAILS,

		   PHY_TIMESTAMP_1_UPPER_32);



	ppdu_info->cfr_info.agc_gain_info2 =

	HAL_RX_GET(rx_tlv,

		   PHYRX_PKT_END_3_RX_PKT_END_DETAILS,

		   PHY_TIMESTAMP_2_LOWER_32);



	ppdu_info->cfr_info.agc_gain_info3 =

	HAL_RX_GET(rx_tlv,

		   PHYRX_PKT_END_4_RX_PKT_END_DETAILS,

		   PHY_TIMESTAMP_2_UPPER_32);



	ppdu_info->cfr_info.mcs_rate =

	HAL_RX_GET(rx_tlv,

		   PHYRX_PKT_END_8_RX_PKT_END_DETAILS_RX_LOCATION_INFO_DETAILS,

		   RTT_MCS_RATE);



	ppdu_info->cfr_info.gi_type =

	HAL_RX_GET(rx_tlv,

		   PHYRX_PKT_END_8_RX_PKT_END_DETAILS_RX_LOCATION_INFO_DETAILS,

		   RTT_GI_TYPE);

}

#endif

#endif

target_if/cfr/src/target_if_cfr.c

+2 −1
Original line number Diff line number Diff line
@@ -226,7 +226,8 @@ void target_if_cfr_fill_header(struct csi_cfr_header *hdr, 
		hdr->cmn.cfr_metadata_version = CFR_META_VERSION_6;

		hdr->cmn.chip_type = CFR_CAPTURE_RADIO_HKV2;

	} else {

		if (target_type == TARGET_TYPE_QCN9000)

		if (target_type == TARGET_TYPE_QCN9000 ||

		    target_type == TARGET_TYPE_QCA6490)

			hdr->cmn.cfr_metadata_version = CFR_META_VERSION_7;

		else if ((target_type == TARGET_TYPE_QCA6018) ||

			 ((target_type == TARGET_TYPE_QCA5018) && (!is_rcc)))