Skip to content

Commit

Permalink
ath10k: allow dynamic SAR power limits via common API
Browse files Browse the repository at this point in the history 
ath10k assigns ath10k_mac_set_sar_specs to ath10k_ops, and
this function is called when user space application calls
NL80211_CMD_SET_SAR_SPECS. ath10k also registers SAR type,
and supported frequency ranges to wiphy so user space can
query SAR capabilities.

ath10k_mac_set_sar_specs further sets the power to firmware
to limit the TX power.

This feature is controlled by hw parameter: dynamic_sar_support.

Signed-off-by: Carl Huang <cjhuang@codeaurora.org>
  • Loading branch information
@intel-lab-lkp
Carl Huang authored and intel-lab-lkp committed Sep 22, 2020
1 parent 5043c59 commit 194580a
Show file tree
Hide file tree
Showing 4 changed files with 127 additions and 0 deletions.
16 changes: 16 additions & 0 deletions drivers/net/wireless/ath/ath10k/core.c
View file
Expand Up @@ -90,6 +90,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.hw_filter_reset_required = true,
.fw_diag_ce_download = false,
.tx_stats_over_pktlog = true,
.dynamic_sar_support = false,
},
{
.id = QCA988X_HW_2_0_VERSION,
Expand Down Expand Up @@ -124,6 +125,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.hw_filter_reset_required = true,
.fw_diag_ce_download = false,
.tx_stats_over_pktlog = true,
.dynamic_sar_support = false,
},
{
.id = QCA9887_HW_1_0_VERSION,
Expand Down Expand Up @@ -159,6 +161,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.hw_filter_reset_required = true,
.fw_diag_ce_download = false,
.tx_stats_over_pktlog = false,
.dynamic_sar_support = false,
},
{
.id = QCA6174_HW_3_2_VERSION,
Expand Down Expand Up @@ -189,6 +192,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.tx_stats_over_pktlog = false,
.bmi_large_size_download = true,
.supports_peer_stats_info = true,
.dynamic_sar_support = true,
},
{
.id = QCA6174_HW_2_1_VERSION,
Expand Down Expand Up @@ -223,6 +227,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.hw_filter_reset_required = true,
.fw_diag_ce_download = false,
.tx_stats_over_pktlog = false,
.dynamic_sar_support = false,
},
{
.id = QCA6174_HW_2_1_VERSION,
Expand Down Expand Up @@ -257,6 +262,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.hw_filter_reset_required = true,
.fw_diag_ce_download = false,
.tx_stats_over_pktlog = false,
.dynamic_sar_support = false,
},
{
.id = QCA6174_HW_3_0_VERSION,
Expand Down Expand Up @@ -291,6 +297,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.hw_filter_reset_required = true,
.fw_diag_ce_download = false,
.tx_stats_over_pktlog = false,
.dynamic_sar_support = false,
},
{
.id = QCA6174_HW_3_2_VERSION,
Expand Down Expand Up @@ -329,6 +336,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.fw_diag_ce_download = true,
.tx_stats_over_pktlog = false,
.supports_peer_stats_info = true,
.dynamic_sar_support = true,
},
{
.id = QCA99X0_HW_2_0_DEV_VERSION,
Expand Down Expand Up @@ -369,6 +377,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.hw_filter_reset_required = true,
.fw_diag_ce_download = false,
.tx_stats_over_pktlog = false,
.dynamic_sar_support = false,
},
{
.id = QCA9984_HW_1_0_DEV_VERSION,
Expand Down Expand Up @@ -416,6 +425,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.hw_filter_reset_required = true,
.fw_diag_ce_download = false,
.tx_stats_over_pktlog = false,
.dynamic_sar_support = false,
},
{
.id = QCA9888_HW_2_0_DEV_VERSION,
Expand Down Expand Up @@ -460,6 +470,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.hw_filter_reset_required = true,
.fw_diag_ce_download = false,
.tx_stats_over_pktlog = false,
.dynamic_sar_support = false,
},
{
.id = QCA9377_HW_1_0_DEV_VERSION,
Expand Down Expand Up @@ -494,6 +505,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.hw_filter_reset_required = true,
.fw_diag_ce_download = false,
.tx_stats_over_pktlog = false,
.dynamic_sar_support = false,
},
{
.id = QCA9377_HW_1_1_DEV_VERSION,
Expand Down Expand Up @@ -530,6 +542,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.hw_filter_reset_required = true,
.fw_diag_ce_download = true,
.tx_stats_over_pktlog = false,
.dynamic_sar_support = false,
},
{
.id = QCA9377_HW_1_1_DEV_VERSION,
Expand Down Expand Up @@ -557,6 +570,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.ast_skid_limit = 0x10,
.num_wds_entries = 0x20,
.uart_pin_workaround = true,
.dynamic_sar_support = false,
},
{
.id = QCA4019_HW_1_0_DEV_VERSION,
Expand Down Expand Up @@ -598,6 +612,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.hw_filter_reset_required = true,
.fw_diag_ce_download = false,
.tx_stats_over_pktlog = false,
.dynamic_sar_support = false,
},
{
.id = WCN3990_HW_1_0_DEV_VERSION,
Expand Down Expand Up @@ -625,6 +640,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.hw_filter_reset_required = false,
.fw_diag_ce_download = false,
.tx_stats_over_pktlog = false,
.dynamic_sar_support = true,
},
};

