qcacld-3.0: Avoid bandwidth upgrade during connection in progress

To avoid race between CSA and set BW, check if BW upgrade is
still required after set bandwidth command become active.
If any connection is in progress, restart the timer again.

Change-Id: I049dbcbc1d30fba8f38250b05f5f62e8c230234c
CRs-Fixed: 3652085

components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c

@@ -305,6 +305,11 @@ policy_mgr_get_sap_ch_width_update_action(struct wlan_objmgr_psoc *psoc,
 	uint8_t vdev_id_list[MAX_NUMBER_OF_CONC_CONNECTIONS + 1];
 	bool eht_capab = false;
 
+	/*
+	 * Stop any running opportunistic timer as it will be started after
+	 * decision if required.
+	 */
+	policy_mgr_stop_opportunistic_timer(psoc);
 	if (QDF_IS_STATUS_ERROR(wlan_psoc_mlme_get_11be_capab(psoc,
 							      &eht_capab)) ||
 	    !eht_capab ||
@@ -961,6 +966,9 @@ policy_mgr_is_conn_lead_to_dbs_sbs(struct wlan_objmgr_psoc *psoc,
 
 	connection_count = policy_mgr_get_connection_info(psoc, info);
 
+	if (connection_count == 1)
+		return false;
+
 	for (i = 0; i < connection_count; i++)
 		if (!policy_mgr_2_freq_always_on_same_mac(psoc, freq,
 							  info[i].ch_freq))
@@ -1136,6 +1144,11 @@ policy_mgr_check_for_hw_mode_change(struct wlan_objmgr_psoc *psoc,
 	enum phy_ch_width cur_bw = CH_WIDTH_INVALID;
 
 	if (policy_mgr_is_hwmode_offload_enabled(psoc)) {
+		/*
+		 * Stop any running opportunistic timer as it will be started
+		 * after decision if required.
+		 */
+		policy_mgr_stop_opportunistic_timer(psoc);
 		wlan_psoc_mlme_get_11be_capab(psoc, &eht_capab);
 		if (eht_capab &&
 		    QDF_IS_STATUS_SUCCESS(policy_mgr_get_sap_bw(psoc,

core/sme/src/common/sme_api.c

@@ -11900,8 +11900,7 @@ sme_sap_update_ch_width(struct wlan_objmgr_psoc *psoc,
 	cmd->u.bw_update_cmd.request_id = request_id;
 	cmd->u.bw_update_cmd.conc_vdev_id = conc_vdev_id;
 
-	sme_debug("Queuing e_sme_command_sap_ch_width_update to CSR:vdev %d ch_width: %d reason: %d",
-		  vdev_id, ch_width, reason);
+	sme_debug("vdev %d ch_width: %d reason: %d", vdev_id, ch_width, reason);
 	csr_queue_sme_command(mac, cmd, false);
 	sme_release_global_lock(&mac->sme);
 

core/sme/src/csr/csr_api_roam.c

@@ -7649,13 +7649,28 @@ void csr_process_sap_ch_width_update(struct mac_context *mac, tSmeCmd *command)
 	QDF_STATUS status;
 	struct scheduler_msg msg_return = {0};
 	struct sir_bcn_update_rsp *param;
-	struct csr_roam_session *session;
+	enum policy_mgr_conn_update_reason reason =
+				command->u.bw_update_cmd.reason;
 
 	if (!CSR_IS_SESSION_VALID(mac, command->vdev_id)) {
 		sme_err("Invalid session id %d", command->vdev_id);
 		goto fail;
 	}
-	session = CSR_GET_SESSION(mac, command->vdev_id);
+
+	if ((reason == POLICY_MGR_UPDATE_REASON_OPPORTUNISTIC) &&
+	    (mac->sme.get_connection_info_cb(NULL, NULL))) {
+		policy_mgr_restart_opportunistic_timer(mac->psoc, false);
+		sme_info("Vdev %d : Avoid set BW as conn in progress",
+			 command->vdev_id);
+		goto fail;
+	}
+
+	if ((reason == POLICY_MGR_UPDATE_REASON_OPPORTUNISTIC) &&
+	    (!policy_mgr_need_opportunistic_upgrade(mac->psoc, &reason))) {
+		sme_info("Vdev %d: BW update not needed anymore",
+			 command->vdev_id);
+		goto fail;
+	}
 
 	len = sizeof(*msg);
 	msg = qdf_mem_malloc(len);
@@ -7679,7 +7694,6 @@ void csr_process_sap_ch_width_update(struct mac_context *mac, tSmeCmd *command)
 
 	sme_err("Posting to PE failed");
 fail:
-	sme_err("Sending ch_width update fail response to SME");
 	param = qdf_mem_malloc(sizeof(*param));
 	if (param) {
 		param->status = QDF_STATUS_E_FAILURE;