samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Forka 0
Codice Problemi Pull Requests Actions Pacchetti Progetti Rilasci Wiki Attività

qcacld-3.0: Add radio combination matrix vendor command support

Sfoglia il codice sorgente 
Create radio combination matrix list from target mac phy information.
Return the supported radio matrix to apps by vendor command
QCA_NL80211_VENDOR_SUBCMD_GET_RADIO_COMBINATION_MATRIX.

Change-Id: I9732eadf10e8634336dbdac21e10f60e81cbaca6
CRs-Fixed: 3214050
This commit is contained in:
Liangwei Dong
2022-05-17 10:18:33 +08:00
committato da Madan Koyyalamudi
parent db79080a21
commit d6e9616054
7 ha cambiato i file con 445 aggiunte e 1 eliminazioni
Scarica il file Patch Scarica il file Diff Expand all files Collapse all files

16
components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h
Vedi File

@@ -4249,6 +4249,22 @@ QDF_STATUS policy_mgr_check_mon_concurrency(struct wlan_objmgr_psoc *psoc);
void policy_mgr_get_hw_dbs_max_bw(struct wlan_objmgr_psoc *psoc,
struct dbs_bw *bw_dbs);
/**
* policy_mgr_get_radio_combinations() - Query the supported radio combinations
* @psoc: soc object
* @comb: combination buffer
* @comb_max: max combination number can be saved to comb buffer
* @comb_num: returned combination number
*
* This function returns the radio combination information supported by target.
*
* Return: QDF_STATUS_SUCCESS if query successfully
*/
QDF_STATUS policy_mgr_get_radio_combinations(struct wlan_objmgr_psoc *psoc,
struct radio_combination *comb,
uint32_t comb_max,
uint32_t *comb_num);
#ifdef WLAN_FEATURE_11BE_MLO
/**
* policy_mgr_is_mlo_sap_concurrency_allowed() - Check for mlo sap allowed

17
components/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h
Vedi File

@@ -1560,6 +1560,23 @@ struct dbs_nss {
uint32_t single_mac0_band_cap;
};
/**
* Max radio combination numbers
*/
#define MAX_RADIO_COMBINATION 16
/**
* struct radio_combination - Radio combination
* @hw_mode: hw mode type
* @band_mask: band support type for each mac
* @antenna: antenna support for each mac
*/
struct radio_combination {
enum policy_mgr_mode hw_mode;
uint8_t band_mask[MAX_MAC];
uint8_t antenna[MAX_MAC];
};
/**
* struct connection_info - connection information
* @mac_id: The HW mac it is running

21
components/cmn_services/policy_mgr/inc/wlan_policy_mgr_ucfg.h
Vedi File

@@ -21,7 +21,7 @@
#include "wlan_objmgr_psoc_obj.h"
#include "wlan_objmgr_global_obj.h"
#include "qdf_status.h"
#include "wlan_policy_mgr_public_struct.h"
/**
* ucfg_policy_mgr_psoc_open() - This API sets CFGs to policy manager context
@@ -62,6 +62,25 @@ QDF_STATUS ucfg_policy_mgr_get_mcc_scc_switch(struct wlan_objmgr_psoc *psoc,
return QDF_STATUS_SUCCESS;
}
#endif //FEATURE_WLAN_MCC_TO_SCC_SWITCH
/**
* ucfg_policy_mgr_get_radio_combinations() - Query the supported radio
* combinations
* @psoc: soc object
* @comb: combination buffer
* @comb_max: max combination number can be saved to comb buffer
* @comb_num: returned combination number
*
* This function returns the radio combination information supported by target.
*
* Return: QDF_STATUS_SUCCESS if query successfully
*/
QDF_STATUS
ucfg_policy_mgr_get_radio_combinations(struct wlan_objmgr_psoc *psoc,
struct radio_combination *comb,
uint32_t comb_max,
uint32_t *comb_num);
/**
* ucfg_policy_mgr_get_sys_pref() - to get system preference
* @psoc: pointer to psoc

214
components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c
Vedi File

@@ -669,6 +669,8 @@ static void policy_mgr_get_hw_mode_params(
struct wlan_psoc_host_mac_phy_caps *caps,
struct policy_mgr_mac_ss_bw_info *info)
{
qdf_freq_t max_5g_freq;
if (!caps) {
policy_mgr_err("Invalid capabilities");
return;
@@ -684,6 +686,17 @@ static void policy_mgr_get_hw_mode_params(
QDF_MAX(caps->max_bw_supported_2G,
caps->max_bw_supported_5G));
info->mac_band_cap = caps->supported_bands;
if (caps->supported_bands & WMI_HOST_WLAN_5G_CAPABILITY) {
max_5g_freq = wlan_reg_max_6ghz_chan_freq() ?
wlan_reg_max_6ghz_chan_freq() :
wlan_reg_max_5ghz_chan_freq();
max_5g_freq = caps->reg_cap_ext.high_5ghz_chan ?
QDF_MIN(caps->reg_cap_ext.high_5ghz_chan,
max_5g_freq) : max_5g_freq;
info->support_6ghz_band =
max_5g_freq > wlan_reg_min_6ghz_chan_freq();
}
}
/**
@@ -758,6 +771,200 @@ static void policy_mgr_set_hw_mode_params(struct wlan_objmgr_psoc *psoc,
legacy_hwmode_lst, emlsr_mode);
}
QDF_STATUS policy_mgr_get_radio_combinations(struct wlan_objmgr_psoc *psoc,
struct radio_combination *comb,
uint32_t comb_max,
uint32_t *comb_num)
{
struct policy_mgr_psoc_priv_obj *pm_ctx;
struct radio_combination *radio_comb;
uint32_t i;
bool dbs_or_sbs_enabled = false;
pm_ctx = policy_mgr_get_context(psoc);
if (!pm_ctx) {
policy_mgr_err("Invalid Context");
return QDF_STATUS_E_FAILURE;
}
*comb_num = 0;
if (policy_mgr_is_hw_dbs_capable(psoc) ||
policy_mgr_is_hw_sbs_capable(psoc))
dbs_or_sbs_enabled = true;
for (i = 0; i < pm_ctx->radio_comb_num; i++) {
radio_comb = &pm_ctx->radio_combinations[i];
if (!dbs_or_sbs_enabled && radio_comb->hw_mode != MODE_SMM)
continue;
if (*comb_num >= comb_max) {
policy_mgr_err("out of buffer %d max %d",
pm_ctx->radio_comb_num,
comb_max);
return QDF_STATUS_E_FAILURE;
}
policy_mgr_debug("radio %d: mode %d mac0 (0x%x, 0x%x), mac1 (0x%x 0x%x)",
*comb_num,
radio_comb->hw_mode,
radio_comb->band_mask[0],
radio_comb->antenna[0],
radio_comb->band_mask[1],
radio_comb->antenna[1]);
qdf_mem_copy(&comb[*comb_num], radio_comb,
sizeof(*radio_comb));
(*comb_num)++;
}
return QDF_STATUS_SUCCESS;
}
/**
* policy_mgr_add_radio_comb() - Add radio combination
* @pm_ctx: bandwidth in terms of wmi_channel_width
* @radio: radio combination
*
* This function adds one radio combination to list
*
* Return: void
*/
static void policy_mgr_add_radio_comb(struct policy_mgr_psoc_priv_obj *pm_ctx,
struct radio_combination *radio)
{
uint32_t i;
struct radio_combination *comb;
/* don't add duplicated item */
for (i = 0; i < pm_ctx->radio_comb_num; i++) {
comb = &pm_ctx->radio_combinations[i];
if (radio->hw_mode == comb->hw_mode &&
radio->band_mask[0] == comb->band_mask[0] &&
radio->band_mask[1] == comb->band_mask[1] &&
radio->antenna[0] == comb->antenna[0] &&
radio->antenna[1] == comb->antenna[1])
return;
}
if (pm_ctx->radio_comb_num == MAX_RADIO_COMBINATION) {
policy_mgr_err("radio combination overflow %d",
pm_ctx->radio_comb_num);
return;
}
policy_mgr_debug("radio %d: mode %d mac0 (0x%x, 0x%x), mac1 (0x%x 0x%x)",
pm_ctx->radio_comb_num,
radio->hw_mode,
radio->band_mask[0],
radio->antenna[0],
radio->band_mask[1],
radio->antenna[1]);
qdf_mem_copy(&pm_ctx->radio_combinations[pm_ctx->radio_comb_num],
radio, sizeof(*radio));
pm_ctx->radio_comb_num++;
}
#define SET_RADIO(_radio, _mode, _mac0_band, _mac1_band,\
_mac0_antenna, _mac1_antenna) \
do { \
(_radio)->hw_mode = _mode; \
(_radio)->band_mask[0] = _mac0_band; \
(_radio)->band_mask[1] = _mac1_band; \
(_radio)->antenna[0] = _mac0_antenna; \
(_radio)->antenna[1] = _mac1_antenna; \
} while (0)
/**
* policy_mgr_update_radio_combination_matrix() - Update radio combination
* list
* @psoc: psoc object
* @mac0_ss_bw_info: mac 0 band/bw info
* @mac1_ss_bw_info: mac 1 band/bw info
* @dbs_mode: dbs mode
* @sbs_mode: sbs mode
*
* This function updates radio combination list based on hw mode information.
*
* Return: void
*/
static void
policy_mgr_update_radio_combination_matrix(
struct wlan_objmgr_psoc *psoc,
struct policy_mgr_mac_ss_bw_info mac0_ss_bw_info,
struct policy_mgr_mac_ss_bw_info mac1_ss_bw_info,
uint32_t dbs_mode, uint32_t sbs_mode)
{
struct policy_mgr_psoc_priv_obj *pm_ctx;
struct radio_combination radio;
pm_ctx = policy_mgr_get_context(psoc);
if (!pm_ctx) {
policy_mgr_err("Invalid Context");
return;
}
if (!dbs_mode && !sbs_mode) {
if (mac0_ss_bw_info.mac_band_cap &
WMI_HOST_WLAN_2G_CAPABILITY) {
SET_RADIO(&radio, MODE_SMM, BIT(REG_BAND_2G), 0,
mac0_ss_bw_info.mac_tx_stream, 0);
policy_mgr_add_radio_comb(pm_ctx, &radio);
}
if (mac0_ss_bw_info.mac_band_cap &
WMI_HOST_WLAN_5G_CAPABILITY) {
SET_RADIO(&radio, MODE_SMM, BIT(REG_BAND_5G), 0,
mac0_ss_bw_info.mac_tx_stream, 0);
policy_mgr_add_radio_comb(pm_ctx, &radio);
if (mac0_ss_bw_info.support_6ghz_band) {
SET_RADIO(&radio, MODE_SMM, BIT(REG_BAND_6G),
0, mac0_ss_bw_info.mac_tx_stream, 0);
policy_mgr_add_radio_comb(pm_ctx, &radio);
}
}
return;
}
if ((mac0_ss_bw_info.mac_band_cap & WMI_HOST_WLAN_2G_CAPABILITY) &&
(mac1_ss_bw_info.mac_band_cap & WMI_HOST_WLAN_5G_CAPABILITY)) {
SET_RADIO(&radio, MODE_DBS, BIT(REG_BAND_2G), BIT(REG_BAND_5G),
mac0_ss_bw_info.mac_tx_stream,
mac1_ss_bw_info.mac_tx_stream);
policy_mgr_add_radio_comb(pm_ctx, &radio);
if (mac1_ss_bw_info.support_6ghz_band) {
SET_RADIO(&radio, MODE_DBS, BIT(REG_BAND_2G),
BIT(REG_BAND_6G),
mac0_ss_bw_info.mac_tx_stream,
mac1_ss_bw_info.mac_tx_stream);
policy_mgr_add_radio_comb(pm_ctx, &radio);
}
}
if ((mac0_ss_bw_info.mac_band_cap & WMI_HOST_WLAN_5G_CAPABILITY) &&
(mac1_ss_bw_info.mac_band_cap & WMI_HOST_WLAN_2G_CAPABILITY)) {
SET_RADIO(&radio, MODE_DBS, BIT(REG_BAND_2G), BIT(REG_BAND_5G),
mac1_ss_bw_info.mac_tx_stream,
mac0_ss_bw_info.mac_tx_stream);
policy_mgr_add_radio_comb(pm_ctx, &radio);
if (mac0_ss_bw_info.support_6ghz_band) {
SET_RADIO(&radio, MODE_DBS, BIT(REG_BAND_2G),
BIT(REG_BAND_6G),
mac1_ss_bw_info.mac_tx_stream,
mac0_ss_bw_info.mac_tx_stream);
policy_mgr_add_radio_comb(pm_ctx, &radio);
}
}
if ((mac0_ss_bw_info.mac_band_cap & WMI_HOST_WLAN_5G_CAPABILITY) &&
(mac1_ss_bw_info.mac_band_cap & WMI_HOST_WLAN_5G_CAPABILITY)) {
if (mac0_ss_bw_info.support_6ghz_band) {
SET_RADIO(&radio, MODE_SBS, BIT(REG_BAND_5G),
BIT(REG_BAND_6G),
mac1_ss_bw_info.mac_tx_stream,
mac0_ss_bw_info.mac_tx_stream);
policy_mgr_add_radio_comb(pm_ctx, &radio);
} else if (mac1_ss_bw_info.support_6ghz_band) {
SET_RADIO(&radio, MODE_SBS, BIT(REG_BAND_5G),
BIT(REG_BAND_6G),
mac0_ss_bw_info.mac_tx_stream,
mac1_ss_bw_info.mac_tx_stream);
policy_mgr_add_radio_comb(pm_ctx, &radio);
}
}
}
static void
policy_mgr_update_24Ghz_freq_info(struct policy_mgr_freq_range *mac_range,
struct wlan_psoc_host_mac_phy_caps *mac_cap)
@@ -1276,6 +1483,9 @@ QDF_STATUS policy_mgr_update_hw_mode_list(struct wlan_objmgr_psoc *psoc,
pm_ctx->num_dbs_hw_modes = 0;
return QDF_STATUS_E_NOMEM;
}
pm_ctx->radio_comb_num = 0;
qdf_mem_zero(pm_ctx->radio_combinations,
sizeof(pm_ctx->radio_combinations));
policy_mgr_debug("Updated HW mode list: Num modes:%d",
pm_ctx->num_dbs_hw_modes);
@@ -1330,6 +1540,10 @@ QDF_STATUS policy_mgr_update_hw_mode_list(struct wlan_objmgr_psoc *psoc,
policy_mgr_set_hw_mode_params(psoc, mac0_ss_bw_info,
mac1_ss_bw_info, i, tmp->hw_mode_id, dbs_mode,
sbs_mode, emlsr_mode);
/* Update radio combination info */
policy_mgr_update_radio_combination_matrix(
psoc, mac0_ss_bw_info, mac1_ss_bw_info,
dbs_mode, sbs_mode);
}
/*

6
components/cmn_services/policy_mgr/src/wlan_policy_mgr_i.h
Vedi File

@@ -337,6 +337,8 @@ struct policy_mgr_cfg {
* @new_hw_mode_index: New HW mode from hw_mode table
* @dual_mac_cfg: DBS configuration currenctly used by FW for
* scan & connections
* @radio_comb_num: radio combination number
* @radio_combinations: radio combination list
* @hw_mode_change_in_progress: This is to track if HW mode
* change is in progress
* @enable_mcc_adaptive_scheduler: Enable MCC adaptive scheduler
@@ -381,6 +383,8 @@ struct policy_mgr_psoc_priv_obj {
uint32_t old_hw_mode_index;
uint32_t new_hw_mode_index;
struct dual_mac_config dual_mac_cfg;
uint32_t radio_comb_num;
struct radio_combination radio_combinations[MAX_RADIO_COMBINATION];
uint32_t hw_mode_change_in_progress;
struct policy_mgr_user_cfg user_cfg;
uint32_t unsafe_channel_list[NUM_CHANNELS];
@@ -408,12 +412,14 @@ struct policy_mgr_psoc_priv_obj {
* @mac_bw: Max bandwidth(wmi_channel_width enum type)
* @mac_band_cap: supported Band bit map(WLAN_2G_CAPABILITY = 0x1,
* WLAN_5G_CAPABILITY = 0x2)
* @support_6ghz_band: support 6 GHz band
*/
struct policy_mgr_mac_ss_bw_info {
uint32_t mac_tx_stream;
uint32_t mac_rx_stream;
uint32_t mac_bw;
uint32_t mac_band_cap;
bool support_6ghz_band;
};
#ifdef WLAN_FEATURE_11BE_MLO

10
components/cmn_services/policy_mgr/src/wlan_policy_mgr_ucfg.c
Vedi File

@@ -238,6 +238,16 @@ QDF_STATUS ucfg_policy_mgr_set_max_conc_cxns(struct wlan_objmgr_psoc *psoc,
return policy_mgr_set_max_conc_cxns(psoc, max_conc_cxns);
}
QDF_STATUS
ucfg_policy_mgr_get_radio_combinations(struct wlan_objmgr_psoc *psoc,
struct radio_combination *comb,
uint32_t comb_max,
uint32_t *comb_num)
{
return policy_mgr_get_radio_combinations(psoc, comb,
comb_max, comb_num);
}
QDF_STATUS
ucfg_policy_mgr_get_sta_sap_scc_on_dfs_chnl(struct wlan_objmgr_psoc *psoc,
uint8_t *sta_sap_scc_on_dfs_chnl)