wlan: Dynamic Lookup Threshold Calculation
The Lookup threshold is programmed based on the
minimum data rate that is supported by the
connected AP and also it's Receive Sensitivity
Threshold.The LFR background scans would be
performed starting from the Lookup Threshold
until it reaches the Rx Sensitivity threshold
stepping down 3dB at a time.Once done with the
occupied channels scan, a full scan on all the
valid channels is performed.
Change-Id: I85dfac0960490eb91cdccc38dd9901f195d010c6
CRs-Fixed: 593673
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index bc67358..542f23e 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -1225,9 +1225,11 @@
#define CFG_NEIGHBOR_REASSOC_RSSI_THRESHOLD_DEFAULT (83)
#define CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_NAME "gNeighborLookupThreshold"
-#define CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MIN (10)
+#define CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MIN (0)
#define CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MAX (120)
-#define CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_DEFAULT (78)
+#define CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_DEFAULT (0) /*A Zero value indicates the host to calculate
+ Adaptive thresold based on the minimum
+ supported data rate.*/
#define CFG_NEIGHBOR_SCAN_CHAN_LIST_NAME "gNeighborScanChannelList"
#define CFG_NEIGHBOR_SCAN_CHAN_LIST_DEFAULT ""
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 433bedd..67eedc4 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -3454,7 +3454,30 @@
#define CHANNEL_LIST_DYNAMIC_UPDATE 4 /* Occupied channel list can be learnt after update */
#define SIR_ROAM_SCAN_24G_DEFAULT_CH 1
#define SIR_ROAM_SCAN_5G_DEFAULT_CH 36
-#define SIR_ROAM_SCAN_RESERVED_BYTES 61
+
+/*Adaptive Thresholds to be used for FW based scanning*/
+#define LFR_SENSITIVITY_THR_1MBPS -89
+#define LFR_LOOKUP_THR_1MBPS -78
+#define LFR_SENSITIVITY_THR_2MBPS -87
+#define LFR_LOOKUP_THR_2MBPS -78
+#define LFR_SENSITIVITY_THR_5_5MBPS -86
+#define LFR_LOOKUP_THR_5_5MBPS -77
+#define LFR_SENSITIVITY_THR_11MBPS -85
+#define LFR_LOOKUP_THR_11MBPS -76
+#define LFR_SENSITIVITY_THR_6MBPS_2G -83
+#define LFR_LOOKUP_THR_6MBPS_2G -78
+#define LFR_SENSITIVITY_THR_6MBPS_5G -83
+#define LFR_LOOKUP_THR_6MBPS_5G -78
+#define LFR_SENSITIVITY_THR_12MBPS_2G -83
+#define LFR_LOOKUP_THR_12MBPS_2G -78
+#define LFR_SENSITIVITY_THR_12MBPS_5G -81
+#define LFR_LOOKUP_THR_12MBPS_5G -76
+#define LFR_SENSITIVITY_THR_24MBPS_2G -81
+#define LFR_LOOKUP_THR_24MBPS_2G -76
+#define LFR_SENSITIVITY_THR_24MBPS_5G -79
+#define LFR_LOOKUP_THR_24MBPS_5G -74
+#define LFR_SENSITIVITY_THR_DEFAULT 0
+#define LFR_LOOKUP_THR_DEFAULT -78
#endif //WLAN_FEATURE_ROAM_SCAN_OFFLOAD
// SME -> HAL - This is the host offload request.
@@ -3748,6 +3771,7 @@
eAniBoolean RoamScanOffloadEnabled;
eAniBoolean MAWCEnabled;
tANI_S8 LookupThreshold;
+ tANI_S8 RxSensitivityThreshold;
tANI_U8 RoamRssiDiff;
tANI_U8 ChannelCacheType;
tANI_U8 Command;
@@ -3764,16 +3788,6 @@
tANI_U8 p24GProbeTemplate[SIR_ROAM_SCAN_MAX_PB_REQ_SIZE];
tANI_U16 us5GProbeTemplateLen;
tANI_U8 p5GProbeTemplate[SIR_ROAM_SCAN_MAX_PB_REQ_SIZE];
- tANI_U8 ReservedBytes[SIR_ROAM_SCAN_RESERVED_BYTES];
- /*ReservedBytes is to add any further params in future
- without changing the interface params on Host
- and firmware.The firmware right now checks
- if the size of this structure matches and then
- proceeds with the processing of the command.
- So, in future, if there is any need to add
- more params, pick the memory from reserved
- bytes and keep deducting the reserved bytes
- by the amount of bytes picked.*/
tANI_U8 nProbes;
tANI_U16 HomeAwayTime;
tSirRoamNetworkType ConnectedNetwork;
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index e36fc39..1697a3c 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -15539,6 +15539,11 @@
tANI_U32 host_channels = 0;
tANI_U8 ChannelCacheStr[128] = {0};
eCsrBand eBand;
+ tSirBssDescription *pBssDesc = NULL;
+ tDot11fBeaconIEs *pIes = NULL;
+ tANI_U8 minRate = 0, dataRate;
+ tANI_U8 operationChannel;
+
currChannelListInfo = &pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo;
if (0 == csrRoamIsRoamOffloadScanEnabled(pMac))
@@ -15575,6 +15580,12 @@
return eHAL_STATUS_FAILURE;
}
pSession = CSR_GET_SESSION( pMac, sessionId );
+ pBssDesc = pSession->pConnectBssDesc;
+ if (pBssDesc == NULL)
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: pBssDesc not found for current session", __func__);
+ return eHAL_STATUS_FAILURE;
+ }
pRequestBuf = vos_mem_malloc(sizeof(tSirRoamOffloadScanReq));
if (NULL == pRequestBuf)
{
@@ -15586,7 +15597,13 @@
/* If command is STOP, then pass down ScanOffloadEnabled as Zero.This will handle the case of
* host driver reloads, but Riva still up and running*/
if(command == ROAM_SCAN_OFFLOAD_STOP)
+ {
pRequestBuf->RoamScanOffloadEnabled = 0;
+ /*For a STOP Command, there is no need to
+ * go through filling up all the below parameters
+ * since they are not required for the STOP command*/
+ goto send_roam_scan_offload_cmd;
+ }
else
pRequestBuf->RoamScanOffloadEnabled = pMac->roam.configParam.isRoamOffloadScanEnabled;
vos_mem_copy(pRequestBuf->ConnectedNetwork.currAPbssid,
@@ -15603,8 +15620,141 @@
pMac->roam.roamSession[sessionId].connectedProfile.EncryptionType;
pRequestBuf->ConnectedNetwork.mcencryption =
pMac->roam.roamSession[sessionId].connectedProfile.mcEncryptionType;
- pRequestBuf->LookupThreshold =
+ if (pNeighborRoamInfo->cfgParams.neighborLookupThreshold)
+ {
+ pRequestBuf->LookupThreshold =
(v_S7_t)pNeighborRoamInfo->cfgParams.neighborLookupThreshold * (-1);
+ pRequestBuf->RxSensitivityThreshold = LFR_SENSITIVITY_THR_DEFAULT;
+ }
+ else
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "Calculate Adaptive Threshold");
+ operationChannel = pSession->connectedProfile.operationChannel;
+
+ if (!HAL_STATUS_SUCCESS(csrGetParsedBssDescriptionIEs(pMac, pBssDesc, &pIes)))
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ "%s: csrGetParsedBssDescriptionIEs failed", __func__);
+ vos_mem_free(pRequestBuf);
+ return eHAL_STATUS_FAILURE;
+ }
+ if (pIes->SuppRates.present)
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "Number \t Rate");
+ /*Check for both basic rates and extended rates.*/
+ for (i = 0; i < pIes->SuppRates.num_rates; i++)
+ {
+ /*Check if the Rate is Mandatory or Not*/
+ if (csrRatesIsDot11RateSupported(pMac, pIes->SuppRates.rates[i])
+ && (pIes->SuppRates.rates[i] & 0x80))
+ {
+ /*Retrieve the actual data rate*/
+ dataRate = (pIes->SuppRates.rates[i] & 0x7F)/2;
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%d \t\t %d", i, dataRate);
+ if (minRate == 0)
+ minRate = dataRate;
+ else
+ minRate = (minRate < dataRate) ? minRate:dataRate;
+ }
+ }
+
+ if (pIes->ExtSuppRates.present)
+ {
+ for (i = 0; i < pIes->ExtSuppRates.num_rates; i++)
+ {
+ /*Check if the Rate is Mandatory or Not*/
+ if (csrRatesIsDot11RateSupported(pMac, pIes->ExtSuppRates.rates[i])
+ && (pIes->ExtSuppRates.rates[i] & 0x80))
+ {
+ /*Retrieve the actual data rate*/
+ dataRate = (pIes->ExtSuppRates.rates[i] & 0x7F)/2;
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%d \t\t %d", i, dataRate);
+ if (minRate == 0)
+ minRate = dataRate;
+ else
+ minRate = (minRate < dataRate) ? minRate:dataRate;
+ }
+ }
+ }
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG, "MinRate = %d", minRate);
+ }
+ else
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ "%s: Supp Rates not present in pIes", __func__);
+ vos_mem_free(pRequestBuf);
+ return eHAL_STATUS_FAILURE;
+ }
+ if (NULL != pIes)
+ {
+ vos_mem_free(pIes);
+ pIes = NULL;
+ }
+ switch (minRate)
+ {
+ case 1:
+ pRequestBuf->RxSensitivityThreshold = LFR_SENSITIVITY_THR_1MBPS;
+ pRequestBuf->LookupThreshold = LFR_LOOKUP_THR_1MBPS;
+ break;
+ case 2:
+ pRequestBuf->RxSensitivityThreshold = LFR_SENSITIVITY_THR_2MBPS;
+ pRequestBuf->LookupThreshold = LFR_LOOKUP_THR_2MBPS;
+ break;
+ case 5:
+ pRequestBuf->RxSensitivityThreshold = LFR_SENSITIVITY_THR_5_5MBPS;
+ pRequestBuf->LookupThreshold = LFR_LOOKUP_THR_5_5MBPS;
+ break;
+ case 6:
+ if (CSR_IS_CHANNEL_24GHZ(operationChannel))
+ {
+ pRequestBuf->RxSensitivityThreshold = LFR_SENSITIVITY_THR_6MBPS_2G;
+ pRequestBuf->LookupThreshold = LFR_LOOKUP_THR_6MBPS_2G;
+ }
+ else
+ {
+ pRequestBuf->RxSensitivityThreshold = LFR_SENSITIVITY_THR_6MBPS_5G;
+ pRequestBuf->LookupThreshold = LFR_LOOKUP_THR_6MBPS_5G;
+ }
+ break;
+ case 11:
+ pRequestBuf->RxSensitivityThreshold = LFR_SENSITIVITY_THR_11MBPS;
+ pRequestBuf->LookupThreshold = LFR_LOOKUP_THR_11MBPS;
+ break;
+ case 12:
+ if (CSR_IS_CHANNEL_24GHZ(operationChannel))
+ {
+ pRequestBuf->RxSensitivityThreshold = LFR_SENSITIVITY_THR_12MBPS_2G;
+ pRequestBuf->LookupThreshold = LFR_LOOKUP_THR_12MBPS_2G;
+ }
+ else
+ {
+ pRequestBuf->RxSensitivityThreshold = LFR_SENSITIVITY_THR_12MBPS_5G;
+ pRequestBuf->LookupThreshold = LFR_LOOKUP_THR_12MBPS_5G;
+ }
+ break;
+ case 24:
+ if (CSR_IS_CHANNEL_24GHZ(operationChannel))
+ {
+ pRequestBuf->RxSensitivityThreshold = LFR_SENSITIVITY_THR_24MBPS_2G;
+ pRequestBuf->LookupThreshold = LFR_LOOKUP_THR_24MBPS_2G;
+ }
+ else
+ {
+ pRequestBuf->RxSensitivityThreshold = LFR_SENSITIVITY_THR_24MBPS_5G;
+ pRequestBuf->LookupThreshold = LFR_LOOKUP_THR_24MBPS_5G;
+ }
+ break;
+ default:
+ pRequestBuf->LookupThreshold = LFR_LOOKUP_THR_DEFAULT;
+ pRequestBuf->RxSensitivityThreshold = LFR_SENSITIVITY_THR_DEFAULT;
+ break;
+ }
+ }
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG,
+ "Chnl=%d,MinRate=%d,RxSenThr=%d,LookupThr=%d",
+ operationChannel, minRate,
+ pRequestBuf->RxSensitivityThreshold,
+ pRequestBuf->LookupThreshold);
pRequestBuf->RoamRssiDiff =
pMac->roam.configParam.RoamRssiDiff;
pRequestBuf->Command = command;
@@ -15782,6 +15932,7 @@
csrRoamScanOffloadPrepareProbeReqTemplate(pMac,SIR_ROAM_SCAN_5G_DEFAULT_CH, ucDot11Mode, pSession->selfMacAddr,
pRequestBuf->p5GProbeTemplate, &pRequestBuf->us5GProbeTemplateLen);
+send_roam_scan_offload_cmd:
msg.type = WDA_ROAM_SCAN_OFFLOAD_REQ;
msg.reserved = 0;
msg.bodyptr = pRequestBuf;
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index 18517ef..3f98c85 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -13661,6 +13661,8 @@
pRoamOffloadScanReqParams->ConnectedNetwork.mcencryption);
pwdiRoamOffloadScanInfo->LookupThreshold =
pRoamOffloadScanReqParams->LookupThreshold ;
+ pwdiRoamOffloadScanInfo->RxSensitivityThreshold =
+ pRoamOffloadScanReqParams->RxSensitivityThreshold;
pwdiRoamOffloadScanInfo->RoamRssiDiff =
pRoamOffloadScanReqParams->RoamRssiDiff ;
pwdiRoamOffloadScanInfo->MAWCEnabled =
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi.h b/CORE/WDI/CP/inc/wlan_qct_wdi.h
index fcce9ba..6fe448a 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -4932,7 +4932,6 @@
#define WDI_ROAM_SCAN_MAX_CHANNELS 80 /* NUM_RF_CHANNELS */
#define WDI_ROAM_SCAN_MAX_PROBE_SIZE 450
-#define WDI_ROAM_SCAN_RESERVED_BYTES 61
typedef struct
{
@@ -4972,6 +4971,7 @@
wpt_boolean RoamScanOffloadEnabled;
wpt_boolean MAWCEnabled;
wpt_uint8 LookupThreshold;
+ wpt_uint8 RxSensitivityThreshold;
wpt_uint8 RoamRssiDiff;
wpt_uint8 ChannelCacheType;
wpt_uint8 Command;
@@ -4997,7 +4997,6 @@
WDI_MobilityDomainInfo MDID;
wpt_uint8 nProbes;
wpt_uint16 HomeAwayTime;
- wpt_uint8 ReservedBytes[WDI_ROAM_SCAN_RESERVED_BYTES];
} WDI_RoamOffloadScanInfo;
typedef struct
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index 6a1814b..46a8447 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -24918,6 +24918,7 @@
pRoamCandidateListParams->ConnectedNetwork.ChannelCount = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.ConnectedNetwork.ChannelCount;
pRoamCandidateListParams->ChannelCacheType = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.ChannelCacheType ;
pRoamCandidateListParams->LookupThreshold = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.LookupThreshold;
+ pRoamCandidateListParams->RxSensitivityThreshold = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.RxSensitivityThreshold;
pRoamCandidateListParams->RoamRssiDiff = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.RoamRssiDiff ;
pRoamCandidateListParams->MAWCEnabled = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.MAWCEnabled ;
pRoamCandidateListParams->Command = pwdiRoamScanOffloadReqParams->wdiRoamOffloadScanInfo.Command ;
diff --git a/prima/CORE/HDD/inc/wlan_hdd_power.h b/prima/CORE/HDD/inc/wlan_hdd_power.h
deleted file mode 100644
index e977ea1..0000000
--- a/prima/CORE/HDD/inc/wlan_hdd_power.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2012-2013 Qualcomm Atheros, Inc.
- * All Rights Reserved.
- * Qualcomm Atheros Confidential and Proprietary.
- */
-#ifndef __WLAN_HDD_POWER_H
-#define __WLAN_HDD_POWER_H
-
-/**===========================================================================
-
- \file wlan_hdd_power.h
-
- \brief Linux HDD Power
- Copyright 2008 (c) Qualcomm Technologies, Inc.
- All Rights Reserved.
- Qualcomm Technologies Confidential and Proprietary.
-
- ==========================================================================*/
-
-
-/*--------------------------------------------------------------------------
- * Include Files
- *------------------------------------------------------------------------*/
-#include "wlan_hdd_main.h"
-
-/*---------------------------------------------------------------------------
- * Preprocessor definitions and constants
- *-------------------------------------------------------------------------*/
- //gEnableSuspend = 1 in INI file implies suspend to standby
- #define WLAN_MAP_SUSPEND_TO_STANDBY 1
-
- //gEnableSuspend = 2 in INI file implies suspend to deep sleep
- #define WLAN_MAP_SUSPEND_TO_DEEP_SLEEP 2
-
- //gEnableSuspend = 3 in INI file implies suspend to set MCAST/BCAST filter
- #define WLAN_MAP_SUSPEND_TO_MCAST_BCAST_FILTER 3
-
- //gEnableDriverStop = 1 implies map driver stop to standby
- #define WLAN_MAP_DRIVER_STOP_TO_STANDBY 1
-
- //gEnableDriverStop = 2 implies map sriver stop to deep sleep
- #define WLAN_MAP_DRIVER_STOP_TO_DEEP_SLEEP 2
-
- //Maximum time (ms) to wait for standby to complete
- #define WLAN_WAIT_TIME_STANDBY 3000
-
- //Maximum time (ms) to wait for full pwr to complete
- #define WLAN_WAIT_TIME_FULL_PWR 3000
-
-
-/*---------------------------------------------------------------------------
- * Type declarations
- *-------------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------------
- * Function declarations and documentation
- * ------------------------------------------------------------------------*/
- eHalStatus hdd_exit_standby(hdd_context_t *pHddCtx);
- VOS_STATUS hdd_exit_deep_sleep(hdd_context_t *pHddCtx,
- hdd_adapter_t* pAdapter);
- VOS_STATUS hdd_enter_standby(hdd_context_t *pHddCtx);
- VOS_STATUS hdd_enter_deep_sleep(hdd_context_t *pHddCtx,
- hdd_adapter_t* pAdapter);
-#ifdef CONFIG_HAS_EARLYSUSPEND
- VOS_STATUS hdd_wlan_reset(void);
- VOS_STATUS hdd_wlan_reset_initialization(void) ;
-#endif
- /* SSR shutdown & re-init functions */
- VOS_STATUS hdd_wlan_shutdown(void);
- VOS_STATUS hdd_wlan_re_init(void);
-
-void hdd_conf_mcastbcast_filter(hdd_context_t* pHddCtx, v_BOOL_t setfilter);
-VOS_STATUS hdd_conf_arp_offload(hdd_adapter_t* pAdapter, int fenable);
-/*
- * Function: hdd_conf_hostoffload
- * Central function to configure the supported offloads,
- * either enable or disable them.
- */
-void hdd_conf_hostoffload(hdd_adapter_t * pAdapter, v_BOOL_t fenable);
-#ifdef WLAN_FEATURE_GTK_OFFLOAD
-void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, v_BOOL_t fenable);
-#endif
-#ifdef WLAN_NS_OFFLOAD
-void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, int fenable);
-#endif
-#endif // if !defined __WLAN_QCT_DRIVER_H