qcacld-3.0: Limit SAP restart bw to current operating bw

SAP restart happens when a concurrent STA comes up in the
same band. Currently, the new bw is calculated based on channel
supported max bw. If SAP moves from one 6 GHz channel to another
6 GHz channel, the new bw would be calculated as 320 MHz even if
the current SAP operating bw is 160 MHz. But SAP bw should be
limited to current operating bw as it might have got downgraded
to 160 MHz as part of sap_bw_update algo.
Considered current operating bw when SAP restart happens as part
of sap_bw_update.

Change-Id: If310b0ad9f914b438ae3c1968ca8f1ee26d57589
CRs-Fixed: 3637263

components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c

@@ -265,7 +265,8 @@ policy_mgr_get_sap_bw(struct wlan_objmgr_psoc *psoc, enum phy_ch_width *bw)
 
 	if (policy_mgr_get_mode_specific_conn_info(psoc, &freq_list[0],
 						   &vdev_id_list[0],
-						   PM_SAP_MODE) != 1)
+						   PM_SAP_MODE) != 1 ||
+	    !WLAN_REG_IS_6GHZ_CHAN_FREQ(freq_list[0]))
 		return QDF_STATUS_E_NOSUPPORT;
 
 	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, vdev_id_list[0],
@@ -955,6 +956,9 @@ policy_mgr_is_conn_lead_to_dbs_sbs(struct wlan_objmgr_psoc *psoc,
 	struct connection_info info[MAX_NUMBER_OF_CONC_CONNECTIONS] = {0};
 	uint32_t connection_count, i;
 
+	if (wlan_reg_is_24ghz_ch_freq(freq))
+		return true;
+
 	connection_count = policy_mgr_get_connection_info(psoc, info);
 
 	for (i = 0; i < connection_count; i++)

components/mlme/dispatcher/src/wlan_mlme_api.c

@@ -7992,9 +7992,6 @@ wlan_mlme_get_ap_oper_ch_width(struct wlan_objmgr_vdev *vdev)
 		return CH_WIDTH_INVALID;
 	}
 
-	mlme_debug("SAP oper ch_width: %d, vdev %d",
-		   mlme_priv->mlme_ap.oper_ch_width, wlan_vdev_get_id(vdev));
-
 	return mlme_priv->mlme_ap.oper_ch_width;
 }
 

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

@@ -8756,8 +8756,6 @@ lim_update_new_ch_width_to_fw(struct mac_context *mac_ctx,
 	tpDphHashNode psta;
 	tUpdateVHTOpMode params;
 
-	wlan_mlme_set_ap_oper_ch_width(session->vdev, ch_bandwidth);
-
 	for (i = 0; i <= mac_ctx->lim.max_sta_of_pe_session; i++) {
 		psta = session->dph.dphHashTable.pDphNodeArray + i;
 		if (!psta || !psta->added)

core/sap/src/sap_module.c

@@ -1416,6 +1416,10 @@ wlansap_get_csa_chanwidth_from_phymode(struct sap_context *sap_context,
 		ch_width = QDF_MIN(ch_width, concurrent_bw);
 		if (tgt_ch_params)
 			ch_width = QDF_MIN(ch_width, tgt_ch_params->ch_width);
+
+		if (ch_width == CH_WIDTH_320MHZ)
+			ch_width = wlan_mlme_get_ap_oper_ch_width(
+							sap_context->vdev);
 	}
 	ch_params.ch_width = ch_width;
 	if (sap_phymode_is_eht(sap_context->phyMode))