Expand Down
3 changes: 3 additions & 0 deletions drivers/net/wireless/ath/ath10k/core.h
View file
Expand Up @@ -1281,6 +1281,9 @@ struct ath10k {
bool coex_support;
int coex_gpio_pin;

u32 tx_power_2g_limit;
u32 tx_power_5g_limit;

/* must be last */
u8 drv_priv[] __aligned(sizeof(void *));
};
Expand Down
2 changes: 2 additions & 0 deletions drivers/net/wireless/ath/ath10k/hw.h
View file
Expand Up @@ -623,6 +623,8 @@ struct ath10k_hw_params {

/* provides bitrates for sta_statistics using WMI_TLV_PEER_STATS_INFO_EVENTID */
bool supports_peer_stats_info;

bool dynamic_sar_support;
};

struct htt_rx_desc;
Expand Down
106 changes: 106 additions & 0 deletions drivers/net/wireless/ath/ath10k/mac.c
View file
Expand Up @@ -81,6 +81,17 @@ static struct ieee80211_rate ath10k_rates_rev2[] = {
{ .bitrate = 540, .hw_value = ATH10K_HW_RATE_OFDM_54M },
};

static const struct cfg80211_sar_freq_ranges ath10k_sar_freq_ranges[] = {
{ .index = 0, .start_freq = 2412000, .end_freq = 2484000 },
{ .index = 1, .start_freq = 2484000, .end_freq = 5865000 },
};

static const struct cfg80211_sar_capa ath10k_sar_capa = {
.type = NL80211_SAR_TYPE_POWER,
.num_freq_ranges = (ARRAY_SIZE(ath10k_sar_freq_ranges)),
.freq_ranges = &ath10k_sar_freq_ranges[0],
};

#define ATH10K_MAC_FIRST_OFDM_RATE_IDX 4

#define ath10k_a_rates (ath10k_rates + ATH10K_MAC_FIRST_OFDM_RATE_IDX)
Expand Down Expand Up @@ -2880,6 +2891,95 @@ static int ath10k_mac_vif_recalc_txbf(struct ath10k *ar,
return 0;
}

static bool ath10k_mac_is_connected(struct ath10k *ar)
{
struct ath10k_vif *arvif;

list_for_each_entry(arvif, &ar->arvifs, list) {
if (arvif->is_up && arvif->vdev_type == WMI_VDEV_TYPE_STA)
return true;
}

return false;
}

