qcacld-3.0: Send set tpc power command to fw after roam

Currently host doesn't send set tpc power command to
fw for roam case, hence STA tx power remains same
even if new connection frequency has different tx
power values.

To address this issue send set tpc power command to
fw while processing roam sync indication.

Change-Id: Ief565760085b0628e6ad2fe40086e7514b9baec5
CRs-Fixed: 3635222

core/mac/src/pe/include/lim_ft.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2011-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
@@ -137,11 +137,12 @@ static inline bool lim_process_ft_pre_auth_req(
 #endif
 
 #if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD)
-void lim_fill_ft_session(struct mac_context *mac,
-		struct bss_description *pbssDescription,
-		struct pe_session *ft_session,
-		struct pe_session *pe_session,
-		enum wlan_phymode bss_phymode);
+QDF_STATUS
+lim_fill_ft_session(struct mac_context *mac,
+		    struct bss_description *pbssDescription,
+		    struct pe_session *ft_session,
+		    struct pe_session *pe_session,
+		    enum wlan_phymode bss_phymode);
 
 /**
  * lim_ft_prepare_add_bss_req() - Create Add Bss Req to the new AP
@@ -161,12 +162,15 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac,
 QDF_STATUS lim_send_preauth_scan_offload(struct mac_context *mac_ctx,
 		struct pe_session *session_entry, tSirFTPreAuthReq *ft_preauth_req);
 #else
-static inline void lim_fill_ft_session(struct mac_context *mac,
-		struct bss_description *pbssDescription,
-		struct pe_session *ft_session,
-		struct pe_session *pe_session,
-		enum wlan_phymode bss_phymode)
-{}
+static inline QDF_STATUS
+lim_fill_ft_session(struct mac_context *mac
+		    struct bss_description *pbssDescription,
+		    struct pe_session *ft_session,
+		    struct pe_session *pe_session,
+		    enum wlan_phymode bss_phymode)
+{
+	return QDF_STATUS_SUCCESS;
+}
 static inline void lim_ft_prepare_add_bss_req(struct mac_context *mac,
 		struct pe_session *ft_session,
 		struct bss_description *bssDescription)

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

@@ -2986,8 +2986,15 @@ pe_roam_synch_callback(struct mac_context *mac_ctx,
 	ft_session_ptr->csaOffloadEnable = session_ptr->csaOffloadEnable;
 
 	/* Next routine will update nss and vdev_nss with AP's capabilities */
-	lim_fill_ft_session(mac_ctx, bss_desc, ft_session_ptr,
-			    session_ptr, roam_sync_ind_ptr->phy_mode);
+	status = lim_fill_ft_session(mac_ctx, bss_desc, ft_session_ptr,
+				     session_ptr, roam_sync_ind_ptr->phy_mode);
+	if (QDF_IS_STATUS_ERROR(status)) {
+		pe_err("Failed to fill ft session for vdev id %d",
+		       ft_session_ptr->vdev_id);
+		qdf_mem_free(bss_desc);
+		goto roam_sync_fail;
+	}
+
 	roam_sync_ind_ptr->ssid.length =
 		qdf_min((qdf_size_t)ft_session_ptr->ssId.length,
 			sizeof(roam_sync_ind_ptr->ssid.ssid));
@@ -3001,6 +3008,7 @@ pe_roam_synch_callback(struct mac_context *mac_ctx,
 	/* Next routine may update nss based on dot11Mode */
 
 	lim_ft_prepare_add_bss_req(mac_ctx, ft_session_ptr, bss_desc);
+	lim_set_tpc_power(mac_ctx, ft_session_ptr, bss_desc);
 
 	if (session_ptr->is11Rconnection)
 		lim_fill_fils_ft(session_ptr, ft_session_ptr);
@@ -3155,6 +3163,7 @@ pe_roam_synch_callback(struct mac_context *mac_ctx,
 		lim_delete_dph_hash_entry(mac_ctx, sta_ds->staAddr, aid,
 					  session_ptr);
 	}
+
 	pe_delete_session(mac_ctx, session_ptr);
 	return QDF_STATUS_SUCCESS;
 

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

@@ -513,30 +513,119 @@ static void lim_fill_dot11mode(struct mac_context *mac_ctx,
 #endif
 
 #if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD)
+/**
+ * lim_fill_session_power_info() - to fill power info in session
+ * @mac_ctx: pointer to mac ctx
+ * @pbssDescription: Pointer to pbssDescription
+ * @ft_session: Pointer to FT session
+ * @pe_session: Pointer to PE session
+ *
+ * Return: QDF_STATUS
+ */
+static QDF_STATUS lim_fill_session_power_info(
+				struct mac_context *mac,
+				struct bss_description *pbssDescription,
+				struct pe_session *ft_session,
+				struct pe_session *pe_session)
+{
+	uint8_t currentBssUapsd;
+	int8_t localPowerConstraint;
+	int8_t regMax = 0;
+	bool is_pwr_constraint = false;
+	struct vdev_mlme_obj *mlme_obj;
+	enum reg_6g_ap_type power_type_6g;
+	QDF_STATUS status;
+
+	mlme_obj = wlan_vdev_mlme_get_cmpt_obj(pe_session->vdev);
+	if (!mlme_obj) {
+		pe_err("vdev component object is NULL");
+		return QDF_STATUS_E_FAILURE;
+	}
+
+	lim_extract_ap_capability(mac, (uint8_t *)pbssDescription->ieFields,
+		lim_get_ielen_from_bss_description(pbssDescription),
+		&ft_session->limCurrentBssQosCaps,
+		&currentBssUapsd,
+		&localPowerConstraint, ft_session, &is_pwr_constraint);
+
+	mlme_obj->reg_tpc_obj.is_power_constraint_abs = !is_pwr_constraint;
+
+	if (wlan_reg_is_6ghz_chan_freq(pbssDescription->chan_freq)) {
+		status = wlan_reg_get_best_6g_power_type(
+				mac->psoc, mac->pdev,
+				&power_type_6g,
+				ft_session->ap_defined_power_type_6g,
+				pbssDescription->chan_freq);
+		if (QDF_IS_STATUS_ERROR(status))
+			return status;
+
+		ft_session->best_6g_power_type = power_type_6g;
+		mlme_set_best_6g_power_type(ft_session->vdev, power_type_6g);
+	}
+
+	if (wlan_reg_is_ext_tpc_supported(mac->psoc)) {
+		mlme_obj->reg_tpc_obj.ap_constraint_power =
+						localPowerConstraint;
+	} else {
+		regMax = wlan_reg_get_channel_reg_power_for_freq(
+				mac->pdev, ft_session->curr_op_freq);
+		if (is_pwr_constraint)
+			localPowerConstraint = regMax - localPowerConstraint;
+		if (!localPowerConstraint)
+			localPowerConstraint = regMax;
+
+		mlme_obj->reg_tpc_obj.reg_max[0] = regMax;
+		mlme_obj->reg_tpc_obj.ap_constraint_power =
+						localPowerConstraint;
+		mlme_obj->reg_tpc_obj.frequency[0] = ft_session->curr_op_freq;
+
+#ifdef FEATURE_WLAN_ESE
+		ft_session->maxTxPower = lim_get_max_tx_power(mac, mlme_obj);
+#else
+		ft_session->maxTxPower = QDF_MIN(regMax, localPowerConstraint);
+#endif
+		ft_session->def_max_tx_pwr = ft_session->maxTxPower;
+	}
+
+	/*
+	 * for mdm platform which QCA_NL80211_VENDOR_SUBCMD_LL_STATS_GET
+	 * will not call from android framework every 3 seconds, and tx
+	 * power will never update. So we use iw dev get tx power need
+	 * set maxTxPower non-zero value, that firmware can calc a non-zero
+	 * tx power, and update to host driver.
+	 */
+	if (ft_session->maxTxPower == 0)
+		ft_session->maxTxPower =
+			wlan_reg_get_channel_reg_power_for_freq(mac->pdev,
+						ft_session->curr_op_freq);
+
+	pe_debug("Reg max: %d local pwr: %d, max tx pwr: %d", regMax,
+		 localPowerConstraint, ft_session->maxTxPower);
+
+	return QDF_STATUS_SUCCESS;
+}
+
 /*------------------------------------------------------------------
  *
  * Setup the new session for the pre-auth AP.
  * Return the newly created session entry.
  *
  *------------------------------------------------------------------*/
-void lim_fill_ft_session(struct mac_context *mac,
-			 struct bss_description *pbssDescription,
-			 struct pe_session *ft_session,
-			 struct pe_session *pe_session,
-			 enum wlan_phymode bss_phymode)
+QDF_STATUS
+lim_fill_ft_session(struct mac_context *mac,
+		    struct bss_description *pbssDescription,
+		    struct pe_session *ft_session,
+		    struct pe_session *pe_session,
+		    enum wlan_phymode bss_phymode)
 {
-	uint8_t currentBssUapsd;
 	uint8_t bss_chan_id;
-	int8_t localPowerConstraint;
-	int8_t regMax;
 	tSchBeaconStruct *pBeaconStruct;
 	ePhyChanBondState cbEnabledMode;
-	struct vdev_mlme_obj *mlme_obj;
-	bool is_pwr_constraint = false;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	pBeaconStruct = qdf_mem_malloc(sizeof(tSchBeaconStruct));
 	if (!pBeaconStruct)
-		return;
+		return QDF_STATUS_E_NOMEM;
 
 	/* Retrieve the session that was already created and update the entry */
 	ft_session->limWmeEnabled = pe_session->limWmeEnabled;
@@ -707,47 +796,23 @@ void lim_fill_ft_session(struct mac_context *mac,
 		ft_session->shortSlotTimeSupported = true;
 	}
 
-	mlme_obj = wlan_vdev_mlme_get_cmpt_obj(pe_session->vdev);
-	if (!mlme_obj) {
-		pe_err("vdev component object is NULL");
-		qdf_mem_free(pBeaconStruct);
-		return;
+	status = lim_fill_session_power_info(mac, pbssDescription, ft_session,
+					     pe_session);
+	if (QDF_IS_STATUS_ERROR(status)) {
+		pe_err("Failed to fill power info in ft session");
+		goto exit;
 	}
 
-	regMax = wlan_reg_get_channel_reg_power_for_freq(
-		mac->pdev, ft_session->curr_op_freq);
-	localPowerConstraint = regMax;
-	lim_extract_ap_capability(mac, (uint8_t *) pbssDescription->ieFields,
-		lim_get_ielen_from_bss_description(pbssDescription),
-		&ft_session->limCurrentBssQosCaps,
-		&currentBssUapsd,
-		&localPowerConstraint, ft_session, &is_pwr_constraint);
-	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;
 
 	ft_session->is11Rconnection = pe_session->is11Rconnection;
+
 #ifdef FEATURE_WLAN_ESE
 	ft_session->is_ese_version_ie_present =
 		pBeaconStruct->is_ese_ver_ie_present;
 #endif
 
-	mlme_obj->reg_tpc_obj.reg_max[0] = regMax;
-	mlme_obj->reg_tpc_obj.ap_constraint_power = localPowerConstraint;
-	mlme_obj->reg_tpc_obj.frequency[0] = ft_session->curr_op_freq;
-
-#ifdef FEATURE_WLAN_ESE
-	ft_session->maxTxPower = lim_get_max_tx_power(mac, mlme_obj);
-#else
-	ft_session->maxTxPower = QDF_MIN(regMax, (localPowerConstraint));
-#endif
-
-	pe_debug("Reg max: %d local pwr: %d, max tx pwr: %d", regMax,
-		 localPowerConstraint, ft_session->maxTxPower);
 	if (!lim_is_roam_synch_in_progress(mac->psoc, pe_session)) {
 		ft_session->limPrevSmeState = ft_session->limSmeState;
 		ft_session->limSmeState = eLIM_SME_WT_REASSOC_STATE;
@@ -773,7 +838,9 @@ void lim_fill_ft_session(struct mac_context *mac,
 		mac->mlme_cfg->ht_caps.smps,
 		ft_session->supported_nss_1x1);
 
+exit:
 	qdf_mem_free(pBeaconStruct);
+	return status;
 }
 #endif
 

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

@@ -324,6 +324,7 @@ QDF_STATUS lim_ft_setup_auth_session(struct mac_context *mac,
 	struct pe_session *ft_session = NULL;
 	uint8_t sessionId = 0;
 	struct sSirFTPreAuthReq *req;
+	QDF_STATUS status;
 
 	ft_session =
 		pe_find_session_by_bssid(mac, pe_session->limReAssocbssId,
@@ -342,9 +343,13 @@ QDF_STATUS lim_ft_setup_auth_session(struct mac_context *mac,
 
 	req = pe_session->ftPEContext.pFTPreAuthReq;
 	if (req && req->pbssDescription) {
-		lim_fill_ft_session(mac,
-				    req->pbssDescription, ft_session,
-				    pe_session, WLAN_PHYMODE_AUTO);
+		status = lim_fill_ft_session(mac,
+					     req->pbssDescription, ft_session,
+					     pe_session, WLAN_PHYMODE_AUTO);
+		if (QDF_IS_STATUS_ERROR(status))
+			pe_err("Failed to fill ft session for vdev id %d",
+			       ft_session->vdev_id);
+
 		lim_ft_prepare_add_bss_req(mac, ft_session,
 					   req->pbssDescription);
 	}

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

@@ -3342,7 +3342,7 @@ void lim_process_switch_channel_rsp(struct mac_context *mac,
 		break;
 	case LIM_SWITCH_CHANNEL_SAP_DFS:
 		if (QDF_IS_STATUS_SUCCESS(status))
-			lim_set_tpc_power(mac, pe_session);
+			lim_set_tpc_power(mac, pe_session, NULL);
 
 		/* Note: This event code specific to SAP mode
 		 * When SAP session issues channel change as performing

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

@@ -11344,7 +11344,8 @@ uint8_t lim_get_vht_ch_width(tDot11fIEVHTCaps *vht_cap,
 }
 
 bool
-lim_set_tpc_power(struct mac_context *mac_ctx, struct pe_session *session)
+lim_set_tpc_power(struct mac_context *mac_ctx, struct pe_session *session,
+		  struct bss_description *bss_desc)
 {
 	struct wlan_lmac_if_reg_tx_ops *tx_ops;
 	struct vdev_mlme_obj *mlme_obj;
@@ -11363,10 +11364,9 @@ lim_set_tpc_power(struct mac_context *mac_ctx, struct pe_session *session)
 
 	if ((session->opmode == QDF_STA_MODE ||
 	     session->opmode == QDF_P2P_CLIENT_MODE) &&
-	    session->lim_join_req)
+	     bss_desc)
 		lim_process_tpe_ie_from_beacon(mac_ctx, session,
-				       &session->lim_join_req->bssDescription,
-				       &tpe_change);
+					       bss_desc, &tpe_change);
 
 	if (session->opmode == QDF_SAP_MODE ||
 	    session->opmode == QDF_P2P_GO_MODE)
@@ -11445,6 +11445,7 @@ lim_update_tx_power(struct mac_context *mac_ctx, struct pe_session *sap_session,
 	struct vdev_mlme_obj *sta_mlme_obj, *sap_mlme_obj;
 	struct reg_tpc_power_info *reg_info;
 	uint8_t tx_power, i;
+	struct bss_description *bss_desc = NULL;
 
 	sta_mlme_obj = wlan_vdev_mlme_get_cmpt_obj(sta_session->vdev);
 	sap_mlme_obj = wlan_vdev_mlme_get_cmpt_obj(sap_session->vdev);
@@ -11456,7 +11457,11 @@ lim_update_tx_power(struct mac_context *mac_ctx, struct pe_session *sap_session,
 		/* SAP interface is removed, restore the STA power */
 		wlan_set_tpc_update_required_for_sta(sap_session->vdev, false);
 		sta_session->sta_follows_sap_power = false;
-		lim_set_tpc_power(mac_ctx, sta_session);
+
+		if (sta_session->lim_join_req)
+			bss_desc = &sta_session->lim_join_req->bssDescription;
+
+		lim_set_tpc_power(mac_ctx, sta_session, bss_desc);
 	} else {
 		/*
 		 * SAP and STA are in different AP power types. Therefore,
@@ -11569,7 +11574,7 @@ lim_check_conc_power_for_csa(struct mac_context *mac_ctx,
 	    (wlan_vdev_mlme_get_state(sap_session->vdev) == WLAN_VDEV_S_UP)) {
 		if (lim_is_power_change_required_for_sta(mac_ctx, sta_session,
 							 sap_session)) {
-			lim_set_tpc_power(mac_ctx, sap_session);
+			lim_set_tpc_power(mac_ctx, sap_session, NULL);
 			if (lim_update_tx_power(mac_ctx, sap_session,
 						sta_session, false) ==
 							QDF_STATUS_SUCCESS)
@@ -11604,6 +11609,7 @@ lim_update_tx_pwr_on_ctry_change_cb(uint8_t vdev_id)
 {
 	struct mac_context *mac_ctx;
 	struct pe_session *session;
+	struct bss_description *bss_desc = NULL;
 
 	mac_ctx = cds_get_context(QDF_MODULE_ID_PE);
 	if (!mac_ctx) {
@@ -11617,7 +11623,10 @@ lim_update_tx_pwr_on_ctry_change_cb(uint8_t vdev_id)
 		return;
 	}
 
-	lim_set_tpc_power(mac_ctx, session);
+	if (session->lim_join_req)
+		bss_desc = &session->lim_join_req->bssDescription;
+
+	lim_set_tpc_power(mac_ctx, session, bss_desc);
 }
 
 struct wlan_channel *

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

@@ -3232,11 +3232,13 @@ uint8_t lim_get_vht_ch_width(tDot11fIEVHTCaps *vht_cap,
  *
  * @mac_ctx:    Pointer to Global MAC structure
  * @pe_session: Pointer to session
+ * @bss_desc: Pointer to bss description
  *
  * Return: TPC status
  */
 bool
-lim_set_tpc_power(struct mac_context *mac_ctx, struct pe_session *session);
+lim_set_tpc_power(struct mac_context *mac_ctx, struct pe_session *session,
+		  struct bss_description *bss_desc);
 
 /**
  * lim_update_tx_power() - Function to update the TX power for