qcacld-3.0: Update SR params on beacon update

If the Spatial Reuse parameters change in the beacon
post association, update the new parameters to the
firmware and userspace.

Add a new SR change reason for beacon update. Use this
to update the new SR params to userspace.

Change-Id: I929d8edf7425e6e9494027f6da07a5406d2db123
CRs-Fixed: 3316986

components/spatial_reuse/dispatcher/inc/spatial_reuse_api.h

@@ -44,10 +44,13 @@ enum sr_osif_operation {
  * @SR_REASON_CODE_CONCURRENCY: Spatial Reuse reason code is concurrency
  *				 will be set when SR is suspended / resumed
  *				 due to concurrency
+ * @SR_REASON_CODE_BCN_IE_CHANGE: Spatial Reuse reason code is SRP IE change
+ *				  in the beacon/probe rsp of the associated AP
  */
 enum sr_osif_reason_code {
 	SR_REASON_CODE_ROAMING = 0,
 	SR_REASON_CODE_CONCURRENCY = 1,
+	SR_REASON_CODE_BCN_IE_CHANGE = 2,
 };
 
 /**

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

@@ -42,6 +42,7 @@
 #include "wma_if.h"
 #include "wma_types.h"
 #include "scheduler_api.h"
+#include "spatial_reuse_api.h"
 
 /* Macro to count heartbeat */
 #define limResetHBPktCount(pe_session)   (pe_session->LimRxedBeaconCntDuringHB = 0)
@@ -73,15 +74,15 @@
 /**
  * enum sr_status_of_roamed_ap - SR(Spatial Reuse) status of roamed AP
  * SR_DISALLOW: SR not supported by roamed AP
- * SR_THRESHOLD_IN_RANGE_OF_PREVIOUS_AP: SR supported by roamed AP
- * and configured threshold is in range.
- * SR_THRESHOLD_NOT_IN_RANGE_OF_PREVIOUS_AP: SR supported by roamed AP
- * and configured threshold is not in range.
+ * SR_THRESHOLD_IN_RANGE: SR is supported by roamed AP/after param change
+ * in beacon/probe resp and the configured threshold is in range.
+ * SR_THRESHOLD_NOT_IN_RANGE: SR is supported by roamed AP/after param change
+ * in beacon/probe resp and configured threshold is not in range.
  */
 enum sr_status_of_roamed_ap {
 	SR_DISALLOW,
-	SR_THRESHOLD_IN_RANGE_OF_ROAMED_AP,
-	SR_THRESHOLD_NOT_IN_RANGE_OF_ROAMED_AP,
+	SR_THRESHOLD_IN_RANGE,
+	SR_THRESHOLD_NOT_IN_RANGE,
 };
 #endif
 
@@ -710,6 +711,21 @@ void lim_update_vdev_sr_elements(struct pe_session *session_entry,
  * Return: success/failure
  */
 QDF_STATUS lim_process_srp_ie(tpSirAssocRsp ar, tpDphHashNode sta_ds);
+
+/**
+ * lim_handle_sr_cap() - To handle SR(Spatial Reuse) capability
+ * of roamed AP
+ * @vdev: objmgr vdev
+ * @reason: reason for the update
+ *
+ * This function is to check and compare SR cap of previous and
+ * roamed AP and takes decision to send event to userspace.
+ *
+ * Return: None
+ */
+void lim_handle_sr_cap(struct wlan_objmgr_vdev *vdev,
+		       enum sr_osif_reason_code reason);
+
 #else
 static inline void
 lim_update_vdev_sr_elements(struct pe_session *session_entry,
@@ -722,6 +738,12 @@ QDF_STATUS lim_process_srp_ie(tpSirAssocRsp ar, tpDphHashNode sta_ds)
 {
 	return QDF_STATUS_SUCCESS;
 }
+
+static inline void
+lim_handle_sr_cap(struct wlan_objmgr_vdev *vdev,
+		  enum sr_osif_reason_code reason)
+{
+}
 #endif
 
 #if defined(WLAN_FEATURE_ROAM_OFFLOAD) && defined(WLAN_FEATURE_11BE_MLO)

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

@@ -86,7 +86,6 @@
 #include "wlan_mlo_mgr_sta.h"
 #include "wlan_mlo_mgr_peer.h"
 #include <wlan_twt_api.h>
-#include "spatial_reuse_api.h"
 
 struct pe_hang_event_fixed_param {
 	uint16_t tlv_header;
@@ -2755,17 +2754,8 @@ static inline void pe_roam_fill_obss_scan_param(struct pe_session *src_session,
 #endif
 
 #ifdef WLAN_FEATURE_SR
-/**
- * lim_handle_sr_cap() - To handle SR(Spatial Reuse) capability
- * of roamed AP
- * @vdev: objmgr vdev
- *
- * This function is to check and compare SR cap of previous and
- * roamed AP and takes decision to send event to userspace.
- *
- * Return: None
- */
-static void lim_handle_sr_cap(struct wlan_objmgr_vdev *vdev)
+void lim_handle_sr_cap(struct wlan_objmgr_vdev *vdev,
+		       enum sr_osif_reason_code reason)
 {
 	int32_t non_srg_pd_threshold = 0;
 	int32_t srg_pd_threshold = 0;
@@ -2776,6 +2766,7 @@ static void lim_handle_sr_cap(struct wlan_objmgr_vdev *vdev)
 	bool is_pd_threshold_present = false;
 	struct wlan_objmgr_pdev *pdev;
 	enum sr_status_of_roamed_ap sr_status;
+	enum sr_osif_operation sr_op;
 
 	pdev = wlan_vdev_get_pdev(vdev);
 	if (!pdev) {
@@ -2803,12 +2794,12 @@ static void lim_handle_sr_cap(struct wlan_objmgr_vdev *vdev)
 		     SR_PD_THRESHOLD_MIN) ||
 		      (srg_pd_threshold < srg_min_pd_offset +
 		       SR_PD_THRESHOLD_MIN))))
-			sr_status = SR_THRESHOLD_NOT_IN_RANGE_OF_ROAMED_AP;
+			sr_status = SR_THRESHOLD_NOT_IN_RANGE;
 		else
-			sr_status = SR_THRESHOLD_IN_RANGE_OF_ROAMED_AP;
+			sr_status = SR_THRESHOLD_IN_RANGE;
 	}
-	pe_debug("sr status of roamed AP %d existing thresholds srg: %d non-srg: %d roamed AP sr offset srg: max %d min %d non-srg: %d",
-		 sr_status, srg_pd_threshold, non_srg_pd_threshold,
+	pe_debug("sr status %d reason %d existing thresholds srg: %d non-srg: %d New: sr offset srg: max %d min %d non-srg: %d",
+		 sr_status, reason, srg_pd_threshold, non_srg_pd_threshold,
 		 srg_max_pd_offset, srg_min_pd_offset, non_srg_pd_offset);
 	switch (sr_status) {
 	case SR_DISALLOW:
@@ -2817,9 +2808,15 @@ static void lim_handle_sr_cap(struct wlan_objmgr_vdev *vdev)
 		wlan_vdev_mlme_set_current_srg_pd_threshold(vdev, 0);
 		wlan_spatial_reuse_osif_event(vdev,
 					      SR_OPERATION_SUSPEND,
-					      SR_REASON_CODE_ROAMING);
+					      reason);
+		/*
+		 * If SR is disabled due to beacon update,
+		 * notify the firmware to disable SR
+		 */
+		if (reason == SR_REASON_CODE_BCN_IE_CHANGE)
+			wlan_sr_setup_req(vdev, pdev, false, 0, 0);
 	break;
-	case SR_THRESHOLD_NOT_IN_RANGE_OF_ROAMED_AP:
+	case SR_THRESHOLD_NOT_IN_RANGE:
 		wlan_vdev_mlme_get_pd_threshold_present(
 						vdev, &is_pd_threshold_present);
 		/*
@@ -2835,27 +2832,25 @@ static void lim_handle_sr_cap(struct wlan_objmgr_vdev *vdev)
 			wlan_vdev_mlme_set_current_srg_pd_threshold(vdev, 0);
 			wlan_spatial_reuse_osif_event(vdev,
 						      SR_OPERATION_SUSPEND,
-						      SR_REASON_CODE_ROAMING);
+						      reason);
 		} else {
+			sr_op = (reason == SR_REASON_CODE_ROAMING) ?
+				SR_OPERATION_RESUME :
+				SR_OPERATION_UPDATE_PARAMS;
 			wlan_sr_setup_req(
 				vdev, pdev, true,
 				srg_max_pd_offset + SR_PD_THRESHOLD_MIN,
 				non_srg_pd_threshold + SR_PD_THRESHOLD_MIN);
-			wlan_spatial_reuse_osif_event(vdev,
-						      SR_OPERATION_RESUME,
-						      SR_REASON_CODE_ROAMING);
+			wlan_spatial_reuse_osif_event(vdev, sr_op, reason);
 		}
 	break;
-	case SR_THRESHOLD_IN_RANGE_OF_ROAMED_AP:
+	case SR_THRESHOLD_IN_RANGE:
 		/* Send enable command to fw, as fw disables SR on roaming */
 		wlan_sr_setup_req(vdev, pdev, true, srg_pd_threshold,
 				  non_srg_pd_threshold);
 	break;
 	}
 }
-#else
-static void lim_handle_sr_cap(struct wlan_objmgr_vdev *vdev)
-{}
 #endif
 
 QDF_STATUS
@@ -3073,7 +3068,7 @@ pe_roam_synch_callback(struct mac_context *mac_ctx,
 	lim_init_tdls_data(mac_ctx, ft_session_ptr);
 	ric_tspec_len = ft_session_ptr->RICDataLen;
 	pe_debug("LFR3: Session RicLength: %d", ft_session_ptr->RICDataLen);
-	lim_handle_sr_cap(ft_session_ptr->vdev);
+	lim_handle_sr_cap(ft_session_ptr->vdev, SR_REASON_CODE_ROAMING);
 #ifdef FEATURE_WLAN_ESE
 	ric_tspec_len += ft_session_ptr->tspecLen;
 	pe_debug("LFR3: tspecLen: %d", ft_session_ptr->tspecLen);

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

@@ -115,6 +115,10 @@
 #else
 #define MAX_NUM_PWR_LEVELS 8
 #endif
+
+/* SR is disabled if NON_SRG is disallowed and SRG INFO is not present */
+#define SR_DISABLE NON_SRG_PD_SR_DISALLOWED & (~SRG_INFO_PRESENT & 0x0F)
+
 typedef union uPmfSaQueryTimerId {
 	struct {
 		uint8_t sessionId;

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

@@ -543,6 +543,60 @@ sch_bcn_update_opmode_change(struct mac_context *mac_ctx, tpDphHashNode sta_ds,
 	}
 }
 
+#ifdef WLAN_FEATURE_SR
+/**
+ * lim_detect_change_in_srp() - Detect change in SRP IE
+ * of the beacon
+ *
+ * @mac_ctx: global mac context
+ * @sta: pointer to sta node
+ * @session: pointer to LIM session
+ * @bcn: beacon from associated AP
+ *
+ * Detect change in SRP IE of the beacon and update the params
+ * accordingly.
+ *
+ * Return: None
+ */
+static void lim_detect_change_in_srp(struct mac_context *mac_ctx,
+				     tpDphHashNode sta,
+				     struct pe_session *session,
+				     tpSchBeaconStruct bcn)
+{
+	tDot11fIEspatial_reuse sr_ie;
+
+	sr_ie = sta->parsed_ies.srp_ie;
+	if (!sr_ie.present) {
+		return;
+	} else if (!bcn->srp_ie.present) {
+		pe_err_rl("SRP IE is missing in beacon, disable SR");
+	} else if (!qdf_mem_cmp(&sr_ie, &bcn->srp_ie,
+				sizeof(tDot11fIEspatial_reuse))) {
+		/* No change in beacon SRP IE */
+		return;
+	}
+
+	/*
+	 * If SRP IE has changes, update the new params.
+	 * Else if the SRP IE is missing, disable SR
+	 */
+	sta->parsed_ies.srp_ie = bcn->srp_ie;
+	if (bcn->srp_ie.present)
+		lim_update_vdev_sr_elements(session, sta);
+	else
+		wlan_vdev_mlme_set_sr_ctrl(session->vdev, SR_DISABLE);
+
+	lim_handle_sr_cap(session->vdev, SR_REASON_CODE_BCN_IE_CHANGE);
+}
+#else
+static void lim_detect_change_in_srp(struct mac_context *mac_ctx,
+				     tpDphHashNode sta,
+				     struct pe_session *session,
+				     tpSchBeaconStruct bcn)
+{
+}
+#endif
+
 static void
 sch_bcn_process_sta_opmode(struct mac_context *mac_ctx,
 			    tpSchBeaconStruct bcn,
@@ -566,11 +620,12 @@ sch_bcn_process_sta_opmode(struct mac_context *mac_ctx,
 	/* check for VHT capability */
 	sta = dph_lookup_hash_entry(mac_ctx, pMh->sa, &aid,
 			&session->dph.dphHashTable);
-	if ((!sta))
+	if (!sta)
 		return;
 	sch_bcn_update_opmode_change(mac_ctx, sta, session, bcn, pMh,
 				     cb_mode);
 	sch_bcn_update_he_ies(mac_ctx, sta, session, bcn, pMh);
+	lim_detect_change_in_srp(mac_ctx, sta, session, bcn);
 	return;
 }
 

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -5067,6 +5067,22 @@ static inline void convert_bcon_bss_color_change_ie(tDot11fBeacon *bcn_frm,
 {}
 #endif
 
+#ifdef WLAN_FEATURE_SR
+static void sir_convert_beacon_frame2_sr_struct(tDot11fBeacon *bcn_frm,
+						tpSirProbeRespBeacon bcn_struct)
+{
+	if (bcn_frm->spatial_reuse.present)
+		qdf_mem_copy(&bcn_struct->srp_ie, &bcn_frm->spatial_reuse,
+			     sizeof(tDot11fIEspatial_reuse));
+}
+#else
+static inline void
+sir_convert_beacon_frame2_sr_struct(tDot11fBeacon *bcn_frm,
+				    tpSirProbeRespBeacon bcn_struct)
+{
+}
+#endif
+
 #ifdef WLAN_FEATURE_11BE_MLO
 static QDF_STATUS
 sir_convert_beacon_frame2_t2lm_struct(tDot11fBeacon *bcn_frm,
@@ -5581,6 +5597,7 @@ sir_convert_beacon_frame2_struct(struct mac_context *mac,
 	sir_convert_beacon_frame2_mlo_struct(pPayload, nPayload, pBeacon,
 					     pBeaconStruct);
 	sir_convert_beacon_frame2_t2lm_struct(pBeacon, pBeaconStruct);
+	sir_convert_beacon_frame2_sr_struct(pBeacon, pBeaconStruct);
 
 	qdf_mem_free(pBeacon);
 	return QDF_STATUS_SUCCESS;