A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-24 21:54:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "qcacld-3.0: Do not allow SAP SCC on non-PSC/non-VLP channels" into wlan-cld3.driver.lnx.2.0.8.r3-rel

Browse source
This commit is contained in:
Linux Build Service Account 2023-10-10 05:39:22 -07:00 • committed by Gerrit - the friendly Code Review server
commit 99288f7380
1 changed files with 105 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

105
components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c
View file

@ -36,6 +36,7 @@
#include "wlan_mlme_ucfg_api.h"
#include "csr_neighbor_roam.h"
#include "wlan_scan_api.h"
#include <wlan_reg_ucfg_api.h>
/**
* first_connection_pcl_table - table which provides PCL for the
@ -733,6 +734,96 @@ policy_mgr_modify_pcl_based_on_indoor(struct wlan_objmgr_psoc *psoc,
return QDF_STATUS_SUCCESS;
}
/**
* policy_mgr_modify_sap_pcl_for_6G_channels() - filter out the
* 6GHz channels where SCC is not supported.
* @psoc: pointer to soc
* @pcl_list_org: channel list to filter out
* @weight_list_org: weight of channel list
* @pcl_len_org: length of channel list
*
* Return: QDF_STATUS
*/
static QDF_STATUS
policy_mgr_modify_sap_pcl_for_6G_channels(struct wlan_objmgr_psoc *psoc,
uint32_t *pcl_list_org,
uint8_t *weight_list_org,
uint32_t *pcl_len_org)
{
struct policy_mgr_psoc_priv_obj *pm_ctx;
uint32_t pcl_list[NUM_CHANNELS];
uint8_t weight_list[NUM_CHANNELS];
uint32_t vdev_id = 0, pcl_len = 0, i;
struct wlan_objmgr_vdev *vdev;
qdf_freq_t sta_gc_freq = 0;
uint32_t ap_pwr_type_6g = 0;
pm_ctx = policy_mgr_get_context(psoc);
if (!pm_ctx) {
policy_mgr_err("Invalid Context");
return QDF_STATUS_E_FAILURE;
}
if (*pcl_len_org > NUM_CHANNELS) {
policy_mgr_err("Invalid PCL List Length %d", *pcl_len_org);
return QDF_STATUS_E_FAILURE;
}
if (policy_mgr_mode_specific_connection_count(psoc,
PM_STA_MODE, NULL)) {
sta_gc_freq =
policy_mgr_mode_specific_get_channel(psoc, PM_STA_MODE);
vdev_id = policy_mgr_mode_specific_vdev_id(psoc, PM_STA_MODE);
} else if (policy_mgr_mode_specific_connection_count(psoc,
PM_P2P_CLIENT_MODE,
NULL)) {
sta_gc_freq = policy_mgr_mode_specific_get_channel(
psoc, PM_P2P_CLIENT_MODE);
vdev_id = policy_mgr_mode_specific_vdev_id(psoc,
PM_P2P_CLIENT_MODE);
}
if (!sta_gc_freq || !WLAN_REG_IS_6GHZ_CHAN_FREQ(sta_gc_freq))
return QDF_STATUS_SUCCESS;
vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc, vdev_id,
WLAN_POLICY_MGR_ID);
if (!vdev) {
policy_mgr_err("vdev %d is not present", vdev_id);
return QDF_STATUS_E_FAILURE;
}
/* If STA is present in 6GHz, STA+SAP SCC is allowed
* only on PSC channels in VLP mode. Therefore, remove
* all other 6GHz channels from the PCL list.
*
* VLP STA in PSC + SAP - Allowed
* VLP STA in non-PSC + SAP - Not allowed
* non-VLP STA + SAP - Not allowed
*/
ucfg_reg_get_cur_6g_ap_pwr_type(pm_ctx->pdev, &ap_pwr_type_6g);
policy_mgr_debug("STA power type : %d", ap_pwr_type_6g);
for (i = 0; i < *pcl_len_org; i++) {
if (WLAN_REG_IS_6GHZ_CHAN_FREQ(pcl_list_org[i])) {
if (ap_pwr_type_6g != REG_VERY_LOW_POWER_AP)
continue;
else if (!WLAN_REG_IS_6GHZ_PSC_CHAN_FREQ(pcl_list_org[i]))
continue;
}
pcl_list[pcl_len] = pcl_list_org[i];
weight_list[pcl_len++] = weight_list_org[i];
}
qdf_mem_zero(pcl_list_org, *pcl_len_org * sizeof(*pcl_list_org));
qdf_mem_zero(weight_list_org, *pcl_len_org * sizeof(*weight_list_org));
qdf_mem_copy(pcl_list_org, pcl_list, pcl_len * sizeof(*pcl_list_org));
qdf_mem_copy(weight_list_org, weight_list, pcl_len);
*pcl_len_org = pcl_len;
wlan_objmgr_vdev_release_ref(vdev, WLAN_POLICY_MGR_ID);
return QDF_STATUS_SUCCESS;
}
static QDF_STATUS policy_mgr_pcl_modification_for_sap(
struct wlan_objmgr_psoc *psoc,
uint32_t *pcl_channels, uint8_t *pcl_weight,
@ -793,6 +884,14 @@ static QDF_STATUS policy_mgr_pcl_modification_for_sap(
}
indoor_modified_pcl = true;
status = policy_mgr_modify_sap_pcl_for_6G_channels(psoc,
pcl_channels,
pcl_weight, len);
if (QDF_IS_STATUS_ERROR(status)) {
policy_mgr_err("failed to modify pcl for 6G channels");
return status;
}
modified_final_pcl = true;
policy_mgr_debug(" %d %d %d %d %d",
mandatory_modified_pcl,
@ -1031,6 +1130,8 @@ QDF_STATUS policy_mgr_get_pcl(struct wlan_objmgr_psoc *psoc,
policy_mgr_dump_channel_list(*len, pcl_channels, pcl_weight);
policy_mgr_debug("PCL before modification");
policy_mgr_dump_channel_list(*len, pcl_channels, pcl_weight);
policy_mgr_mode_specific_modification_on_pcl(
psoc, pcl_channels, pcl_weight, len, mode);
@ -1041,6 +1142,10 @@ QDF_STATUS policy_mgr_get_pcl(struct wlan_objmgr_psoc *psoc,
policy_mgr_err("failed to get modified pcl based on DNBS");
return status;
}
policy_mgr_debug("PCL after modification");
policy_mgr_dump_channel_list(*len, pcl_channels, pcl_weight);
return QDF_STATUS_SUCCESS;
}