qcacmn: Add new assoc and nonassoc ini for 6g scan

Add new ini's for assoc active and passive dwell time
for 6g. These will be applied if STA is connected.

Change-Id: I680fbd3038968ecf6ff9920fff982456135bfd77
CRs-Fixed: 2941359
This commit is contained in:
Amruta Kulkarni 2021-05-07 17:08:54 -07:00 • committed by Madan Koyyalamudi
commit 7b48192e1f
4 changed files with 62 additions and 0 deletions

View file

@ -304,6 +304,8 @@ struct extscan_def_config {
* @active_dwell_2g: default active dwell time for 2G channels, if it's not zero
* @active_dwell_6g: default active dwell time for 6G channels
* @passive_dwell_6g: default passive dwell time for 6G channels
* @active_dwell_time_6g_conc: default concurrent active dwell time for 6G
* @passive_dwell_time_6g_conc: default concurrent passive dwell time for 6G
* @passive_dwell:default passive dwell time
* @max_rest_time: default max rest time
* @sta_miracast_mcc_rest_time: max rest time for miracast and mcc
@ -391,6 +393,8 @@ struct scan_default_params {
uint32_t active_dwell_2g;
uint32_t active_dwell_6g;
uint32_t passive_dwell_6g;
uint32_t active_dwell_time_6g_conc;
uint32_t passive_dwell_time_6g_conc;
uint32_t passive_dwell;
uint32_t max_rest_time;
uint32_t sta_miracast_mcc_rest_time;

View file

@ -793,6 +793,13 @@ static void scm_req_update_concurrency_params(struct wlan_objmgr_vdev *vdev,
scm_debug("NDP active modify dwell time 2ghz %d",
req->scan_req.dwell_time_active_2g);
}
if (sta_active) {
req->scan_req.dwell_time_active_6g =
scan_obj->scan_def.active_dwell_time_6g_conc;
req->scan_req.dwell_time_passive_6g =
scan_obj->scan_def.passive_dwell_time_6g_conc;
}
}
/**

View file

@ -221,6 +221,51 @@ enum scan_mode_6ghz {
0, 10000, 30,\
CFG_VALUE_OR_DEFAULT, "passive dwell time for 6G channels")
/*
* <ini>
* active_max_channel_time_6g_conc - Set max time for active 6G
* channel scan when associated to AP.
* @Min: 0
* @Max: 10000
* @Default: 40
*
* This ini is used to set maximum time in msecs spent in
* active 6G channel scan
*
* Related: None
*
* Usage: External
*
* </ini>
*/
#define CFG_ACTIVE_MAX_6G_CHANNEL_TIME_CONC CFG_INI_UINT(\
"active_max_channel_time_6g_conc",\
0, 10000, 40,\
CFG_VALUE_OR_DEFAULT, "active conc dwell time for 6G channels")
/*
* <ini>
* passive_max_channel_time_6g_conc - Set max time for passive 6G
* channel scan when associated to AP.
* @Min: 0
* @Max: 10000
* @Default: 40
*
* This ini is used to set maximum time in msecs spent in
* passive 6G chan scan
*
* Related: None
*
* Usage: External
*
* </ini>
*/
#define CFG_PASSIVE_MAX_6G_CHANNEL_TIME_CONC CFG_INI_UINT(\
"passive_max_channel_time_6g_conc",\
0, 10000, 40,\
CFG_VALUE_OR_DEFAULT,\
"passive conc dwell time for 6G channels")
/*
* <ini>
* gPassiveMaxChannelTime - Set max channel time for passive scan
@ -1346,6 +1391,8 @@ enum scan_mode_6ghz {
CFG(CFG_PASSIVE_MAX_CHANNEL_TIME) \
CFG(CFG_ACTIVE_MAX_6G_CHANNEL_TIME) \
CFG(CFG_PASSIVE_MAX_6G_CHANNEL_TIME) \
CFG(CFG_ACTIVE_MAX_6G_CHANNEL_TIME_CONC) \
CFG(CFG_PASSIVE_MAX_6G_CHANNEL_TIME_CONC) \
CFG(CFG_SCAN_NUM_PROBES) \
CFG(CFG_SCAN_PROBE_REPEAT_TIME) \
CFG(CFG_ADAPTIVE_SCAN_DWELL_MODE) \

View file

@ -879,6 +879,10 @@ wlan_scan_global_init(struct wlan_objmgr_psoc *psoc,
cfg_get(psoc, CFG_ACTIVE_MAX_6G_CHANNEL_TIME);
scan_obj->scan_def.passive_dwell_6g =
cfg_get(psoc, CFG_PASSIVE_MAX_6G_CHANNEL_TIME);
scan_obj->scan_def.active_dwell_time_6g_conc =
cfg_get(psoc, CFG_ACTIVE_MAX_6G_CHANNEL_TIME_CONC);
scan_obj->scan_def.passive_dwell_time_6g_conc =
cfg_get(psoc, CFG_PASSIVE_MAX_6G_CHANNEL_TIME_CONC);
scan_obj->scan_def.passive_dwell =
cfg_get(psoc, CFG_PASSIVE_MAX_CHANNEL_TIME);
scan_obj->scan_def.max_rest_time = SCAN_MAX_REST_TIME;