int ath10k_mac_set_sar_power(struct ath10k *ar)
{
int ret;

if (!ar->hw_params.dynamic_sar_support)
return 0;

if (ar->tx_power_2g_limit == 0 || ar->tx_power_5g_limit == 0)
return 0;

if (!ath10k_mac_is_connected(ar))
return 0;

ret = ath10k_wmi_pdev_set_param(ar,
ar->wmi.pdev_param->txpower_limit2g,
ar->tx_power_2g_limit);
if (ret) {
ath10k_warn(ar, "failed to set 2.4G txpower %d: %d\n",
ar->tx_power_2g_limit, ret);
return ret;
}

ret = ath10k_wmi_pdev_set_param(ar,
ar->wmi.pdev_param->txpower_limit5g,
ar->tx_power_5g_limit);
if (ret) {
ath10k_warn(ar, "failed to set 5G txpower %d: %d\n",
ar->tx_power_5g_limit, ret);
return ret;
}

ath10k_dbg(ar, ATH10K_DBG_MAC, "set txpower 2G:%d, 5G:%d successfully\n",
ar->tx_power_2g_limit, ar->tx_power_5g_limit);

return ret;
}

static int ath10k_mac_set_sar_specs(struct ieee80211_hw *hw,
const struct cfg80211_sar_specs *sar)
{
struct cfg80211_sar_sub_specs *sub_specs;
struct ath10k *ar = hw->priv;
int i;

if (!ar->hw_params.dynamic_sar_support)
return -EOPNOTSUPP;

if (!sar || sar->type != NL80211_SAR_TYPE_POWER ||
sar->num_sub_specs == 0 || !sar->sub_specs)
return -EINVAL;

sub_specs = sar->sub_specs;

/* note the power is in 0.25dbm unit, while ath10k uses
* 0.5dbm unit.
*/
for (i = 0; i < sar->num_sub_specs; i++) {
if (sub_specs->freq_range_index == NL80211_SAR_ALL_FREQ_RNAGES) {
ar->tx_power_2g_limit = sub_specs->power / 2;
ar->tx_power_5g_limit = sub_specs->power / 2;
goto set_power;
}

if (sub_specs->freq_range_index == 0)
ar->tx_power_2g_limit = sub_specs->power / 2;
else if (sub_specs->freq_range_index == 1)
ar->tx_power_5g_limit = sub_specs->power / 2;
else
return -EINVAL;

sub_specs++;
}

set_power:
return ath10k_mac_set_sar_power(ar);
}

/* can be called only in mac80211 callbacks due to `key_count` usage */
static void ath10k_bss_assoc(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
Expand Down Expand Up @@ -2968,6 +3068,8 @@ static void ath10k_bss_assoc(struct ieee80211_hw *hw,

arvif->is_up = true;

ath10k_mac_set_sar_power(ar);

/* Workaround: Some firmware revisions (tested with qca6174
* WLAN.RM.2.0-00073) have buggy powersave state machine and must be
* poked with peer param command.
Expand Down Expand Up @@ -9270,6 +9372,7 @@ static const struct ieee80211_ops ath10k_ops = {
#ifdef CONFIG_MAC80211_DEBUGFS
.sta_add_debugfs = ath10k_sta_add_debugfs,
#endif
.set_sar_specs = ath10k_mac_set_sar_specs,
};

#define CHAN2G(_channel, _freq, _flags) { \
Expand Down Expand Up @@ -10009,6 +10112,9 @@ int ath10k_mac_register(struct ath10k *ar)
goto err_free;
}

if (ar->hw_params.dynamic_sar_support)
ar->hw->wiphy->sar_capa = &ath10k_sar_capa;

if (!test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags))
ar->hw->netdev_features = NETIF_F_HW_CSUM;

Expand Down

0 comments on commit 194580a

Please sign in to comment.