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

qcacld-3.0: Fix the GI setting using NL command

Browse Source 
Fix the GI setting configuration using NL command.

Change-Id: Icd4e91eec761983bc787ecbe2660b7da543ca922
CRs-Fixed: 3095862
This commit is contained in:
Kiran Kumar Lokere
2021-11-22 23:28:10 -08:00
parent 981de1f500
commit 09486a70ad
1 changed files with 61 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
core/hdd/src/wlan_hdd_cfg80211.c
View File

@@ -1,6 +1,6 @@
/* /*
* Copyright (c) 2012-2021 The Linux Foundation. All rights reserved. * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
* *
* Permission to use, copy, modify, and/or distribute this software for * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * any purpose with or without fee is hereby granted, provided that the
@@ -23178,7 +23178,10 @@ static int __wlan_hdd_cfg80211_set_bitrate_mask(struct wiphy *wiphy,
uint8_t rate_index; uint8_t rate_index;
struct hdd_context *hdd_ctx = wiphy_priv(wiphy); struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
uint8_t vdev_id; uint8_t vdev_id;
bool is_bitmask_configured = false; uint8_t gi_val;
#if (LINUX_VERSION_CODE > KERNEL_VERSION(5, 4, 0))
uint8_t auto_rate_he_gi = 0;
#endif
if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam() || if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam() ||
QDF_GLOBAL_MONITOR_MODE == hdd_get_conparam()) { QDF_GLOBAL_MONITOR_MODE == hdd_get_conparam()) {
@@ -23199,15 +23202,15 @@ static int __wlan_hdd_cfg80211_set_bitrate_mask(struct wiphy *wiphy,
for (band = NL80211_BAND_2GHZ; band <= NL80211_BAND_5GHZ; band++) { for (band = NL80211_BAND_2GHZ; band <= NL80211_BAND_5GHZ; band++) {
/* Support configuring only one bitrate */ /* Support configuring only one bitrate */
if (!hdd_check_bitmask_for_single_rate(band, mask)) { if (!hdd_check_bitmask_for_single_rate(band, mask)) {
hdd_err_rl("Multiple bitrate set not supported for band %u", hdd_err("Multiple bitrate set not supported for band %u",
band); band);
errno = -EINVAL; errno = -EINVAL;
continue; continue;
} }
if (!hweight32(mask->control[band].legacy)) { if (!hweight32(mask->control[band].legacy)) {
hdd_err_rl("Legacy bit rate setting not supported for band %u", hdd_err("Legacy bit rate setting not supported for band %u",
band); band);
errno = -EINVAL; errno = -EINVAL;
continue; continue;
} }
@@ -23241,49 +23244,71 @@ static int __wlan_hdd_cfg80211_set_bitrate_mask(struct wiphy *wiphy,
} }
configure_fw: configure_fw:
if (bit_rate != -1) {
hdd_debug("WMI_VDEV_PARAM_FIXED_RATE val %d", bit_rate);
if (bit_rate == -1) { errno = wma_cli_set_command(adapter->vdev_id,
errno = -EINVAL; WMI_VDEV_PARAM_FIXED_RATE,
continue; bit_rate, VDEV_CMD);
if (errno)
hdd_err("Failed to set firmware, errno %d",
errno);
} }
hdd_debug("WMI_VDEV_PARAM_FIXED_RATE val %d", bit_rate);
errno = wma_cli_set_command(adapter->vdev_id, #if (LINUX_VERSION_CODE > KERNEL_VERSION(5, 4, 0))
WMI_VDEV_PARAM_FIXED_RATE, if (NL80211_RATE_INFO_HE_GI_0_8 == mask->control[band].he_gi) {
bit_rate, VDEV_CMD); auto_rate_he_gi = AUTO_RATE_GI_800NS;
gi_val = 1;
if (errno) { } else if (NL80211_RATE_INFO_HE_GI_1_6 ==
hdd_err_rl("Failed to set firmware, errno %d", errno); mask->control[band].he_gi) {
continue; auto_rate_he_gi = AUTO_RATE_GI_1600NS;
gi_val = 2;
} else if (NL80211_RATE_INFO_HE_GI_3_2 ==
mask->control[band].he_gi) {
auto_rate_he_gi = AUTO_RATE_GI_3200NS;
gi_val = 3;
} }
if (auto_rate_he_gi) {
errno = sme_set_auto_rate_he_sgi(hdd_ctx->mac_handle,
adapter->vdev_id,
auto_rate_he_gi);
if (errno)
hdd_err("auto rate GI %d set fail, status %d",
auto_rate_he_gi, errno);
if (mask->control[band].gi) { errno = sme_update_ht_config(
if (mask->control[band].gi & HDD_AUTO_RATE_SGI)
errno = sme_set_auto_rate_he_sgi(
hdd_ctx->mac_handle,
adapter->vdev_id,
mask->control[band].gi);
else
errno = sme_update_ht_config(
hdd_ctx->mac_handle, hdd_ctx->mac_handle,
adapter->vdev_id, adapter->vdev_id,
WNI_CFG_HT_CAP_INFO_SHORT_GI_20MHZ, WNI_CFG_HT_CAP_INFO_SHORT_GI_20MHZ,
mask->control[band].gi); gi_val);
if (errno) { if (errno) {
hdd_err("cfg set failed, value %d status %d", hdd_err("cfg set failed, value %d status %d",
mask->control[band].gi, errno); gi_val, errno);
continue;
} }
} else
#endif
if (mask->control[band].gi) {
if (NL80211_TXRATE_FORCE_SGI == mask->control[band].gi)
gi_val = 0;
else
gi_val = 1;
errno = sme_update_ht_config(
hdd_ctx->mac_handle,
adapter->vdev_id,
WNI_CFG_HT_CAP_INFO_SHORT_GI_20MHZ,
gi_val);
if (errno)
hdd_err("cfg set failed, value %d status %d",
mask->control[band].gi, errno);
} }
is_bitmask_configured = true;
} }
if (is_bitmask_configured) return errno;
return 0;
else
return errno;
} }
static int wlan_hdd_cfg80211_set_bitrate_mask(struct wiphy *wiphy, static int wlan_hdd_cfg80211_set_bitrate_mask(struct wiphy *wiphy,
@@ -23295,8 +23320,10 @@ static int wlan_hdd_cfg80211_set_bitrate_mask(struct wiphy *wiphy,
struct osif_vdev_sync *vdev_sync; struct osif_vdev_sync *vdev_sync;
errno = osif_vdev_sync_op_start(netdev, &vdev_sync); errno = osif_vdev_sync_op_start(netdev, &vdev_sync);
if (errno) if (errno) {
hdd_err("vdev_sync_op_start failure");
return errno; return errno;
}
errno = __wlan_hdd_cfg80211_set_bitrate_mask(wiphy, netdev, peer, errno = __wlan_hdd_cfg80211_set_bitrate_mask(wiphy, netdev, peer,
mask); mask);