qcacld-3.0: Multiple cleanup regarding access category

1. Replace TX_WMM_AC_NUM/OL_TX_NUM_WMM_AC with QCA_WLAN_AC_ALL
2. Replace SIR_QOS_NUM_AC_MAX with QCA_WLAN_AC_ALL
3. Replace WME_NUM_AC with QCA_WLAN_AC_ALL
4. Fix the typo sme_qos_u_pto_ac_map

CRs-Fixed: 2430527
Change-Id: Id2b4624d60a2bd7dd1471c65699ef0de1b88aecf

components/fw_offload/dispatcher/inc/cfg_fwol_generic.h

@@ -95,7 +95,7 @@
  *
  * Firmware by default categorizes ARP packets with VOICE TID.
  * This ini shall be used to override the default configuration.
- * Access category enums are referenced in ieee80211_common.h
+ * Access category enums are referenced in qca-vendor.h
  * QCA_WLAN_AC_BE = 0 (Best effort)
  * QCA_WLAN_AC_BK = 1 (Background)
  * QCA_WLAN_AC_VI = 2 (Video)

core/cds/inc/cds_config.h

@@ -30,6 +30,7 @@
 #include "osdep.h"
 #include "cdp_txrx_mob_def.h"
 #include "wlan_pmo_common_public_struct.h"
+#include "qca_vendor.h"
 
 /**
  * enum cfg_sub_20_channel_width: ini values for su 20 mhz channel width
@@ -95,7 +96,7 @@ struct cds_config_info {
 	uint8_t max_msdus_per_rxinorderind;
 	bool self_recovery_enabled;
 	bool fw_timeout_crash;
-	struct ol_tx_sched_wrr_ac_specs_t ac_specs[TX_WMM_AC_NUM];
+	struct ol_tx_sched_wrr_ac_specs_t ac_specs[QCA_WLAN_AC_ALL];
 	uint8_t ito_repeat_count;
 	bool force_target_assert_enabled;
 	uint8_t bandcapability;

core/cds/inc/cds_sched.h

@@ -206,7 +206,7 @@ struct cds_context {
 	bool enable_fatal_event;
 	struct cds_config_info *cds_cfg;
 
-	struct ol_tx_sched_wrr_ac_specs_t ac_specs[TX_WMM_AC_NUM];
+	struct ol_tx_sched_wrr_ac_specs_t ac_specs[QCA_WLAN_AC_ALL];
 	qdf_work_t cds_recovery_work;
 	qdf_workqueue_t *cds_recovery_wq;
 	enum qdf_hang_reason recovery_reason;

core/cds/src/cds_api.c

@@ -280,7 +280,7 @@ cds_cfg_update_ac_specs_params(struct txrx_pdev_cfg_param_t *olcfg,
 	if (!cds_cfg)
 		return;
 
-	for (i = 0; i < OL_TX_NUM_WMM_AC; i++) {
+	for (i = 0; i < QCA_WLAN_AC_ALL; i++) {
 		olcfg->ac_specs[i].wrr_skip_weight =
 			cds_cfg->ac_specs[i].wrr_skip_weight;
 		olcfg->ac_specs[i].credit_threshold =
@@ -447,7 +447,7 @@ cds_set_ac_specs_params(struct cds_config_info *cds_cfg)
 		return;
 	}
 
-	for (i = 0; i < OL_TX_NUM_WMM_AC; i++) {
+	for (i = 0; i < QCA_WLAN_AC_ALL; i++) {
 		cds_cfg->ac_specs[i] = cds_ctx->ac_specs[i];
 	}
 }

core/dp/ol/inc/ol_cfg.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2019 The Linux Foundation. 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
@@ -30,6 +30,7 @@
 #endif
 #include "ol_txrx_ctrl_api.h"   /* txrx_pdev_cfg_param_t */
 #include <cdp_txrx_handle.h>
+#include "qca_vendor.h"
 
 /**
  * @brief format of data frames delivered to/from the WLAN driver by/to the OS
@@ -96,7 +97,7 @@ struct txrx_pdev_cfg_t {
 	 * HTT_T2H_MSG_TYPE_TX_CREDIT_UPDATE_IND only.
 	 */
 	u8 credit_update_enabled;
