diff --git a/components/mlme/core/src/wlan_mlme_main.c b/components/mlme/core/src/wlan_mlme_main.c
index 5d9caadef1f1..4fd55c786080 100644
--- a/components/mlme/core/src/wlan_mlme_main.c
+++ b/components/mlme/core/src/wlan_mlme_main.c
@@ -1314,6 +1314,15 @@ static void mlme_init_ese_cfg(struct wlan_objmgr_psoc *psoc,
}
#endif
+static void
+mlme_init_bss_load_trigger_params(struct wlan_objmgr_psoc *psoc,
+ struct bss_load_trigger *bss_load_trig)
+{
+ bss_load_trig->enabled =
+ cfg_get(psoc, CFG_ENABLE_BSS_LOAD_TRIGGERED_ROAM);
+ bss_load_trig->threshold = cfg_get(psoc, CFG_BSS_LOAD_THRESHOLD);
+}
+
static void mlme_init_lfr_cfg(struct wlan_objmgr_psoc *psoc,
struct wlan_mlme_lfr_cfg *lfr)
{
@@ -1463,6 +1472,7 @@ static void mlme_init_lfr_cfg(struct wlan_objmgr_psoc *psoc,
(uint8_t)neighbor_scan_chan_list_num;
mlme_init_roam_offload_cfg(psoc, lfr);
mlme_init_ese_cfg(psoc, lfr);
+ mlme_init_bss_load_trigger_params(psoc, &lfr->bss_load_trig);
}
static uint32_t
diff --git a/components/mlme/dispatcher/inc/cfg_mlme_lfr.h b/components/mlme/dispatcher/inc/cfg_mlme_lfr.h
index 7f773e08d85e..71082bf8acd7 100644
--- a/components/mlme/dispatcher/inc/cfg_mlme_lfr.h
+++ b/components/mlme/dispatcher/inc/cfg_mlme_lfr.h
@@ -1846,6 +1846,56 @@
20, \
CFG_VALUE_OR_DEFAULT, \
"wait time for tx complete before vdev stop")
+/*
+ *
+ * enable_bss_load_roam_trigger - enable/disable bss load based roam trigger
+ * @Min: 0
+ * @Max: 1
+ * @Default: 1
+ *
+ * This ini when enabled, allows the firmware to roam when bss load outpaces
+ * the configured bss load threshold. When this ini is disabled, firmware
+ * doesn't consider bss load values to trigger roam.
+ *
+ * Related: None
+ *
+ * Supported Feature: Roaming
+ *
+ * Usage: External
+ *
+ *
+ */
+#define CFG_ENABLE_BSS_LOAD_TRIGGERED_ROAM CFG_INI_BOOL( \
+ "enable_bss_load_roam_trigger", \
+ 1, \
+ "enable bss load triggered roaming")
+
+/*
+ *
+ * bss_load_threshold - bss load above which the STA should trigger roaming
+ * @Min: 0
+ * @Max: 100
+ * @Default: 70
+ *
+ * When the bss laod value that is sampled exceeds this threshold, firmware
+ * will trigger roaming if bss load trigger is enabled.
+ *
+ * Related: None
+ *
+ * Supported Feature: Roaming
+ *
+ * Usage: External
+ *
+ *
+ */
+#define CFG_BSS_LOAD_THRESHOLD CFG_INI_UINT( \
+ "bss_load_threshold", \
+ 0, \
+ 100, \
+ 70, \
+ CFG_VALUE_OR_DEFAULT, \
+ "bss load threshold")
+
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
/*
@@ -1972,6 +2022,8 @@
CFG(CFG_LFR_ROAM_SCAN_N_PROBES) \
CFG(CFG_LFR_ROAM_SCAN_HOME_AWAY_TIME) \
CFG(CFG_LFR_DELAY_BEFORE_VDEV_STOP) \
+ CFG(CFG_ENABLE_BSS_LOAD_TRIGGERED_ROAM) \
+ CFG(CFG_BSS_LOAD_THRESHOLD) \
ROAM_OFFLOAD_ALL \
LFR_ESE_ALL
diff --git a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h
index d8bf5b3ae081..7a887497427e 100644
--- a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h
+++ b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h
@@ -1164,6 +1164,16 @@ enum roaming_dfs_channel_type {
ROAMING_DFS_CHANNEL_ENABLED_ACTIVE,
};
+/*
+ * struct bss_load_trigger - parameters related to bss load triggered roam
+ * @enabled - flag to check if this trigger is enabled/disabled
+ * @threshold - Bss load threshold value above which roaming should start
+ */
+struct bss_load_trigger {
+ bool enabled;
+ uint32_t threshold;
+};
+
/*
* @mawc_roam_enabled: Enable/Disable MAWC during roaming
* @enable_fast_roam_in_concurrency:Enable LFR roaming on STA during concurrency
@@ -1315,6 +1325,7 @@ struct wlan_mlme_lfr_cfg {
uint8_t delay_before_vdev_stop;
uint8_t neighbor_scan_channel_list[CFG_VALID_CHANNEL_LIST_LEN];
uint8_t neighbor_scan_channel_list_num;
+ struct bss_load_trigger bss_load_trig;
};
/**
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index e9533a54dc41..0d47abd00540 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -2406,6 +2406,9 @@ typedef struct sSirRoamOffloadScanReq {
uint32_t min_delay_btw_roam_scans;
uint32_t roam_trigger_reason_bitmask;
bool roam_force_rssi_trigger;
+ /* bss load triggered roam related params */
+ bool bss_load_trig_enabled;
+ struct wmi_bss_load_config bss_load_config;
} tSirRoamOffloadScanReq, *tpSirRoamOffloadScanReq;
typedef struct sSirRoamOffloadScanRsp {
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 7000e1e8edac..c662c6af57ee 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -17202,6 +17202,14 @@ csr_update_roam_scan_offload_request(struct mac_context *mac_ctx,
mac_ctx->roam.configParam.roam_trigger_reason_bitmask;
req_buf->roam_force_rssi_trigger =
mac_ctx->roam.configParam.roam_force_rssi_trigger;
+
+ /* fill bss load triggered roam related configs */
+ req_buf->bss_load_trig_enabled =
+ mac_ctx->mlme_cfg->lfr.bss_load_trig.enabled;
+ req_buf->bss_load_config.bss_load_threshold =
+ mac_ctx->mlme_cfg->lfr.bss_load_trig.threshold;
+ req_buf->bss_load_config.vdev_id = session->sessionId;
+
req_buf->ReassocFailureTimeout =
mac_ctx->mlme_cfg->timeouts.reassoc_failure_timeout;
csr_update_roam_scan_ese_params(req_buf, session);
diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c
index f58f2ab77964..5c5df27abf40 100644
--- a/core/wma/src/wma_scan_roam.c
+++ b/core/wma/src/wma_scan_roam.c
@@ -1411,6 +1411,36 @@ static QDF_STATUS wma_roam_scan_btm_offload(tp_wma_handle wma_handle,
return status;
}
+/**
+ * wma_send_roam_bss_load_config() - API to send load bss trigger
+ * related parameters to fw
+ *
+ * @handle: WMA handle
+ * @roam_req: bss load config parameters from csr to be sent to fw
+ *
+ * Return: None
+ */
+static
+void wma_send_roam_bss_load_config(WMA_HANDLE handle,
+ struct wmi_bss_load_config *params)
+{
+ QDF_STATUS status;
+ tp_wma_handle wma_handle = (tp_wma_handle) handle;
+
+ if (!wma_handle || !wma_handle->wmi_handle) {
+ WMA_LOGE("WMA is closed, cannot send bss load config");
+ return;
+ }
+
+ WMA_LOGD("%s: Sending bss load trig params vdev %u bss_load_threshold %u",
+ __func__, params->vdev_id, params->bss_load_threshold);
+
+ status = wmi_unified_send_bss_load_config(wma_handle->wmi_handle,
+ params);
+ if (QDF_IS_STATUS_ERROR(status))
+ WMA_LOGE("failed to send bss load trigger config command");
+}
+
/**
* wma_send_offload_11k_params() - API to send 11k offload params to FW
* @handle: WMA handle
@@ -1471,6 +1501,7 @@ QDF_STATUS wma_process_roaming_config(tp_wma_handle wma_handle,
struct mac_context *mac = cds_get_context(QDF_MODULE_ID_PE);
uint32_t mode = 0;
struct wma_txrx_node *intr = NULL;
+ struct wmi_bss_load_config *bss_load_cfg;
if (NULL == mac) {
WMA_LOGE("%s: mac is NULL", __func__);
@@ -1611,6 +1642,11 @@ QDF_STATUS wma_process_roaming_config(tp_wma_handle wma_handle,
break;
}
}
+
+ if (roam_req->bss_load_trig_enabled) {
+ bss_load_cfg = &roam_req->bss_load_config;
+ wma_send_roam_bss_load_config(wma_handle, bss_load_cfg);
+ }
break;
case ROAM_SCAN_OFFLOAD_STOP:
@@ -1860,7 +1896,6 @@ QDF_STATUS wma_process_roaming_config(tp_wma_handle wma_handle,
wma_roam_scan_offload_mode(wma_handle, &scan_params,
roam_req, mode,
roam_req->sessionId);
-
break;
default: