qcacld-3.0: Configure BA mode on each ML STA links

Currently, when the CAPI to set Manual BA mode is received
Host configures assoc vdev and sends it to FW, where as this
value is stored in mac context and sent to FW during vdev
start response for partner vdev. FW honors Host input during
peer create that happens before vdev start and thus, the BA
mode is not updated for partner vdev. This leads to FW
sending undesired addba request to AP. Thus, configure BA
mode to Manual on both vdevs immediately upon receiving
input from user space.

Change-Id: Id71c2e3b8fa523af94773b6346fd023784e0d85a
CRs-Fixed: 3584312

core/hdd/src/wlan_hdd_cfg80211.c

@@ -13244,10 +13244,8 @@ __wlan_hdd_cfg80211_set_wifi_test_config(struct wiphy *wiphy,
 		op_mode = wlan_get_opmode_from_vdev_id(
 						hdd_ctx->pdev,
 						link_info->vdev_id);
-		if (op_mode == QDF_STA_MODE)
-			sme_set_ba_opmode(mac_handle,
-					  link_info->vdev_id,
-					  set_val);
+
+		sme_set_per_link_ba_mode(mac_handle, set_val);
 
 		if (!cfg_val) {
 			ret_val = wma_cli_set_command(
@@ -13329,14 +13327,8 @@ __wlan_hdd_cfg80211_set_wifi_test_config(struct wiphy *wiphy,
 			/* Configure ADDBA req buffer size to 64 */
 			set_val = HDD_BA_MODE_64;
 
-		sme_set_ba_opmode(mac_handle, link_info->vdev_id,
-				  set_val);
+		sme_set_per_link_ba_mode(mac_handle, set_val);
 
-		ret_val = wma_cli_set_command(link_info->vdev_id,
-					      wmi_vdev_param_set_ba_mode,
-					      set_val, VDEV_CMD);
-		if (ret_val)
-			hdd_err("Failed to set BA operating mode %d", set_val);
 		ret_val = wma_cli_set_command(link_info->vdev_id,
 					      GEN_VDEV_PARAM_AMPDU,
 					      buff_size, GEN_CMD);

core/mac/inc/ani_global.h

@@ -757,7 +757,6 @@ struct mac_context {
 #ifdef WLAN_FEATURE_CAL_FAILURE_TRIGGER
 	void (*cal_failure_event_cb)(uint8_t cal_type, uint8_t reason);
 #endif
-	uint8_t ba_mode;
 };
 
 #ifdef FEATURE_WLAN_TDLS

core/sme/inc/sme_api.h

@@ -3058,17 +3058,6 @@ int sme_set_auto_rate_ldpc(mac_handle_t mac_handle, uint8_t session_id,
 int sme_set_auto_rate_he_ltf(mac_handle_t mac_handle, uint8_t session_id,
 			     uint8_t cfg_val);
 
-/**
- * sme_set_ba_opmode() - sets the BA op mode
- * @mac_handle: Opaque handle to the global MAC context
- * @session_id: SME session id
- * @cfg_val: BA mode
- *
- * Return: None
- */
-void sme_set_ba_opmode(mac_handle_t mac_handle, uint8_t session_id,
-		       bool cfg_val);
-
 #ifdef WLAN_FEATURE_11BE
 /**
  * sme_update_tgt_eht_cap() - sets the EHT caps to pmac
@@ -3813,6 +3802,15 @@ int sme_update_eht_caps(mac_handle_t mac_handle, uint8_t session_id,
 int sme_send_vdev_pause_for_bcn_period(mac_handle_t mac_handle,
 				       uint8_t session_id,
 				       uint8_t cfg_val);
+
+/**
+ * sme_set_per_link_ba_mode() - sets BA mode for each STA MLD link
+ * @mac_handle: Opaque handle to the global MAC context
+ * @val: BA mode
+ *
+ * Return: None
+ */
+void sme_set_per_link_ba_mode(mac_handle_t mac_handle, uint8_t val);
 #else
 static inline void sme_set_eht_testbed_def(mac_handle_t mac_handle,
 					   uint8_t vdev_id)
@@ -3864,6 +3862,10 @@ void sme_activate_mlo_links(mac_handle_t mac_handle, uint8_t session_id,
 			    struct qdf_mac_addr active_link_addr[2])
 {
 }
+
+static inline
+void sme_set_per_link_ba_mode(mac_handle_t mac_handle, uint8_t val)
+{}
 #endif
 
 /**

core/sme/src/common/sme_api.c

@@ -10576,15 +10576,6 @@ int sme_update_tx_bfee_nsts(mac_handle_t mac_handle, uint8_t session_id,
 	return sme_update_he_tx_bfee_nsts(mac_handle, session_id, nsts_set_val);
 }
 
-void sme_set_ba_opmode(mac_handle_t mac_handle, uint8_t session_id,
-		       bool ba_opmode)
-{
-	struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle);
-
-	mac_ctx->ba_mode = ba_opmode;
-	sme_debug("BA mode %d", mac_ctx->ba_mode);
-}
-
 #ifdef WLAN_FEATURE_11BE
 void sme_update_tgt_eht_cap(mac_handle_t mac_handle,
 			    struct wma_tgt_cfg *cfg,
@@ -15259,12 +15250,38 @@ void sme_set_eht_testbed_def(mac_handle_t mac_handle, uint8_t vdev_id)
 	ucfg_mlme_set_bss_color_collision_det_sta(mac_ctx->psoc, false);
 }
 
+void sme_set_per_link_ba_mode(mac_handle_t mac_handle, uint8_t val)
+{
+	struct mac_context *mac = MAC_CONTEXT(mac_handle);
+	enum QDF_OPMODE op_mode;
+	uint8_t vdev_id;
+	int ret_val = 0;
+
+	for (vdev_id = 0; vdev_id < WLAN_MAX_VDEVS; vdev_id++) {
+		op_mode = wlan_get_opmode_from_vdev_id(mac->pdev, vdev_id);
+		if (op_mode == QDF_STA_MODE) {
+			ret_val = wma_cli_set_command(
+						vdev_id,
+						wmi_vdev_param_set_ba_mode,
+						val, VDEV_CMD);
+
+		if (QDF_IS_STATUS_ERROR(ret_val))
+			sme_err("BA mode set failed for vdev: %d, ret %d",
+				vdev_id, ret_val);
+		else
+			sme_debug("vdev: %d ba mode: %d param id %d",
+				  vdev_id, val, wmi_vdev_param_set_ba_mode);
+		}
+	}
+}
+
 void sme_reset_eht_caps(mac_handle_t mac_handle, uint8_t vdev_id)
 {
 	struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle);
 	struct csr_roam_session *session;
 	bool val;
 	QDF_STATUS status;
+	uint8_t ba_mode_auto = 0;
 
 	session = CSR_GET_SESSION(mac_ctx, vdev_id);
 
@@ -15292,6 +15309,7 @@ void sme_reset_eht_caps(mac_handle_t mac_handle, uint8_t vdev_id)
 							       &val);
 	if (QDF_IS_STATUS_SUCCESS(status))
 		ucfg_mlme_set_bss_color_collision_det_sta(mac_ctx->psoc, val);
+	sme_set_per_link_ba_mode(mac_handle, ba_mode_auto);
 }
 
 void sme_update_eht_cap_nss(mac_handle_t mac_handle, uint8_t vdev_id,

core/wma/src/wma_dev_if.c

@@ -1353,16 +1353,6 @@ QDF_STATUS wma_vdev_start_resp_handler(struct vdev_mlme_obj *vdev_mlme,
 							    iface->mac_id, rsp);
 	}
 
-	if (iface->type == WMI_VDEV_TYPE_STA &&
-	    rsp->resp_type == WMI_VDEV_START_RESP_EVENT) {
-		wma_debug("BA mode: %d", mac_ctx->ba_mode);
-		if (wma_cli_set_command(rsp->vdev_id,
-					wmi_vdev_param_set_ba_mode,
-					mac_ctx->ba_mode, VDEV_CMD))
-			wma_err("Set BA opmode failed for vdev: %d",
-				rsp->vdev_id);
-	}
-
 #ifdef FEATURE_AP_MCC_CH_AVOIDANCE
 	if (rsp->status == QDF_STATUS_SUCCESS
 		&& mac_ctx->sap.sap_channel_avoidance)