wlan: Add support to honour multiple scan plans
Add Support to configure multiple 'scan plans' for scheduled scan.
Each 'scan plan' defines the number of scan cycles and the interval
between scans. The scan plans are executed in the order they were
configured. The last scan plan will always run infinitely and thus
defines only the interval between scans
The maximum number of scan plans supported by the device and the
maximum number of iterations in a single scan plan are advertised
to userspace so it can configure the scan plans appropriately.
Change-Id: Ib82594a9e9be88ac7c36e1804e84b21972f1404b
CRs-Fixed: 1099024
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index fdbbae1..dbcd369 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -183,6 +183,10 @@
#define MAC_ADDR_SPOOFING_FW_ENABLE_HOST_DISABLE 2
#define MAC_ADDR_SPOOFING_DEFER_INTERVAL 10 //in ms
+/*
+ * max_sched_scan_plans defined to 10
+ */
+#define MAX_SCHED_SCAN_PLANS 10
static const u32 hdd_cipher_suites[] =
{
@@ -7853,6 +7857,33 @@
return wiphy;
}
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(4,4,0)) || \
+ defined (CFG80211_MULTI_SCAN_PLAN_BACKPORT)
+/**
+ * hdd_config_sched_scan_plans_to_wiphy() - configure sched scan plans to wiphy
+ * @wiphy: pointer to wiphy
+ * @config: pointer to config
+ *
+ * Return: None
+ */
+static void hdd_config_sched_scan_plans_to_wiphy(struct wiphy *wiphy,
+ hdd_config_t *config)
+{
+ wiphy->max_sched_scan_plans = MAX_SCHED_SCAN_PLANS;
+ if (config->max_sched_scan_plan_interval)
+ wiphy->max_sched_scan_plan_interval =
+ config->max_sched_scan_plan_interval;
+ if (config->max_sched_scan_plan_iterations)
+ wiphy->max_sched_scan_plan_iterations =
+ config->max_sched_scan_plan_iterations;
+}
+#else
+static void hdd_config_sched_scan_plans_to_wiphy(struct wiphy *wiphy,
+ hdd_config_t *config)
+{
+}
+#endif
+
/*
* FUNCTION: wlan_hdd_cfg80211_update_band
* This function is called from the supplicant through a
@@ -8144,6 +8175,8 @@
wiphy->vendor_events = wlan_hdd_cfg80211_vendor_events;
wiphy->n_vendor_events = ARRAY_SIZE(wlan_hdd_cfg80211_vendor_events);
+ hdd_config_sched_scan_plans_to_wiphy(wiphy, pCfg);
+
EXIT();
return 0;
}
@@ -17188,6 +17221,69 @@
EXIT();
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)) || \
+ defined (CFG80211_MULTI_SCAN_PLAN_BACKPORT)
+/**
+ * hdd_config_sched_scan_plan() - configures the sched scan plans
+ * from the framework.
+ * @pno_req: pointer to PNO scan request
+ * @request: pointer to scan request from framework
+ *
+ * Return: None
+ */
+static void hdd_config_sched_scan_plan(tpSirPNOScanReq pno_req,
+ struct cfg80211_sched_scan_request *request,
+ hdd_context_t *hdd_ctx)
+{
+ v_U32_t i = 0;
+
+ pno_req.scanTimers.ucScanTimersCount = n_scan_plans;
+ for (i = 0; i < request->n_scan_plans; i++)
+ {
+ pno_req.scanTimers.aTimerValues[i].uTimerRepeat =
+ request->scan_plans[i]->iterations;
+ pno_req.scanTimers.aTimerValues[i].uTimerValue =
+ request->scan_plans[i]->interval;
+ }
+}
+#else
+static void hdd_config_sched_scan_plan(tSirPNOScanReq pno_req,
+ struct cfg80211_sched_scan_request *request,
+ hdd_context_t *hdd_ctx)
+{
+ v_U32_t i, temp_int;
+ /* 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 == hdd_ctx->cfg_ini->configPNOScanTimerRepeatValue)
+ pno_req.scanTimers.ucScanTimersCount =
+ HDD_PNO_SCAN_TIMERS_SET_ONE;
+ else
+ pno_req.scanTimers.ucScanTimersCount =
+ HDD_PNO_SCAN_TIMERS_SET_MULTIPLE;
+
+ temp_int = (request->interval)/1000;
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "Base scan interval = %d PNOScanTimerRepeatValue = %d",
+ temp_int, hdd_ctx->cfg_ini->configPNOScanTimerRepeatValue);
+ for ( i = 0; i < pno_req.scanTimers.ucScanTimersCount; i++)
+ {
+ pno_req.scanTimers.aTimerValues[i].uTimerRepeat =
+ hdd_ctx->cfg_ini->configPNOScanTimerRepeatValue;
+ pno_req.scanTimers.aTimerValues[i].uTimerValue = temp_int;
+ temp_int *= 2;
+ }
+ //Repeat last timer until pno disabled.
+ pno_req.scanTimers.aTimerValues[i-1].uTimerRepeat = 0;
+}
+#endif
+
/*
* FUNCTION: __wlan_hdd_cfg80211_sched_scan_start
* Function to enable PNO
@@ -17199,7 +17295,7 @@
tSirPNOScanReq pnoRequest = {0};
hdd_context_t *pHddCtx;
tHalHandle hHal;
- v_U32_t i, indx, num_ch, tempInterval, j;
+ v_U32_t i, indx, num_ch, j;
u8 valid_ch[WNI_CFG_VALID_CHANNEL_LIST_LEN] = {0};
u8 channels_allowed[WNI_CFG_VALID_CHANNEL_LIST_LEN] = {0};
v_U32_t num_channels_allowed = WNI_CFG_VALID_CHANNEL_LIST_LEN;
@@ -17443,34 +17539,7 @@
pnoRequest.us5GProbeTemplateLen);
}
- /* 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)
- pnoRequest.scanTimers.ucScanTimersCount = HDD_PNO_SCAN_TIMERS_SET_ONE;
- else
- pnoRequest.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 < pnoRequest.scanTimers.ucScanTimersCount; i++)
- {
- pnoRequest.scanTimers.aTimerValues[i].uTimerRepeat =
- pHddCtx->cfg_ini->configPNOScanTimerRepeatValue;
- pnoRequest.scanTimers.aTimerValues[i].uTimerValue = tempInterval;
- tempInterval *= 2;
- }
- //Repeat last timer until pno disabled.
- pnoRequest.scanTimers.aTimerValues[i-1].uTimerRepeat = 0;
+ hdd_config_sched_scan_plan(pnoRequest, request, pHddCtx);
pnoRequest.modePNO = SIR_PNO_MODE_IMMEDIATE;