-	struct ol_tx_sched_wrr_ac_specs_t ac_specs[TX_WMM_AC_NUM];
+	struct ol_tx_sched_wrr_ac_specs_t ac_specs[QCA_WLAN_AC_ALL];
 	bool gro_enable;
 	bool tso_enable;
 	bool lro_enable;

core/dp/txrx/ol_cfg.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2019 The Linux Foundation. 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
@@ -163,7 +163,7 @@ struct cdp_cfg *ol_pdev_cfg_attach(qdf_device_t osdev, void *pcfg_param)
 
 	ol_tx_set_flow_control_parameters((struct cdp_cfg *)cfg_ctx, cfg_param);
 
-	for (i = 0; i < OL_TX_NUM_WMM_AC; i++) {
+	for (i = 0; i < QCA_WLAN_AC_ALL; i++) {
 		cfg_ctx->ac_specs[i].wrr_skip_weight =
 			cfg_param->ac_specs[i].wrr_skip_weight;
 		cfg_ctx->ac_specs[i].credit_threshold =
@@ -492,7 +492,7 @@ int ol_cfg_get_wrr_skip_weight(struct cdp_cfg *pdev, int ac)
 {
 	struct txrx_pdev_cfg_t *cfg = (struct txrx_pdev_cfg_t *)pdev;
 
-	if (ac >= OL_TX_WMM_AC_BE && ac <= OL_TX_WMM_AC_VO)
+	if (ac >= QCA_WLAN_AC_BE && ac <= QCA_WLAN_AC_VO)
 		return cfg->ac_specs[ac].wrr_skip_weight;
 
 	return 0;
@@ -509,7 +509,7 @@ uint32_t ol_cfg_get_credit_threshold(struct cdp_cfg *pdev, int ac)
 {
 	struct txrx_pdev_cfg_t *cfg = (struct txrx_pdev_cfg_t *)pdev;
 
-	if (ac >= OL_TX_WMM_AC_BE && ac <= OL_TX_WMM_AC_VO)
+	if (ac >= QCA_WLAN_AC_BE && ac <= QCA_WLAN_AC_VO)
 		return cfg->ac_specs[ac].credit_threshold;
 
 	return 0;
@@ -526,7 +526,7 @@ uint16_t ol_cfg_get_send_limit(struct cdp_cfg *pdev, int ac)
 {
 	struct txrx_pdev_cfg_t *cfg = (struct txrx_pdev_cfg_t *)pdev;
 
-	if (ac >= OL_TX_WMM_AC_BE && ac <= OL_TX_WMM_AC_VO)
+	if (ac >= QCA_WLAN_AC_BE && ac <= QCA_WLAN_AC_VO)
 		return cfg->ac_specs[ac].send_limit;
 
 	return 0;
@@ -543,7 +543,7 @@ int ol_cfg_get_credit_reserve(struct cdp_cfg *pdev, int ac)
 {
 	struct txrx_pdev_cfg_t *cfg = (struct txrx_pdev_cfg_t *)pdev;
 
-	if (ac >= OL_TX_WMM_AC_BE && ac <= OL_TX_WMM_AC_VO)
+	if (ac >= QCA_WLAN_AC_BE && ac <= QCA_WLAN_AC_VO)
 		return cfg->ac_specs[ac].credit_reserve;
 
 	return 0;
@@ -560,7 +560,7 @@ int ol_cfg_get_discard_weight(struct cdp_cfg *pdev, int ac)
 {
 	struct txrx_pdev_cfg_t *cfg = (struct txrx_pdev_cfg_t *)pdev;
 
-	if (ac >= OL_TX_WMM_AC_BE && ac <= OL_TX_WMM_AC_VO)
+	if (ac >= QCA_WLAN_AC_BE && ac <= QCA_WLAN_AC_VO)
 		return cfg->ac_specs[ac].discard_weight;
 
 	return 0;

core/dp/txrx/ol_tx_sched.c

@@ -1124,7 +1124,7 @@ ol_txrx_set_wmm_param(struct cdp_pdev *pdev,
 	struct ol_tx_sched_wrr_adv_t *scheduler =
 					data_pdev->tx_sched.scheduler;
 	u_int32_t i, ac_selected;
-	u_int32_t  weight[OL_TX_NUM_WMM_AC], default_edca[OL_TX_NUM_WMM_AC];
+	u_int32_t  weight[QCA_WLAN_AC_ALL], default_edca[QCA_WLAN_AC_ALL];
 
 	OL_TX_SCHED_WRR_ADV_CAT_CFG_STORE(VO, (&def_cfg));
 	OL_TX_SCHED_WRR_ADV_CAT_CFG_STORE(VI, (&def_cfg));
@@ -1142,19 +1142,19 @@ ol_txrx_set_wmm_param(struct cdp_pdev *pdev,
 		OL_TX_AIFS_DEFAULT_BK + OL_TX_CW_MIN_DEFAULT_BK;
 
 	weight[OL_TX_SCHED_WRR_ADV_CAT_VO] =
-		wmm_param.ac[OL_TX_WMM_AC_VO].aifs +
-				wmm_param.ac[OL_TX_WMM_AC_VO].cwmin;
+		wmm_param.ac[QCA_WLAN_AC_VO].aifs +
+				wmm_param.ac[QCA_WLAN_AC_VO].cwmin;
 	weight[OL_TX_SCHED_WRR_ADV_CAT_VI] =
-		wmm_param.ac[OL_TX_WMM_AC_VI].aifs +
-				wmm_param.ac[OL_TX_WMM_AC_VI].cwmin;
+		wmm_param.ac[QCA_WLAN_AC_VI].aifs +
+				wmm_param.ac[QCA_WLAN_AC_VI].cwmin;
 	weight[OL_TX_SCHED_WRR_ADV_CAT_BK] =
-		wmm_param.ac[OL_TX_WMM_AC_BK].aifs +
-				wmm_param.ac[OL_TX_WMM_AC_BK].cwmin;
+		wmm_param.ac[QCA_WLAN_AC_BK].aifs +
+				wmm_param.ac[QCA_WLAN_AC_BK].cwmin;
 	weight[OL_TX_SCHED_WRR_ADV_CAT_BE] =
-		wmm_param.ac[OL_TX_WMM_AC_BE].aifs +
-				wmm_param.ac[OL_TX_WMM_AC_BE].cwmin;
+		wmm_param.ac[QCA_WLAN_AC_BE].aifs +
+				wmm_param.ac[QCA_WLAN_AC_BE].cwmin;
 
-	for (i = 0; i < OL_TX_NUM_WMM_AC; i++) {
+	for (i = 0; i < QCA_WLAN_AC_ALL; i++) {
 		if (default_edca[OL_TX_SCHED_WRR_ADV_CAT_VO] >= weight[i])
 			ac_selected = OL_TX_SCHED_WRR_ADV_CAT_VO;
 		else if (default_edca[OL_TX_SCHED_WRR_ADV_CAT_VI] >= weight[i])

core/hdd/src/wlan_hdd_hostapd_wext.c

@@ -2365,8 +2365,8 @@ static int __iw_softap_get_ba_timeout(struct net_device *dev,
 				      union iwreq_data *wrqu, char *extra)
 {
 	int errno;
-	uint8_t ac_cat = 4;
-	uint32_t duration[QCA_WLAN_AC_ALL], i;
+	uint32_t i;
+	enum qca_wlan_ac_type duration[QCA_WLAN_AC_ALL];
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	struct hdd_adapter *adapter;
 	struct hdd_context *hdd_ctx;
@@ -2388,7 +2388,7 @@ static int __iw_softap_get_ba_timeout(struct net_device *dev,
 		return -EINVAL;
 	}
 
-	for (i = 0; i < ac_cat; i++)
+	for (i = 0; i < QCA_WLAN_AC_ALL; i++)
 		cdp_get_ba_timeout(soc, i, &duration[i]);
 
 	snprintf(extra, WE_SAP_MAX_STA_INFO,
@@ -2397,10 +2397,11 @@ static int __iw_softap_get_ba_timeout(struct net_device *dev,
 		 "|--------------------------------|\n"
 		 "|VO |  %d        |\n"
 		 "|VI |  %d        |\n"
-		 "|BE |  %d        |\n"
 		 "|BK |  %d        |\n"
+		 "|BE |  %d        |\n"
 		 "|--------------------------------|\n",
-		duration[3], duration[2], duration[1], duration[0]);
+		duration[QCA_WLAN_AC_VO], duration[QCA_WLAN_AC_VI],
+		duration[QCA_WLAN_AC_BK], duration[QCA_WLAN_AC_BE]);
 
 	wrqu->data.length = strlen(extra) + 1;
 	hdd_exit();

core/hdd/src/wlan_hdd_main.c

@@ -2447,9 +2447,9 @@ hdd_update_cds_ac_specs_params(struct hdd_context *hdd_ctx)
 		return;
 	}
 
-	for (i = 0; i < OL_TX_NUM_WMM_AC; i++) {
+	for (i = 0; i < QCA_WLAN_AC_ALL; i++) {
 		switch (i) {
-		case OL_TX_WMM_AC_BE:
+		case QCA_WLAN_AC_BE:
 			qdf_uint8_array_parse(
 				cfg_get(hdd_ctx->psoc,
 					CFG_DP_ENABLE_TX_SCHED_WRR_BE),
@@ -2457,7 +2457,7 @@ hdd_update_cds_ac_specs_params(struct hdd_context *hdd_ctx)
 				sizeof(tx_sched_wrr_param),
 				&out_size);
 			break;
-		case OL_TX_WMM_AC_BK:
+		case QCA_WLAN_AC_BK:
 			qdf_uint8_array_parse(
 				cfg_get(hdd_ctx->psoc,
 					CFG_DP_ENABLE_TX_SCHED_WRR_BK),
@@ -2465,7 +2465,7 @@ hdd_update_cds_ac_specs_params(struct hdd_context *hdd_ctx)
 				sizeof(tx_sched_wrr_param),
 				&out_size);
 			break;
-		case OL_TX_WMM_AC_VI:
+		case QCA_WLAN_AC_VI:
 			qdf_uint8_array_parse(
 				cfg_get(hdd_ctx->psoc,
 					CFG_DP_ENABLE_TX_SCHED_WRR_VI),
@@ -2473,7 +2473,7 @@ hdd_update_cds_ac_specs_params(struct hdd_context *hdd_ctx)
 				sizeof(tx_sched_wrr_param),
 				&out_size);
 			break;
-		case OL_TX_WMM_AC_VO:
+		case QCA_WLAN_AC_VO:
 			qdf_uint8_array_parse(
 				cfg_get(hdd_ctx->psoc,
 					CFG_DP_ENABLE_TX_SCHED_WRR_VO),

core/hdd/src/wlan_hdd_wext.c

@@ -7104,8 +7104,8 @@ static int __iw_get_char_setnone(struct net_device *dev,
 
 	case WE_GET_BA_AGEING_TIMEOUT:
 	{
-		uint8_t ac_cat = 4;
-		uint32_t duration[QCA_WLAN_AC_ALL], i;
+		uint32_t i;
+		enum qca_wlan_ac_type duration[QCA_WLAN_AC_ALL];
 		void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 
 		if (!soc) {
@@ -7113,7 +7113,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 			break;
 		}
 
-		for (i = 0; i < ac_cat; i++)
+		for (i = 0; i < QCA_WLAN_AC_ALL; i++)
 			cdp_get_ba_timeout(soc, i, &duration[i]);
 
 		snprintf(extra, WE_MAX_STR_LEN,
@@ -7122,10 +7122,11 @@ static int __iw_get_char_setnone(struct net_device *dev,
 			 "|--------------------------------|\n"
 			 "|VO |  %d        |\n"
 			 "|VI |  %d        |\n"
-			 "|BE |  %d        |\n"
 			 "|BK |  %d        |\n"
+			 "|BE |  %d        |\n"
 			 "|--------------------------------|\n",
-			duration[3], duration[2], duration[1], duration[0]);
+			duration[QCA_WLAN_AC_VO], duration[QCA_WLAN_AC_VI],
+			duration[QCA_WLAN_AC_BK], duration[QCA_WLAN_AC_BE]);
 
 		wrqu->data.length = strlen(extra) + 1;
 		break;

core/hdd/src/wlan_hdd_wmm.c

@@ -2290,7 +2290,7 @@ bool hdd_wmm_is_acm_allowed(uint8_t vdev_id)
 	wmm_ac_status = adapter->hdd_wmm_status.ac_status;
 
 	if (hdd_wmm_is_active(adapter) &&
-	    !(wmm_ac_status[OL_TX_WMM_AC_VI].is_access_allowed))
+	    !(wmm_ac_status[QCA_WLAN_AC_VI].is_access_allowed))
 		return false;
 	return true;
 }

core/mac/inc/sir_api.h

@@ -47,6 +47,7 @@ struct mac_context;
 #include <dot11f.h>
 #include "wlan_policy_mgr_api.h"
 #include "wlan_tdls_public_structs.h"
+#include "qca_vendor.h"
 
 #define OFFSET_OF(structType, fldName)   (&((structType *)0)->fldName)
 
@@ -1599,11 +1600,9 @@ typedef struct sSirDeltsRsp {
 	struct delts_req_info rsp;
 } tSirDeltsRsp, *tpSirDeltsRsp;
 
-#define SIR_QOS_NUM_AC_MAX 4
-
 typedef struct sSirAggrQosReqInfo {
 	uint16_t tspecIdx;
-	tSirAddtsReqInfo aggrAddTsInfo[SIR_QOS_NUM_AC_MAX];
+	tSirAddtsReqInfo aggrAddTsInfo[QCA_WLAN_AC_ALL];
 } tSirAggrQosReqInfo, *tpSirAggrQosReqInfo;
 
 typedef struct sSirAggrQosReq {
@@ -1618,7 +1617,7 @@ typedef struct sSirAggrQosReq {
 
 typedef struct sSirAggrQosRspInfo {
 	uint16_t tspecIdx;
-	tSirAddtsRspInfo aggrRsp[SIR_QOS_NUM_AC_MAX];
+	tSirAddtsRspInfo aggrRsp[QCA_WLAN_AC_ALL];
 } tSirAggrQosRspInfo, *tpSirAggrQosRspInfo;
 
 typedef struct sSirAggrQosRsp {

core/mac/src/pe/lim/lim_ft.c

@@ -839,7 +839,7 @@ lim_ft_send_aggr_qos_rsp(struct mac_context *mac, uint8_t rspReqd,
 	rsp->sessionId = smesessionId;
 	rsp->length = sizeof(*rsp);
 	rsp->aggrInfo.tspecIdx = aggrQosRsp->tspecIdx;
-	for (i = 0; i < SIR_QOS_NUM_AC_MAX; i++) {
+	for (i = 0; i < QCA_WLAN_AC_ALL; i++) {
 		if ((1 << i) & aggrQosRsp->tspecIdx) {
 			if (QDF_IS_STATUS_SUCCESS(aggrQosRsp->status[i]))
 				rsp->aggrInfo.aggrRsp[i].status =
@@ -886,7 +886,7 @@ void lim_process_ft_aggr_qos_rsp(struct mac_context *mac,
 		pe_err("pe_session is not in STA mode");
 		return;
 	}
-	for (i = 0; i < WMI_QOS_NUM_AC_MAX; i++) {
+	for (i = 0; i < QCA_WLAN_AC_ALL; i++) {
 		if ((((1 << i) & pAggrQosRspMsg->tspecIdx)) &&
 		    (pAggrQosRspMsg->status[i] != QDF_STATUS_SUCCESS)) {
 			sir_copy_mac_addr(peerMacAddr, pe_session->bssId);
@@ -967,7 +967,7 @@ QDF_STATUS lim_process_ft_aggr_qos_req(struct mac_context *mac,
 	pAggrAddTsParam->tspecIdx = aggrQosReq->aggrInfo.tspecIdx;
 	pAggrAddTsParam->vdev_id = pe_session->smeSessionId;
 
-	for (i = 0; i < WMI_QOS_NUM_AC_MAX; i++) {
+	for (i = 0; i < QCA_WLAN_AC_ALL; i++) {
 		if (aggrQosReq->aggrInfo.tspecIdx & (1 << i)) {
 			struct mac_tspec_ie *pTspec =
 				&aggrQosReq->aggrInfo.aggrAddTsInfo[i].tspec;

core/sme/src/qos/sme_qos.c

@@ -118,7 +118,7 @@ enum sme_qos_reasontype {
 /* Table to map user priority passed in as an argument to appropriate Access
  * Category as specified in 802.11e/WMM
  */
-enum qca_wlan_ac_type sme_qos_u_pto_ac_map[SME_QOS_WMM_UP_MAX] = {
+enum qca_wlan_ac_type sme_qos_up_to_ac_map[SME_QOS_WMM_UP_MAX] = {
 	QCA_WLAN_AC_BE,     /* User Priority 0 */
 	QCA_WLAN_AC_BK,     /* User Priority 1 */
 	QCA_WLAN_AC_BK,     /* User Priority 2 */
@@ -2869,7 +2869,7 @@ sme_qos_ese_save_tspec_response(struct mac_context *mac, uint8_t sessionId,
 		&sme_qos_cb.sessionInfo[sessionId].ac_info[ac].
 		addTsRsp[tspecIndex];
 
-	ac = sme_qos_u_pto_ac_map[pTspec->user_priority];
+	ac = sme_qos_up_to_ac_map[pTspec->user_priority];
 
 	qdf_mem_zero(pAddtsRsp, sizeof(tSirAddtsRsp));
 
@@ -3543,7 +3543,7 @@ static QDF_STATUS sme_qos_process_aggr_qos_rsp(struct mac_context *mac_ctx,
 		  FL("Received AGGR_QOS resp from LIM"));
 
 	/* Copy the updated response information for TSPEC of all the ACs */
-	for (i = 0; i < SIR_QOS_NUM_AC_MAX; i++) {
+	for (i = 0; i < QCA_WLAN_AC_ALL; i++) {
 		uint8_t tspec_mask_status =
 			sme_qos_cb.sessionInfo[sessionid].ac_info[i].
 			tspec_mask_status;
@@ -5753,7 +5753,7 @@ static enum qca_wlan_ac_type sme_qos_up_to_ac(enum sme_qos_wmmuptype up)
 	enum qca_wlan_ac_type ac = QCA_WLAN_AC_ALL;
 
 	if (up >= 0 && up < SME_QOS_WMM_UP_MAX)
-		ac = sme_qos_u_pto_ac_map[up];
+		ac = sme_qos_up_to_ac_map[up];
 
 	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		  "%s: %d: up = %d ac = %d returned",

core/wma/src/wma_mgmt.c

@@ -2644,7 +2644,7 @@ QDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle,
 					     tEdcaParams *edca_params)
 {
 	tp_wma_handle wma_handle = (tp_wma_handle) handle;
-	struct wmi_host_wme_vparams wmm_param[WME_NUM_AC];
+	struct wmi_host_wme_vparams wmm_param[QCA_WLAN_AC_ALL];
 	tSirMacEdcaParamRecord *edca_record;
 	int ac;
 	struct cdp_pdev *pdev;
@@ -2659,7 +2659,7 @@ QDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle,
 		goto fail;
 	}
 
-	for (ac = 0; ac < WME_NUM_AC; ac++) {
+	for (ac = 0; ac < QCA_WLAN_AC_ALL; ac++) {
 		switch (ac) {
 		case QCA_WLAN_AC_BE:
 			edca_record = &edca_params->acbe;