wlan: Add support to enable/disable MAWC
Add ini support to turn ON/OFF Motion assistance Legacy Fast Roaming
feature in FW. The MAWC feature enhances throughput by aggresively
initiating roaming when the user is in motion. It also helps roaming
in fringe coverage by initiating scans when the user is in motion.
Change-Id: I102a39a9e40a15726f54f60e03096fe5ffae9dde
CRs-Fixed: 568061
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index 18c8e35..b3c82b6 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -786,6 +786,11 @@
#define CFG_LFR_FEATURE_ENABLED_MIN (0)
#define CFG_LFR_FEATURE_ENABLED_MAX (1)
#define CFG_LFR_FEATURE_ENABLED_DEFAULT (0) //disabled
+
+#define CFG_LFR_MAWC_FEATURE_ENABLED_NAME "MAWCEnabled"
+#define CFG_LFR_MAWC_FEATURE_ENABLED_MIN (0)
+#define CFG_LFR_MAWC_FEATURE_ENABLED_MAX (1)
+#define CFG_LFR_MAWC_FEATURE_ENABLED_DEFAULT (0) /* disabled */
#endif // FEATURE_WLAN_LFR
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
@@ -2121,6 +2126,7 @@
v_U32_t InfraUapsdBkSuspIntv;
#ifdef FEATURE_WLAN_LFR
v_BOOL_t isFastRoamIniFeatureEnabled;
+ v_BOOL_t MAWCEnabled;
#endif
#ifdef FEATURE_WLAN_CCX
v_U32_t InfraInactivityInterval;
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 4142886..ea0a44d 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -167,6 +167,12 @@
// at the point this routine is called, the value in the cfg_ini table has already been updated
sme_UpdateIsFastRoamIniFeatureEnabled((tHalHandle)(pHddCtx->hHal), pHddCtx->cfg_ini->isFastRoamIniFeatureEnabled );
}
+
+static void NotifyIsMAWCIniFeatureEnabled(hdd_context_t *pHddCtx, unsigned long NotifyId)
+{
+ /* at the point this routine is called, the value in the cfg_ini table has already been updated */
+ sme_UpdateIsMAWCIniFeatureEnabled((tHalHandle)(pHddCtx->hHal), pHddCtx->cfg_ini->MAWCEnabled );
+}
#endif
#ifdef FEATURE_WLAN_CCX
@@ -1115,6 +1121,16 @@
CFG_LFR_FEATURE_ENABLED_MIN,
CFG_LFR_FEATURE_ENABLED_MAX,
NotifyIsFastRoamIniFeatureEnabled, 0 ),
+
+ /* flag to turn ON/OFF Motion assistance for Legacy Fast Roaming */
+ REG_DYNAMIC_VARIABLE( CFG_LFR_MAWC_FEATURE_ENABLED_NAME, WLAN_PARAM_Integer,
+ hdd_config_t, MAWCEnabled,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_LFR_MAWC_FEATURE_ENABLED_DEFAULT,
+ CFG_LFR_MAWC_FEATURE_ENABLED_MIN,
+ CFG_LFR_MAWC_FEATURE_ENABLED_MAX,
+ NotifyIsMAWCIniFeatureEnabled, 0 ),
+
#endif // FEATURE_WLAN_LFR
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
@@ -3071,6 +3087,7 @@
#endif
#ifdef FEATURE_WLAN_LFR
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [FastRoamEnabled] Value = [%lu] ",pHddCtx->cfg_ini->isFastRoamIniFeatureEnabled);
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [MAWCEnabled] Value = [%u] ",pHddCtx->cfg_ini->MAWCEnabled);
#endif
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [RoamRssiDiff] Value = [%lu] ",pHddCtx->cfg_ini->RoamRssiDiff);
@@ -4511,6 +4528,7 @@
#endif
#ifdef FEATURE_WLAN_LFR
smeConfig.csrConfig.isFastRoamIniFeatureEnabled = pConfig->isFastRoamIniFeatureEnabled;
+ smeConfig.csrConfig.MAWCEnabled = pConfig->MAWCEnabled;
#endif
#ifdef FEATURE_WLAN_CCX
smeConfig.csrConfig.isCcxIniFeatureEnabled = pConfig->isCcxIniFeatureEnabled;
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 245833a..abb560c 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -3671,6 +3671,7 @@
typedef struct sSirRoamOffloadScanReq
{
eAniBoolean RoamScanOffloadEnabled;
+ eAniBoolean MAWCEnabled;
tANI_S8 LookupThreshold;
tANI_U8 RoamRssiDiff;
tANI_U8 ChannelCacheType;
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index 79a8a6d..074fdac 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -1058,6 +1058,7 @@
#endif
#ifdef FEATURE_WLAN_LFR
tANI_U8 isFastRoamIniFeatureEnabled;
+ tANI_U8 MAWCEnabled;
#endif
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index 6bdcc29..2304984 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -615,6 +615,7 @@
#ifdef FEATURE_WLAN_LFR
tANI_U8 isFastRoamIniFeatureEnabled;
+ tANI_U8 MAWCEnabled;
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
tANI_U8 isRoamOffloadScanEnabled;
tANI_BOOLEAN bFastRoamInConIniFeatureEnabled;
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index f98cc3c..92e2ec9 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -105,6 +105,7 @@
#endif
#if defined FEATURE_WLAN_LFR
tANI_U8 isFastRoamIniFeatureEnabled;
+ tANI_U8 MAWCEnabled;
#endif
#if defined FEATURE_WLAN_CCX
tANI_U8 isCcxIniFeatureEnabled;
@@ -2499,6 +2500,20 @@
eHalStatus sme_UpdateIsFastRoamIniFeatureEnabled(tHalHandle hHal,
const v_BOOL_t isFastRoamIniFeatureEnabled);
+/*--------------------------------------------------------------------------
+ \brief sme_UpdateIsMAWCIniFeatureEnabled() -
+ Enable/disable LFR MAWC support at runtime
+ It is used at in the REG_DYNAMIC_VARIABLE macro definition of
+ isMAWCIniFeatureEnabled.
+ This is a synchronous call
+ \param hHal - The handle returned by macOpen.
+ \return eHAL_STATUS_SUCCESS - SME update MAWCEnabled config successfully.
+ Other status means SME is failed to update MAWCEnabled.
+ \sa
+ --------------------------------------------------------------------------*/
+eHalStatus sme_UpdateIsMAWCIniFeatureEnabled(tHalHandle hHal,
+ const v_BOOL_t MAWCEnabled);
+
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
/*--------------------------------------------------------------------------
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 3118774..cfb29ea 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -1660,6 +1660,7 @@
#endif
#ifdef FEATURE_WLAN_LFR
pMac->roam.configParam.isFastRoamIniFeatureEnabled = pParam->isFastRoamIniFeatureEnabled;
+ pMac->roam.configParam.MAWCEnabled = pParam->MAWCEnabled;
#endif
#ifdef FEATURE_WLAN_CCX
@@ -15616,6 +15617,9 @@
pNeighborRoamInfo->cfgParams.maxChannelScanTime;
pRequestBuf->EmptyRefreshScanPeriod =
pNeighborRoamInfo->cfgParams.emptyScanRefreshPeriod;
+ /* MAWC feature */
+ pRequestBuf->MAWCEnabled =
+ pMac->roam.configParam.MAWCEnabled;
#ifdef FEATURE_WLAN_CCX
pRequestBuf->IsCCXEnabled = pMac->roam.configParam.isCcxIniFeatureEnabled;
#endif
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 878f4c3..21a1e7d 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -7939,6 +7939,38 @@
return eHAL_STATUS_SUCCESS;
}
+/*--------------------------------------------------------------------------
+ \brief sme_UpdateIsMAWCIniFeatureEnabled() -
+ Enable/disable LFR MAWC support at runtime
+ It is used at in the REG_DYNAMIC_VARIABLE macro definition of
+ isMAWCIniFeatureEnabled.
+ This is a synchronous call
+ \param hHal - The handle returned by macOpen.
+ \return eHAL_STATUS_SUCCESS - SME update MAWCEnabled config successfully.
+ Other status means SME is failed to update MAWCEnabled.
+ \sa
+ --------------------------------------------------------------------------*/
+eHalStatus sme_UpdateIsMAWCIniFeatureEnabled(tHalHandle hHal,
+ const v_BOOL_t MAWCEnabled)
+{
+ tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
+ eHalStatus status = eHAL_STATUS_SUCCESS;
+
+ status = sme_AcquireGlobalLock( &pMac->sme );
+ if ( HAL_STATUS_SUCCESS( status ) )
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO,
+ "%s: MAWCEnabled is changed from %d to %d", __func__,
+ pMac->roam.configParam.MAWCEnabled,
+ MAWCEnabled);
+ pMac->roam.configParam.MAWCEnabled = MAWCEnabled;
+ sme_ReleaseGlobalLock( &pMac->sme );
+ }
+
+ return status ;
+
+}
+
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
/*--------------------------------------------------------------------------
\brief sme_UpdateEnableFastRoamInConcurrency() - enable/disable LFR if Concurrent session exists
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index 95e7887..6d6e3bd 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -13387,6 +13387,8 @@
pRoamOffloadScanReqParams->LookupThreshold ;
pwdiRoamOffloadScanInfo->RoamRssiDiff =
pRoamOffloadScanReqParams->RoamRssiDiff ;
+ pwdiRoamOffloadScanInfo->MAWCEnabled =
+ pRoamOffloadScanReqParams->MAWCEnabled ;
pwdiRoamOffloadScanInfo->Command =
pRoamOffloadScanReqParams->Command ;
pwdiRoamOffloadScanInfo->StartScanReason =
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi.h b/CORE/WDI/CP/inc/wlan_qct_wdi.h
index 3d34bf4..45b18a5 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi.h
@@ -4830,6 +4830,7 @@
typedef struct
{
wpt_boolean RoamScanOffloadEnabled;
+ wpt_boolean MAWCEnabled;
wpt_uint8 LookupThreshold;
wpt_uint8 RoamRssiDiff;
wpt_uint8 ChannelCacheType;
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index bbe4b13..3adf213 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -24740,6 +24740,7 @@
pRoamCandidateListParams->ChannelCacheType = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.ChannelCacheType ;
pRoamCandidateListParams->LookupThreshold = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.LookupThreshold;
pRoamCandidateListParams->RoamRssiDiff = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.RoamRssiDiff ;
+ pRoamCandidateListParams->MAWCEnabled = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.MAWCEnabled ;
pRoamCandidateListParams->Command = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.Command ;
pRoamCandidateListParams->StartScanReason = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.StartScanReason ;
pRoamCandidateListParams->NeighborScanTimerPeriod = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.NeighborScanTimerPeriod ;