From 2917f544865e1a271c46c5e9a203eec2a4bb8cae Mon Sep 17 00:00:00 2001
From: Amar Singhal <asinghal@codeaurora.org>
Date: Thu, 19 Nov 2020 11:34:09 -0800
Subject: [PATCH] qcacld-3.0: Do not loop tx power from firmware

firmware sends Hw-limit tx power in vdev response and roam sync.
Do not loop back the same value to firmware; since firmware already
knows the value.

Change-Id: Ie9ba329516d5d75329bb1baaed13c8bdb7d1eb83
CRs-Fixed: 2823108
---
 core/sme/src/csr/csr_api_roam.c | 16 ----------------
 core/wma/inc/wma_internal.h     |  9 ---------
 core/wma/inc/wma_types.h        |  1 -
 core/wma/src/wma_main.c         |  3 ---
 core/wma/src/wma_power.c        | 27 ---------------------------
 5 files changed, 56 deletions(-)

diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 26e155cbe2a2..e34545e28306 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -7243,21 +7243,6 @@ static inline void csr_roam_process_he_info(struct join_rsp *sme_join_rsp,
 }
 #endif
 
-static void csr_update_tx_pwr_to_fw(struct mac_context *mac_ctx,
-				    uint8_t vdev_id)
-{
-	struct scheduler_msg msg = {0};
-
-	msg.type = WMA_SEND_MAX_TX_POWER;
-	msg.bodyval = vdev_id;
-	if (QDF_STATUS_SUCCESS != scheduler_post_message(QDF_MODULE_ID_SME,
-							 QDF_MODULE_ID_WMA,
-							 QDF_MODULE_ID_WMA,
-							 &msg)) {
-		sme_err("Failed to post WMA_SEND_MAX_TX_POWER message to WMA");
-	}
-}
-
 static void csr_update_rsn_intersect_to_fw(struct wlan_objmgr_psoc *psoc,
 					   uint8_t vdev_id)
 {
@@ -7701,7 +7686,6 @@ static void csr_roam_process_join_res(struct mac_context *mac_ctx,
 		csr_roam_link_up(mac_ctx, conn_profile->bssid);
 	}
 
-	csr_update_tx_pwr_to_fw(mac_ctx, session_id);
 	csr_update_rsn_intersect_to_fw(mac_ctx->psoc, session_id);
 	sme_free_join_rsp_fils_params(roam_info);
 	qdf_mem_free(roam_info);
diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h
index 2f47927c18f3..c30589ef8662 100644
--- a/core/wma/inc/wma_internal.h
+++ b/core/wma/inc/wma_internal.h
@@ -915,15 +915,6 @@ void wma_set_max_tx_power(WMA_HANDLE handle,
 
 void wma_disable_sta_ps_mode(tpDisablePsParams ps_req);
 
-/**
- * wma_send_max_tx_pwrlmt() - send max tx power limit to fw
- * @handle: wma handle
- * @vdev_id: vdev id
- *
- * Return: none
- */
-void wma_send_max_tx_pwrlmt(WMA_HANDLE handle, uint8_t vdev_id);
-
 /**
  * wma_enable_uapsd_mode() - enable uapsd mode in fw
  * @wma: wma handle
diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h
index 2a80dee2b1c0..09d987cbe316 100644
--- a/core/wma/inc/wma_types.h
+++ b/core/wma/inc/wma_types.h
@@ -175,7 +175,6 @@ enum wmamsgtype {
 	WMA_SET_TX_POWER_REQ = SIR_HAL_SET_TX_POWER_REQ,
 	WMA_SET_TX_POWER_RSP = SIR_HAL_SET_TX_POWER_RSP,
 	WMA_GET_TX_POWER_REQ = SIR_HAL_GET_TX_POWER_REQ,
-	WMA_SEND_MAX_TX_POWER = SIR_HAL_SEND_MAX_TX_POWER,
 
 	WMA_ENABLE_UAPSD_REQ = SIR_HAL_ENABLE_UAPSD_REQ,
 	WMA_DISABLE_UAPSD_REQ = SIR_HAL_DISABLE_UAPSD_REQ,
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index c9cc5e3b6c19..53dad152ef6d 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -8504,9 +8504,6 @@ static QDF_STATUS wma_mc_process_msg(struct scheduler_msg *msg)
 		wma_set_max_tx_power(wma_handle,
 				     (tpMaxTxPowerParams) msg->bodyptr);
 		break;
-	case WMA_SEND_MAX_TX_POWER:
-		wma_send_max_tx_pwrlmt(wma_handle, msg->bodyval);
-		break;
 	case WMA_SET_KEEP_ALIVE:
 		wma_set_keepalive_req(wma_handle, msg->bodyptr);
 		break;
diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c
index e657e846a06a..f30702e40164 100644
--- a/core/wma/src/wma_power.c
+++ b/core/wma/src/wma_power.c
@@ -317,33 +317,6 @@ end:
 		wma_err("Failed to set vdev param WMI_VDEV_PARAM_TX_PWRLIMIT");
 }
 
-void wma_send_max_tx_pwrlmt(WMA_HANDLE handle, uint8_t vdev_id)
-{
-	uint32_t max_tx_pwr;
-	struct wma_txrx_node *iface;
-	struct vdev_mlme_obj *mlme_obj;
-	tp_wma_handle wma_handle = (tp_wma_handle) handle;
-
-	iface = &wma_handle->interfaces[vdev_id];
-	if (!iface) {
-		wma_err("Failed to get iface handle for vdev_id %d", vdev_id);
-		return;
-	}
-
-	mlme_obj = wlan_vdev_mlme_get_cmpt_obj(iface->vdev);
-	if (!mlme_obj)
-		return;
-
-	max_tx_pwr = mlme_obj->mgmt.generic.tx_pwrlimit;
-	if (!max_tx_pwr)
-		return;
-
-	wma_nofl_debug("TXP[W][send_max_tx_pwr]: %d", max_tx_pwr);
-	wma_vdev_set_param(wma_handle->wmi_handle, vdev_id,
-			   WMI_VDEV_PARAM_TX_PWRLIMIT,
-			   max_tx_pwr);
-}
-
 /**
  * wma_set_max_tx_power() - set max tx power limit in fw
  * @handle: wma handle