wlan: INI Support for configuring PNO scan cycle iteration.
Driver gets only one timer interval which is hardcoded in
supplicant for 10000ms. So until PNO is disabled firmware
repeats PNO scan for every 10 secs. With this change power
consumption can be reduced by increasing scan interval value
exponentially and after certain number of scan cycle,
which is configurable through INI
CRs-fixed: 534734
Change-Id: I290c6bace663fa0ea380731e2ab5ed188320d87b
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index 06fc24a..1df76c4 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -1839,6 +1839,13 @@
#define CFG_SPLIT_SCAN_TRAFFIC_MONITOR_TIMER_MAX ( 10000 )
#define CFG_SPLIT_SCAN_TRAFFIC_MONITOR_TIMER_DEFAULT ( 5000 )
+#ifdef FEATURE_WLAN_SCAN_PNO
+#define CFG_PNO_SCAN_TIMER_REPEAT_VALUE "gPNOScanTimerRepeatValue"
+#define CFG_PNO_SCAN_TIMER_REPEAT_VALUE_DEFAULT ( 6 )
+#define CFG_PNO_SCAN_TIMER_REPEAT_VALUE_MIN ( 0 )
+#define CFG_PNO_SCAN_TIMER_REPEAT_VALUE_MAX ( 0xffffffff )
+#endif
+
/*---------------------------------------------------------------------------
Type declarations
-------------------------------------------------------------------------*/
@@ -2228,6 +2235,10 @@
v_BOOL_t enableIbssHeartBeatOffload;
v_U32_t antennaDiversity;
v_BOOL_t fEnableSNRMonitoring;
+ /*PNO related parameters */
+#if FEATURE_WLAN_SCAN_PNO
+ v_U32_t configPNOScanTimerRepeatValue;
+#endif
} hdd_config_t;
/*---------------------------------------------------------------------------
Function declarations and documenation
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index ef48491..bd573f4 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -197,6 +197,12 @@
#define GTK_OFFLOAD_DISABLE 1
#endif
+#ifdef FEATURE_WLAN_SCAN_PNO
+#define HDD_PNO_SCAN_TIMERS_SET_ONE 1
+/* value should not be greater than PNO_MAX_SCAN_TIMERS */
+#define HDD_PNO_SCAN_TIMERS_SET_MULTIPLE 6
+#endif
+
#define HDD_MAC_ADDR_LEN 6
#define HDD_ROAM_SCAN_CHANNEL_SWITCH_TIME 3
typedef v_U8_t tWlanHddMacAddr[HDD_MAC_ADDR_LEN];
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 694bb72..091eed3 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -2398,6 +2398,15 @@
CFG_ENABLE_SNR_MONITORING_MIN,
CFG_ENABLE_SNR_MONITORING_MAX),
+#ifdef FEATURE_WLAN_SCAN_PNO
+ REG_VARIABLE( CFG_PNO_SCAN_TIMER_REPEAT_VALUE, WLAN_PARAM_Integer,
+ hdd_config_t, configPNOScanTimerRepeatValue,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_PNO_SCAN_TIMER_REPEAT_VALUE_DEFAULT,
+ CFG_PNO_SCAN_TIMER_REPEAT_VALUE_MIN,
+ CFG_PNO_SCAN_TIMER_REPEAT_VALUE_MAX),
+#endif
+
};
/*
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index f78c756..40f9873 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -7266,7 +7266,7 @@
tpSirPNOScanReq pPnoRequest = NULL;
hdd_context_t *pHddCtx;
tHalHandle hHal;
- v_U32_t i, indx, num_ch;
+ v_U32_t i, indx, num_ch, tempInterval;
u8 valid_ch[WNI_CFG_VALID_CHANNEL_LIST_LEN];
u8 channels_allowed[WNI_CFG_VALID_CHANNEL_LIST_LEN];
v_U32_t num_channels_allowed = WNI_CFG_VALID_CHANNEL_LIST_LEN;
@@ -7380,11 +7380,35 @@
pPnoRequest->aNetworks[i].rssiThreshold = 0; //Default value
}
- /* framework provides interval in ms */
- pPnoRequest->scanTimers.ucScanTimersCount = 1;
- pPnoRequest->scanTimers.aTimerValues[0].uTimerValue =
- (request->interval)/1000;
- pPnoRequest->scanTimers.aTimerValues[0].uTimerRepeat = 0;
+ /* Driver gets only one time interval which is hardcoded in
+ * supplicant for 10000ms. Taking power consumption into account 6 timers
+ * will be used, Timervalue is increased exponentially i.e 10,20,40,
+ * 80,160,320 secs. And number of scan cycle for each timer
+ * is configurable through INI param gPNOScanTimerRepeatValue.
+ * If it is set to 0 only one timer will be used and PNO scan cycle
+ * will be repeated after each interval specified by supplicant
+ * till PNO is disabled.
+ */
+ if (0 == pHddCtx->cfg_ini->configPNOScanTimerRepeatValue)
+ pPnoRequest->scanTimers.ucScanTimersCount = HDD_PNO_SCAN_TIMERS_SET_ONE;
+ else
+ pPnoRequest->scanTimers.ucScanTimersCount =
+ HDD_PNO_SCAN_TIMERS_SET_MULTIPLE;
+
+ tempInterval = (request->interval)/1000;
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "Base scan interval = %d PNOScanTimerRepeatValue = %d",
+ tempInterval, pHddCtx->cfg_ini->configPNOScanTimerRepeatValue);
+ for ( i = 0; i < pPnoRequest->scanTimers.ucScanTimersCount; i++)
+ {
+ pPnoRequest->scanTimers.aTimerValues[i].uTimerRepeat =
+ pHddCtx->cfg_ini->configPNOScanTimerRepeatValue;
+ pPnoRequest->scanTimers.aTimerValues[i].uTimerValue = tempInterval;
+ tempInterval *= 2;
+ }
+ //Repeat last timer until pno disabled.
+ pPnoRequest->scanTimers.aTimerValues[i-1].uTimerRepeat = 0;
+
pPnoRequest->modePNO = SIR_PNO_MODE_ON_SUSPEND;
status = sme_SetPreferredNetworkList(WLAN_HDD_GET_HAL_CTX(pAdapter),