qcacld-3.0: Fix low TPC power for vendor DTPC IE

Currently low TPC power is configured to firmware if power constraint IE
is not present and only vendor DTPC IE is present.
TPC power calculation is depends on regulatory power, ap power constraint
and TPE IE.

To fix this add new check is_power_constraint_abs in reg_tpc_obj.
Whenever local power constraint is from DTPC IE, is_power_constraint_abs
is set to true. And TPC power is calculated with regulatory power,
DTPC IE power and TPE IE power.

Change-Id: I37b14d144242fa30f02268f8a76b1b016bf69848
CRs-Fixed: 3383531

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

@@ -530,7 +530,7 @@ void lim_fill_ft_session(struct mac_context *mac,
 	tSchBeaconStruct *pBeaconStruct;
 	ePhyChanBondState cbEnabledMode;
 	struct vdev_mlme_obj *mlme_obj;
-	bool is_pwr_constraint;
+	bool is_pwr_constraint = false;
 
 	pBeaconStruct = qdf_mem_malloc(sizeof(tSchBeaconStruct));
 	if (!pBeaconStruct)
@@ -723,6 +723,8 @@ void lim_fill_ft_session(struct mac_context *mac,
 	if (is_pwr_constraint)
 		localPowerConstraint = regMax - localPowerConstraint;
 
+	mlme_obj->reg_tpc_obj.is_power_constraint_abs = !is_pwr_constraint;
+
 	ft_session->limReassocBssQosCaps =
 		ft_session->limCurrentBssQosCaps;
 

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

@@ -2403,7 +2403,7 @@ void lim_handle_add_bss_rsp(struct mac_context *mac_ctx,
 			}
 			tx_ops = wlan_reg_get_tx_ops(mac_ctx->psoc);
 
-			lim_calculate_tpc(mac_ctx, session_entry, false);
+			lim_calculate_tpc(mac_ctx, session_entry);
 
 			if (tx_ops->set_tpc_power)
 				tx_ops->set_tpc_power(mac_ctx->psoc,
@@ -3123,7 +3123,7 @@ static void lim_process_switch_channel_join_req(
 			goto error;
 		}
 
-		lim_calculate_tpc(mac_ctx, session_entry, false);
+		lim_calculate_tpc(mac_ctx, session_entry);
 
 		if (tx_ops->set_tpc_power)
 			tx_ops->set_tpc_power(mac_ctx->psoc,

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

@@ -2978,7 +2978,7 @@ lim_fill_pe_session(struct mac_context *mac_ctx, struct pe_session *session,
 	uint16_t ie_len;
 	int8_t local_power_constraint;
 	struct vdev_mlme_obj *mlme_obj;
-	bool is_pwr_constraint;
+	bool is_pwr_constraint = false;
 	tSirMacCapabilityInfo *ap_cap_info;
 	uint8_t wmm_mode, value;
 	struct wlan_mlme_lfr_cfg *lfr = &mac_ctx->mlme_cfg->lfr;
@@ -3238,6 +3238,9 @@ lim_fill_pe_session(struct mac_context *mac_ctx, struct pe_session *session,
 		&session->gLimCurrentBssUapsd,
 		&local_power_constraint, session, &is_pwr_constraint);
 
+	mlme_obj->reg_tpc_obj.is_power_constraint_abs =
+						!is_pwr_constraint;
+
 	if (wlan_reg_is_6ghz_chan_freq(bss_desc->chan_freq)) {
 		if (!ie_struct->Country.present)
 			pe_debug("Channel is 6G but country IE not present");
@@ -5561,8 +5564,7 @@ uint8_t lim_get_max_tx_power(struct mac_context *mac,
 }
 
 void lim_calculate_tpc(struct mac_context *mac,
-		       struct pe_session *session,
-		       bool is_pwr_constraint_absolute)
+		       struct pe_session *session)
 {
 	bool is_psd_power = false;
 	bool is_tpe_present = false, is_6ghz_freq = false;
@@ -5732,8 +5734,9 @@ void lim_calculate_tpc(struct mac_context *mac,
 			local_constraint =
 				mlme_obj->reg_tpc_obj.ap_constraint_power;
 			pe_debug("local constraint: %d power constraint absolute %d",
-				 local_constraint, is_pwr_constraint_absolute);
-			if (is_pwr_constraint_absolute)
+				 local_constraint,
+				 mlme_obj->reg_tpc_obj.is_power_constraint_abs);
+			if (mlme_obj->reg_tpc_obj.is_power_constraint_abs)
 				max_tx_power = QDF_MIN(reg_max,
 						       local_constraint);
 			else

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

@@ -11163,7 +11163,7 @@ lim_set_tpc_power(struct mac_context *mac_ctx, struct pe_session *session)
 	    session->opmode == QDF_P2P_GO_MODE)
 		mlme_obj->reg_tpc_obj.num_pwr_levels = 0;
 
-	lim_calculate_tpc(mac_ctx, session, false);
+	lim_calculate_tpc(mac_ctx, session);
 
 	tx_ops->set_tpc_power(mac_ctx->psoc, session->vdev_id,
 			      &mlme_obj->reg_tpc_obj);

core/mac/src/pe/lim/lim_utils.h

@@ -187,8 +187,6 @@ uint8_t lim_get_max_tx_power(struct mac_context *mac,
  * lim_calculate_tpc() - Utility to get maximum tx power
  * @mac: mac handle
  * @session: PE Session Entry
- * @is_pwr_constraint_absolute: If local power constraint is an absolute
- * value or an offset value.
  *
  * This function is used to get the maximum possible tx power from the list
  * of tx powers mentioned in @attr.
@@ -196,8 +194,7 @@ uint8_t lim_get_max_tx_power(struct mac_context *mac,
  * Return: None
  */
 void lim_calculate_tpc(struct mac_context *mac,
-		       struct pe_session *session,
-		       bool is_pwr_constraint_absolute);
+		       struct pe_session *session);
 
 /* AID pool management functions */
 

core/mac/src/pe/rrm/rrm_api.c

@@ -277,7 +277,9 @@ rrm_process_link_measurement_request(struct mac_context *mac,
 		ap_pwr_constraint = mlme_obj->reg_tpc_obj.ap_constraint_power;
 		mlme_obj->reg_tpc_obj.ap_constraint_power =
 				pLinkReq->MaxTxPower.maxTxPower;
-		lim_calculate_tpc(mac, pe_session, true);
+		/* Set is_power_constraint_abs to true to calculate tpc power */
+		mlme_obj->reg_tpc_obj.is_power_constraint_abs = true;
+		lim_calculate_tpc(mac, pe_session);
 
 		LinkReport.txPower =
 			mlme_obj->reg_tpc_obj.chan_power_info[0].tx_power;

core/mac/src/pe/sch/sch_beacon_process.c

@@ -634,21 +634,26 @@ sch_bcn_process_sta_opmode(struct mac_context *mac_ctx,
  * from beacon
  * @bcn: beacon structure
  * @local_constraint: local constraint pointer
+ * @is_power_constraint_abs: is power constraint absolute
  *
  * Return: None
  */
 #ifdef FEATURE_WLAN_ESE
 static void get_local_power_constraint_beacon(
 		tpSchBeaconStruct bcn,
-		int8_t *local_constraint)
+		int8_t *local_constraint,
+		bool *is_power_constraint_abs)
 {
-	if (bcn->eseTxPwr.present)
+	if (bcn->eseTxPwr.present) {
 		*local_constraint = bcn->eseTxPwr.power_limit;
+		*is_power_constraint_abs = true;
+	}
 }
 #else
 static void get_local_power_constraint_beacon(
 		tpSchBeaconStruct bcn,
-		int8_t *local_constraint)
+		int8_t *local_constraint,
+		bool *is_power_constraint_abs)
 {
 
 }
@@ -673,6 +678,7 @@ static void __sch_beacon_process_for_session(struct mac_context *mac_ctx,
 	enum reg_6g_ap_type pwr_type_6g;
 	uint8_t bpcc;
 	bool cu_flag = true;
+	bool is_power_constraint_abs = false;
 
 	if (mlo_is_mld_sta(session->vdev)) {
 		cu_flag = false;
@@ -766,8 +772,9 @@ static void __sch_beacon_process_for_session(struct mac_context *mac_ctx,
 				 &tpe_change);
 
 		if (mac_ctx->mlme_cfg->sta.allow_tpc_from_ap) {
-			get_local_power_constraint_beacon(bcn,
-							  &local_constraint);
+			get_local_power_constraint_beacon(
+						bcn, &local_constraint,
+						&is_power_constraint_abs);
 
 			if (mac_ctx->rrm.rrmPEContext.rrmEnable &&
 			    bcn->powerConstraintPresent)
@@ -779,12 +786,14 @@ static void __sch_beacon_process_for_session(struct mac_context *mac_ctx,
 				mlme_obj->reg_tpc_obj.ap_constraint_power) {
 			mlme_obj->reg_tpc_obj.ap_constraint_power =
 							local_constraint;
+			mlme_obj->reg_tpc_obj.is_power_constraint_abs =
+							is_power_constraint_abs;
 			ap_constraint_change = true;
 		}
 
 		if ((ap_constraint_change && local_constraint) ||
 		    (tpe_change && !skip_tpe)) {
-			lim_calculate_tpc(mac_ctx, session, false);
+			lim_calculate_tpc(mac_ctx, session);
 
 			if (tx_ops->set_tpc_power)
 				tx_ops->set_tpc_power(mac_ctx->psoc,
@@ -798,8 +807,9 @@ static void __sch_beacon_process_for_session(struct mac_context *mac_ctx,
 		local_constraint = regMax;
 
 		if (mac_ctx->mlme_cfg->sta.allow_tpc_from_ap) {
-			get_local_power_constraint_beacon(bcn,
-							  &local_constraint);
+			get_local_power_constraint_beacon(
+						bcn, &local_constraint,
+						&is_power_constraint_abs);
 
 			if (mac_ctx->rrm.rrmPEContext.rrmEnable &&
 			    bcn->powerConstraintPresent) {
@@ -808,6 +818,8 @@ static void __sch_beacon_process_for_session(struct mac_context *mac_ctx,
 				bcn->localPowerConstraint.localPowerConstraints;
 			}
 		}
+		mlme_obj->reg_tpc_obj.is_power_constraint_abs =
+						is_power_constraint_abs;
 		mlme_obj->reg_tpc_obj.reg_max[0] = regMax;
 		mlme_obj->reg_tpc_obj.ap_constraint_power = local_constraint;
 		mlme_obj->reg_tpc_obj.frequency[0] = session->curr_op_freq;