samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Update ACS channel list with PCL

Browse Source 
Current ACS logic sometimes selects MCC channel based on its
algo for SAP / GO which results in SAP / GO bring-up failures.
This issue is seen in below concurrency combinations:
1. SAP + SAP
2. SAP + P2P-GO
3. SAP + SAP + SAP
4. SAP + SAP + P2P-GO

So with this change driver restricts ACS scan to intersection of
PCL and ACS channel list.
This implementation will take care of existing STA + SAP case as well,
as PCL will have channels according to 1st connection being STA.

Change-Id: Ic715fb29533c20b63cffda8a82b7317904f0d291
CRs-Fixed: 2407289
This commit is contained in:
Rachit Kankane
2019-03-07 11:34:44 +05:30
committed by nshrivas
parent 239883a43c
commit def2b174a2
4 changed files with 69 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h
View File

@@ -2673,15 +2673,18 @@ bool policy_mgr_is_sta_sap_scc_allowed_on_dfs_chan(
bool policy_mgr_is_sta_connected_2g(struct wlan_objmgr_psoc *psoc);
/**
* policy_mgr_trim_acs_channel_list() - Trim the ACS channel list based
* on the number of active station connections
* policy_mgr_trim_acs_channel_list() - Trims ACS channel list with
* intersection of PCL
* @pcl: preferred channel list
* @pcl_count: Preferred channel list count
* @org_ch_list: ACS channel list from user space
* @org_ch_list_count: ACS channel count from user space
*
* Return: None
*/
void policy_mgr_trim_acs_channel_list(struct wlan_objmgr_psoc *psoc,
uint8_t *org_ch_list, uint8_t *org_ch_list_count);
void policy_mgr_trim_acs_channel_list(uint8_t *pcl, uint8_t pcl_count,
uint8_t *org_ch_list,
uint8_t *org_ch_list_count);
/**
* policy_mgr_is_hwmode_set_for_given_chnl() - to check for given channel

90
components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c
View File

@@ -3302,93 +3302,27 @@ bool policy_mgr_is_sta_connected_2g(struct wlan_objmgr_psoc *psoc)
return ret;
}
void policy_mgr_trim_acs_channel_list(struct wlan_objmgr_psoc *psoc,
uint8_t *org_ch_list, uint8_t *org_ch_list_count)
void policy_mgr_trim_acs_channel_list(uint8_t *pcl, uint8_t pcl_count,
uint8_t *org_ch_list,
uint8_t *org_ch_list_count)
{
uint32_t list[MAX_NUMBER_OF_CONC_CONNECTIONS];
uint32_t index = 0, count, i, ch_list_count;
uint8_t band_mask = 0, ch_5g = 0, ch_24g = 0;
uint8_t ch_list[QDF_MAX_NUM_CHAN];
struct policy_mgr_psoc_priv_obj *pm_ctx;
pm_ctx = policy_mgr_get_context(psoc);
if (!pm_ctx) {
policy_mgr_err("Invalid Context");
return;
}
uint16_t i, j, ch_list_count = 0;
if (*org_ch_list_count >= QDF_MAX_NUM_CHAN) {
policy_mgr_err("org_ch_list_count too big %d",
*org_ch_list_count);
return;
}
/*
* if force SCC is enabled and there is a STA connection, trim the
* ACS channel list on the band on which STA connection is present
*/
count = policy_mgr_mode_specific_connection_count(
psoc, PM_STA_MODE, list);
if (!(policy_mgr_is_force_scc(psoc) && count))
return;
while (index < count) {
if (WLAN_REG_IS_24GHZ_CH(
pm_conc_connection_list[list[index]].chan) &&
policy_mgr_is_safe_channel(psoc,
pm_conc_connection_list[list[index]].chan)) {
band_mask |= 1;
ch_24g = pm_conc_connection_list[list[index]].chan;
}
if (WLAN_REG_IS_5GHZ_CH(
pm_conc_connection_list[list[index]].chan) &&
policy_mgr_is_safe_channel(psoc,
pm_conc_connection_list[list[index]].chan) &&
!wlan_reg_is_dfs_ch(pm_ctx->pdev,
pm_conc_connection_list[list[index]].chan) &&
!wlan_reg_is_passive_or_disable_ch(pm_ctx->pdev,
pm_conc_connection_list[list[index]].chan)) {
band_mask |= 2;
ch_5g = pm_conc_connection_list[list[index]].chan;
}
index++;
}
ch_list_count = 0;
if (band_mask == 1) {
ch_list[ch_list_count++] = ch_24g;
for (i = 0; i < *org_ch_list_count; i++) {
if (WLAN_REG_IS_24GHZ_CH(
org_ch_list[i]))
continue;
ch_list[ch_list_count++] =
org_ch_list[i];
}
} else if (band_mask == 2) {
if ((wlan_reg_get_channel_state(pm_ctx->pdev, ch_5g) ==
CHANNEL_STATE_DFS) &&
policy_mgr_is_sta_sap_scc_allowed_on_dfs_chan(psoc))
ch_list[ch_list_count++] = ch_5g;
else if (!(wlan_reg_get_channel_state(pm_ctx->pdev, ch_5g) ==
CHANNEL_STATE_DFS))
ch_list[ch_list_count++] = ch_5g;
for (i = 0; i < *org_ch_list_count; i++) {
if (WLAN_REG_IS_5GHZ_CH(
org_ch_list[i]))
continue;
ch_list[ch_list_count++] =
org_ch_list[i];
}
} else if (band_mask == 3) {
ch_list[ch_list_count++] = ch_24g;
ch_list[ch_list_count++] = ch_5g;
} else {
policy_mgr_debug("unexpected band_mask value %d",
band_mask);
return;
}
policy_mgr_debug("Update ACS channels with PCL");
for (j = 0; j < *org_ch_list_count; j++)
for (i = 0; i < pcl_count; i++)
if (pcl[i] == org_ch_list[j]) {
org_ch_list[ch_list_count++] = pcl[i];
break;
}
*org_ch_list_count = ch_list_count;
for (i = 0; i < *org_ch_list_count; i++)
org_ch_list[i] = ch_list[i];
}
uint32_t policy_mgr_get_connection_info(struct wlan_objmgr_psoc *psoc,

4
components/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_2x2_dbs_i.h
View File

@@ -902,7 +902,7 @@ pm_third_connection_pcl_dbs_2x2_table = {
[PM_STA_MODE] = {
PM_24G_SCC_CH_SBS_CH_5G, PM_24G_SCC_CH,
PM_24G_SCC_CH_SBS_CH},
[PM_SAP_MODE] = {PM_5G, PM_5G, PM_5G},
[PM_SAP_MODE] = {PM_24G, PM_24G, PM_24G},
[PM_P2P_CLIENT_MODE] = {
PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE},
[PM_P2P_GO_MODE] = {
@@ -917,7 +917,7 @@ pm_third_connection_pcl_dbs_2x2_table = {
[PM_STA_MODE] = {
PM_24G_SCC_CH_SBS_CH_5G, PM_24G_SCC_CH,
PM_24G_SCC_CH_SBS_CH},
[PM_SAP_MODE] = {PM_5G, PM_5G, PM_5G},
[PM_SAP_MODE] = {PM_24G, PM_24G, PM_24G},
[PM_P2P_CLIENT_MODE] = {
PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE},
[PM_P2P_GO_MODE] = {