@@ -13,6 +13,7 @@ ath10k_core-y += mac.o \
bmi.o \
hw.o \
p2p.o \
+ vendor.o \
swap.o
ath10k_core-$(CONFIG_ATH10K_SPECTRAL) += spectral.o
@@ -25,6 +25,7 @@
#include "testmode.h"
#include "wmi-ops.h"
#include "coredump.h"
+#include "vendor.h"
unsigned int ath10k_debug_mask;
EXPORT_SYMBOL(ath10k_debug_mask);
@@ -190,6 +191,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
.uart_pin_workaround = true,
.tx_stats_over_pktlog = false,
.bmi_large_size_download = true,
+ .dynamic_sar_support = true,
},
{
.id = QCA6174_HW_2_1_VERSION,
@@ -983,6 +983,8 @@ struct ath10k {
u8 ps_state_enable;
bool nlo_enabled;
+ u32 tx_power_2g_limit;
+ u32 tx_power_5g_limit;
bool p2p;
struct {
@@ -623,6 +623,9 @@ struct ath10k_hw_params {
/* tx stats support over pktlog */
bool tx_stats_over_pktlog;
+
+ /* support dynamic sar */
+ bool dynamic_sar_support;
};
struct htt_rx_desc;
@@ -24,6 +24,7 @@
#include "wmi-tlv.h"
#include "wmi-ops.h"
#include "wow.h"
+#include "vendor.h"
/*********/
/* Rates */
@@ -2843,6 +2844,65 @@ static int ath10k_mac_vif_recalc_txbf(struct ath10k *ar,
return 0;
}
+static bool ath10k_mac_get_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_limit(struct ath10k *ar)
+{
+ u32 ret, param, pwr_limit_2G, pwr_limit_5G;
+ bool connected, tx_power_valid;
+
+ if (!ar->hw_params.dynamic_sar_support)
+ return 0;
+
+ connected = ath10k_mac_get_connected(ar);
+ tx_power_valid = (ar->tx_power_2g_limit != 0 && ar->tx_power_5g_limit != 0);
+
+ ath10k_dbg(ar, ATH10K_DBG_MAC, "mac connected %d sar power valid %d\n",
+ connected, tx_power_valid);
+
+ if (!connected || !tx_power_valid)
+ return 0;
+
+ pwr_limit_2G = ar->tx_power_2g_limit;
+ pwr_limit_5G = ar->tx_power_5g_limit;
+
+ ath10k_dbg(ar, ATH10K_DBG_MAC, "mac sar limits max %d 2.4G %d 5G %d\n",
+ ar->hw_max_tx_power,
+ pwr_limit_2G,
+ pwr_limit_5G);
+
+ param = ar->wmi.pdev_param->txpower_limit2g;
+ ret = ath10k_wmi_pdev_set_param(ar, param, pwr_limit_2G);
+ if (ret) {
+ ath10k_warn(ar, "failed to set 2.4G txpower %d: %d\n",
+ pwr_limit_2G, ret);
+ return ret;
+ }
+ ath10k_dbg(ar, ATH10K_DBG_MAC, "mac set 2.4G txpower %d success\n", pwr_limit_2G);
+
+ param = ar->wmi.pdev_param->txpower_limit5g;
+ ret = ath10k_wmi_pdev_set_param(ar, param, pwr_limit_5G);
+ if (ret) {
+ ath10k_warn(ar, "failed to set 5G txpower %d: %d\n",
+ pwr_limit_5G, ret);
+ return ret;
+ }
+
+ ath10k_dbg(ar, ATH10K_DBG_MAC, "mac set 5G txpower %d success\n", pwr_limit_5G);
+
+ return 0;
+}
+
/* 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,
@@ -2926,6 +2986,8 @@ static void ath10k_bss_assoc(struct ieee80211_hw *hw,
arvif->is_up = true;
+ ath10k_mac_set_sar_power_limit(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.
@@ -9074,6 +9136,8 @@ int ath10k_mac_register(struct ath10k *ar)
NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR;
}
+ ath10k_vendor_register(ar);
+
ar->hw->wiphy->cipher_suites = cipher_suites;
/* QCA988x and QCA6174 family chips do not support CCMP-256, GCMP-128
@@ -58,7 +58,7 @@ u8 ath10k_mac_hw_rate_to_idx(const struct ieee80211_supported_band *sband,
u8 hw_rate, bool cck);
u8 ath10k_mac_bitrate_to_idx(const struct ieee80211_supported_band *sband,
u32 bitrate);
-
+int ath10k_mac_set_sar_power_limit(struct ath10k *ar);
void ath10k_mac_tx_lock(struct ath10k *ar, int reason);
void ath10k_mac_tx_unlock(struct ath10k *ar, int reason);
void ath10k_mac_vif_tx_lock(struct ath10k_vif *arvif, int reason);
new file mode 100644
@@ -0,0 +1,114 @@
+// SPDX-License-Identifier: ISC
+/*
+ * Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ */
+
+#include <net/netlink.h>
+#include <uapi/nl80211-vnd-qca.h>
+
+#include "mac.h"
+#include "debug.h"
+#include "vendor.h"
+
+static const struct nla_policy
+sar_limits_policy[QCA_WLAN_VENDOR_ATTR_SAR_LIMITS_MAX + 1] = {
+ [QCA_WLAN_VENDOR_ATTR_SAR_LIMITS_SPEC_BAND] = {.type = NLA_U32},
+ [QCA_WLAN_VENDOR_ATTR_SAR_LIMITS_SPEC_POWER_LIMIT] = {.type = NLA_U32},
+};
+
+static int ath10k_vendor_set_dynamic_sar_power_limits(struct wiphy *wiphy,
+ struct wireless_dev *wdev,
+ const void *data,
+ int data_len)
+{
+ int rem;
+ struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
+ struct ath10k *ar = hw->priv;
+ struct nlattr *spec[QCA_WLAN_VENDOR_ATTR_SAR_LIMITS_MAX + 1];
+ struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_SAR_LIMITS_MAX + 1];
+ struct nlattr *spec_list;
+ u32 limit;
+ enum nl80211_band band;
+ bool sar_valid = false;
+
+ if (!ar->hw_params.dynamic_sar_support)
+ return -ENOTSUPP;
+
+ if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_SAR_LIMITS_MAX, data, data_len,
+ sar_limits_policy, NULL)) {
+ ath10k_warn(ar, "invalid SAR attr\n");
+ return -EINVAL;
+ }
+
+ if (!tb[QCA_WLAN_VENDOR_ATTR_SAR_LIMITS_SPEC]) {
+ ath10k_warn(ar, "invalid SAR specification list\n");
+ return -EINVAL;
+ }
+
+ nla_for_each_nested(spec_list, tb[QCA_WLAN_VENDOR_ATTR_SAR_LIMITS_SPEC], rem) {
+ if (nla_parse(spec,
+ QCA_WLAN_VENDOR_ATTR_SAR_LIMITS_MAX,
+ nla_data(spec_list),
+ nla_len(spec_list),
+ sar_limits_policy,
+ NULL)) {
+ ath10k_warn(ar, "nla_parse failed for SAR Spec list\n");
+ return -EINVAL;
+ }
+
+ if (spec[QCA_WLAN_VENDOR_ATTR_SAR_LIMITS_SPEC_POWER_LIMIT]) {
+ limit = nla_get_u32(
+ spec[QCA_WLAN_VENDOR_ATTR_SAR_LIMITS_SPEC_POWER_LIMIT]);
+ } else {
+ ath10k_warn(ar, "not have spec power limit\n");
+ return -EINVAL;
+ }
+
+ if (spec[QCA_WLAN_VENDOR_ATTR_SAR_LIMITS_SPEC_BAND]) {
+ band = nla_get_u32(
+ spec[QCA_WLAN_VENDOR_ATTR_SAR_LIMITS_SPEC_BAND]);
+ } else {
+ /* if QCA_WLAN_VENDOR_ATTR_SAR_LIMITS_SPEC_BAND is
+ * unset the limit applies to both bands
+ */
+ if (limit <= ar->hw_max_tx_power) {
+ ar->tx_power_2g_limit = limit;
+ ar->tx_power_5g_limit = limit;
+ sar_valid = true;
+ }
+
+ break;
+ }
+
+ sar_valid = true;
+ if (band == NL80211_BAND_2GHZ && limit <= ar->hw_max_tx_power)
+ ar->tx_power_2g_limit = limit;
+ else if (band == NL80211_BAND_5GHZ && limit <= ar->hw_max_tx_power)
+ ar->tx_power_5g_limit = limit;
+ }
+
+ if (sar_valid)
+ return ath10k_mac_set_sar_power_limit(ar);
+
+ return 0;
+}
+
+static const struct wiphy_vendor_command ath10k_vendor_commands[] = {
+ {
+ .info = {
+ .vendor_id = QCA_NL80211_VENDOR_ID,
+ .subcmd = QCA_NL80211_VENDOR_SUBCMD_SET_SAR_LIMITS,
+ },
+ .flags = WIPHY_VENDOR_CMD_NEED_WDEV |
+ WIPHY_VENDOR_CMD_NEED_RUNNING,
+ .doit = ath10k_vendor_set_dynamic_sar_power_limits,
+ .policy = sar_limits_policy,
+ }
+};
+
+void ath10k_vendor_register(struct ath10k *ar)
+{
+ ar->hw->wiphy->vendor_commands = ath10k_vendor_commands;
+ ar->hw->wiphy->n_vendor_commands = ARRAY_SIZE(ath10k_vendor_commands);
+}
+
new file mode 100644
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: ISC */
+/*
+ * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ */
+
+#ifndef _VENDOR_H_
+#define _VENDOR_H_
+
+#include <linux/kernel.h>
+
+void ath10k_vendor_register(struct ath10k *ar);
+
+#endif /* _VENDOR_H_ */
@@ -3695,6 +3695,12 @@ struct wmi_csa_event {
#define VDEV_DEFAULT_STATS_UPDATE_PERIOD 500
#define PEER_DEFAULT_STATS_UPDATE_PERIOD 500
+/* the mask of 4 sub band of 5G for SAR parameters */
+#define ATH10K_WMI_SAR_5G_0_MASK GENMASK(7, 0)
+#define ATH10K_WMI_SAR_5G_1_MASK GENMASK(15, 8)
+#define ATH10K_WMI_SAR_5G_2_MASK GENMASK(23, 16)
+#define ATH10K_WMI_SAR_5G_3_MASK GENMASK(31, 24)
+
struct wmi_pdev_param_map {
u32 tx_chain_mask;
u32 rx_chain_mask;