qcacld-3.0: Ensure SNR/RSSI fits int8 before passing to UMAC
Firmware reports SNR and RSSI in int32 variable due to restriction
of WMI, however host uses int8 for these. This is causing RSSI or
SNR value to be altered when typecasted. Fix range change for SNR
and RSSI at WMA and ensure it fits int8 before passing to UMAC.
Change-Id: Idc3c4f48bb1212b5f10104843960d1a509403456
CRs-Fixed: 2042747
diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h
index 8e8446f..ae3e636 100644
--- a/core/wma/inc/wma.h
+++ b/core/wma/inc/wma.h
@@ -271,14 +271,9 @@
#define WMA_VDEV_STOP_REQUEST_TIMEOUT (6000) /* 6 seconds */
#define WMA_VDEV_HW_MODE_REQUEST_TIMEOUT (5000) /* 5 seconds */
-/*
- * The firmware value has been changed recently to 0x127
- * But, to maintain backward compatibility, the old
- * value is also preserved.
- */
#define WMA_TGT_INVALID_SNR (0)
-#define WMA_TGT_IS_VALID_SNR(x) (((x) >= 0 && (x) < 0x7f) ? true : false)
+#define WMA_TGT_IS_VALID_SNR(x) ((x) >= 0 && (x) < WMA_TGT_MAX_SNR)
#define WMA_TGT_IS_INVALID_SNR(x) (!WMA_TGT_IS_VALID_SNR(x))
#define WMA_TX_Q_RECHECK_TIMER_WAIT 2 /* 2 ms */
diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h
index abeb770..a59f80d 100644
--- a/core/wma/inc/wma_internal.h
+++ b/core/wma/inc/wma_internal.h
@@ -62,7 +62,7 @@
* similar to the mentioned the WMA
*/
#define WMA_TGT_NOISE_FLOOR_DBM (-96)
-#define WMA_TGT_RSSI_INVALID 96
+#define WMA_TGT_MAX_SNR (WMA_TGT_NOISE_FLOOR_DBM * (-1))
/*
* Make sure that link monitor and keep alive
diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c
index f61e698..910ae89 100644
--- a/core/wma/src/wma_utils.c
+++ b/core/wma/src/wma_utils.c
@@ -2257,7 +2257,7 @@
int32_t rssi;
struct wma_target_req *req_msg;
static const uint8_t zero_mac[QDF_MAC_ADDR_SIZE] = {0};
- int8_t bcn_snr, dat_snr;
+ int32_t bcn_snr, dat_snr;
node = &wma->interfaces[vdev_stats->vdev_id];
if (wma_is_vdev_up(vdev_stats->vdev_id) &&
@@ -2302,11 +2302,11 @@
uint8_t *stats_buf;
struct wma_txrx_node *node;
uint8_t i;
- int8_t rssi = 0;
+ int32_t rssi = 0;
QDF_STATUS qdf_status;
tAniGetRssiReq *pGetRssiReq = (tAniGetRssiReq *) wma->pGetRssiReq;
struct scheduler_msg sme_msg = { 0 };
- int8_t bcn_snr, dat_snr;
+ int32_t bcn_snr, dat_snr;
bcn_snr = vdev_stats->vdev_snr.bcn_snr;
dat_snr = vdev_stats->vdev_snr.dat_snr;
@@ -2346,7 +2346,7 @@
} else if (WMA_TGT_IS_VALID_SNR(dat_snr)) {
summary_stats->snr = dat_snr;
summary_stats->rssi =
- bcn_snr + WMA_TGT_NOISE_FLOOR_DBM;
+ dat_snr + WMA_TGT_NOISE_FLOOR_DBM;
} else {
summary_stats->snr = WMA_TGT_INVALID_SNR;
summary_stats->rssi = 0;
@@ -2527,7 +2527,7 @@
struct csr_per_chain_rssi_stats_info *rssi_per_chain_stats)
{
int i;
- int8_t bcn_snr, dat_snr;
+ int32_t bcn_snr, dat_snr;
for (i = 0; i < NUM_CHAINS_MAX; i++) {
bcn_snr = rssi_stats->rssi_avg_beacon[i];