qcacld-3.0: Fix an array size issue

Currently, a MACRO is defined used to record the array size. However,
This has a potential risk if the array size changes but the corresponding
ARRAY_SIZE MACRO is not modified accordingly. To solve this issue, this
change uses QDF_ARRAY_SIZE(_arr) to express the array size, so that the
value of QDF_ARRAY_SIZE(_arr) will always represent the size of the array.

Change-Id: I7108a21a91224fe25cfac95dc5801f83aee0a651
CRs-Fixed: 3501175

core/hdd/src/wlan_hdd_stats.c

@@ -5776,6 +5776,7 @@ bool hdd_report_max_rate(struct wlan_hdd_link_info *link_info,
 	struct index_data_rate_type *supported_mcs_rate;
 	enum data_rate_11ac_max_mcs vht_max_mcs;
 	uint8_t max_mcs_idx = 0;
+	uint8_t max_ht_mcs_idx;
 	uint8_t rate_flag = 1;
 	int mode = 0, max_ht_idx;
 	QDF_STATUS stat = QDF_STATUS_E_FAILURE;
@@ -5950,10 +5951,11 @@ bool hdd_report_max_rate(struct wlan_hdd_link_info *link_info,
 				(struct index_data_rate_type *)
 				((nss == 1) ? &supported_mcs_rate_nss1 :
 				 &supported_mcs_rate_nss2);
-
-			max_ht_idx = MAX_HT_MCS_IDX;
+			max_ht_mcs_idx =
+				QDF_ARRAY_SIZE(supported_mcs_rate_nss1);
+			max_ht_idx = max_ht_mcs_idx;
 			if (rssidx != 0) {
-				for (i = 0; i < MAX_HT_MCS_IDX; i++) {
+				for (i = 0; i < max_ht_mcs_idx; i++) {
 					if (signal <= rssi_mcs_tbl[mode][i]) {
 						max_ht_idx = i + 1;
 						break;
@@ -5977,13 +5979,13 @@ bool hdd_report_max_rate(struct wlan_hdd_link_info *link_info,
 					}
 				}
 
-				if ((j < MAX_HT_MCS_IDX) &&
+				if ((j < max_ht_mcs_idx) &&
 				    (current_rate > max_rate))
 					max_rate = current_rate;
 			}
 
 			if (nss == 2)
-				max_mcs_idx += MAX_HT_MCS_IDX;
+				max_mcs_idx += max_ht_mcs_idx;
 			max_mcs_idx = (max_mcs_idx > mcs_index) ?
 				max_mcs_idx : mcs_index;
 		}

core/hdd/src/wlan_hdd_stats.h

@@ -33,8 +33,6 @@
 #endif
 
 #define INVALID_MCS_IDX 255
-#define MAX_HT_MCS_IDX 8
-#define MAX_VHT_MCS_IDX 10
 
 #define DATA_RATE_11AC_MCS_MASK    0x03
 

core/wma/inc/wma_internal.h

@@ -49,12 +49,6 @@
 
 #define WMA_WMM_EXPO_TO_VAL(val)        ((1 << (val)) - 1)
 
-#define MAX_HT_MCS_IDX 8
-#define MAX_VHT_MCS_IDX 10
-#ifdef WLAN_FEATURE_11AX
-#define MAX_HE_MCS_IDX 12
-#define MAX_HE_MCS12_13_IDX 14
-#endif
 #define INVALID_MCS_IDX 255
 
 #define IS_MCS_HAS_DCM_RATE(val)  \

core/wma/src/wma_eht.c

@@ -989,7 +989,7 @@ uint16_t wma_match_eht_rate(uint16_t raw_rate,
 	      TX_RATE_EHT40 | TX_RATE_EHT20)))
 		return 0;
 
-	for (index = 0; index < MAX_EHT_MCS_IDX; index++) {
+	for (index = 0; index < QDF_ARRAY_SIZE(eht_mcs_nss1); index++) {
 		dcm_index_max = IS_MCS_HAS_DCM_RATE(index) ? 2 : 1;
 		for (dcm_index = 0; dcm_index < dcm_index_max; dcm_index++) {
 			if (rate_flags & TX_RATE_EHT320) {

core/wma/src/wma_eht.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 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 above
@@ -29,7 +29,6 @@ enum EHT_TXRX_MCS_NSS_IDX {
 
 #if defined(WLAN_FEATURE_11BE)
 #define MAX_EHT_DCM_INDEX 2
-#define MAX_EHT_MCS_IDX 14
 /* valid only for mcs-15 */
 #define IS_EHT_ MCS_HAS_DCM_RATE(val)  ((val) == 15)
 /**

core/wma/src/wma_utils.c

@@ -356,9 +356,9 @@ static uint16_t wma_match_he_rate(uint16_t raw_rate,
 		return 0;
 
 	if (is_he_mcs_12_13_supported)
-		max_he_mcs_idx = MAX_HE_MCS12_13_IDX;
+		max_he_mcs_idx = QDF_ARRAY_SIZE(he_mcs_nss1);
 	else
-		max_he_mcs_idx = MAX_HE_MCS_IDX;
+		max_he_mcs_idx = QDF_ARRAY_SIZE(he_mcs_nss1) - 2;
 
 	for (index = 0; index < max_he_mcs_idx; index++) {
 		dcm_index_max = IS_MCS_HAS_DCM_RATE(index) ? 2 : 1;
@@ -467,6 +467,7 @@ uint8_t wma_get_mcs_idx(uint16_t raw_rate, enum tx_rate_info rate_flags,
 {
 	uint8_t  index = 0;
 	uint16_t match_rate = 0;
+	uint8_t max_ht_mcs_idx;
 	const uint16_t *nss1_rate;
 	const uint16_t *nss2_rate;
 
@@ -488,7 +489,7 @@ uint8_t wma_get_mcs_idx(uint16_t raw_rate, enum tx_rate_info rate_flags,
 	if (match_rate)
 		goto rate_found;
 
-	for (index = 0; index < MAX_VHT_MCS_IDX; index++) {
+	for (index = 0; index < QDF_ARRAY_SIZE(vht_mcs_nss1); index++) {
 		if (rate_flags & TX_RATE_VHT160) {
 			nss1_rate = &vht_mcs_nss1[index].ht160_rate[0];
 			nss2_rate = &vht_mcs_nss2[index].ht160_rate[0];
@@ -543,7 +544,8 @@ uint8_t wma_get_mcs_idx(uint16_t raw_rate, enum tx_rate_info rate_flags,
 			}
 		}
 	}
-	for (index = 0; index < MAX_HT_MCS_IDX; index++) {
+	max_ht_mcs_idx = QDF_ARRAY_SIZE(mcs_nss1);
+	for (index = 0; index < max_ht_mcs_idx; index++) {
 		if (rate_flags & TX_RATE_HT40) {
 			nss1_rate = &mcs_nss1[index].ht40_rate[0];
 			nss2_rate = &mcs_nss2[index].ht40_rate[0];
@@ -555,7 +557,7 @@ uint8_t wma_get_mcs_idx(uint16_t raw_rate, enum tx_rate_info rate_flags,
 			if (match_rate) {
 				*mcs_rate_flag = TX_RATE_HT40;
 				if (*nss == 2)
-					index += MAX_HT_MCS_IDX;
+					index += max_ht_mcs_idx;
 				goto rate_found;
 			}
 		}
@@ -570,7 +572,7 @@ uint8_t wma_get_mcs_idx(uint16_t raw_rate, enum tx_rate_info rate_flags,
 			if (match_rate) {
 				*mcs_rate_flag = TX_RATE_HT20;
 				if (*nss == 2)
-					index += MAX_HT_MCS_IDX;
+					index += max_ht_mcs_idx;
 				goto rate_found;
 			}
 		}