From 407870de437c58a7e8e4b38e45bf3e3034efce10 Mon Sep 17 00:00:00 2001 From: Padma Raghunathan Date: Wed, 11 Mar 2020 09:56:35 +0530 Subject: [PATCH] qcacmn: CFR: Report correct values for RSSI and cfr_timer_enable 1. Clear cfr_timer_enable flag during wifi down 2. Similar to one-shot capture, report RSSI in metadata for RCC. Convert SNR in rxtlv to RSSI. Change-Id: I1802ea25b306faf06be52da60edb5050ff1bea9c CRs-Fixed: 2649714 --- target_if/cfr/src/target_if_cfr_6018.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target_if/cfr/src/target_if_cfr_6018.c b/target_if/cfr/src/target_if_cfr_6018.c index 9522b7242e21..74b76db287d7 100644 --- a/target_if/cfr/src/target_if_cfr_6018.c +++ b/target_if/cfr/src/target_if_cfr_6018.c @@ -31,6 +31,8 @@ #include #include "cdp_txrx_ctrl.h" +#define CMN_NOISE_FLOOR (-96) + static u_int32_t end_magic = 0xBEAFDEAD; /** * get_lut_entry() - Retrieve LUT entry using cookie number @@ -712,7 +714,8 @@ void target_if_cfr_rx_tlv_process(struct wlan_objmgr_pdev *pdev, void *nbuf) meta->num_mu_users = CYP_CFR_MU_USERS; for (i = 0; i < MAX_CHAIN; i++) - meta->chain_rssi[i] = cdp_rx_ppdu->per_chain_rssi[i]; + meta->chain_rssi[i] = + cdp_rx_ppdu->per_chain_rssi[i] + CMN_NOISE_FLOOR; if (cdp_rx_ppdu->u.ppdu_type != CDP_RX_TYPE_SU) { for (i = 0 ; i < meta->num_mu_users; i++) { @@ -1607,6 +1610,7 @@ QDF_STATUS cfr_6018_deinit_pdev(struct wlan_objmgr_psoc *psoc, qdf_mem_zero(&pcfr->rcc_param, sizeof(struct cfr_rcc_param)); qdf_mem_zero(&pcfr->global, (sizeof(struct ta_ra_cfr_cfg) * MAX_TA_RA_ENTRIES)); + pcfr->cfr_timer_enable = 0; #ifdef DIRECT_BUF_RX_ENABLE status = target_if_unregister_to_dbr_enh(pdev);