add common API to configure SAR
PATCH v3 1/3 nl80211: add common API to configure SAR power limitations.
In reply to Carl HuangNL80211_CMD_SET_SAR_SPECS is added to configure SAR from user space. NL80211_ATTR_SAR_SPEC is used to pass the SAR power specification when used with NL80211_CMD_SET_SAR_SPECS.
Wireless driver needs to register SAR type, supported frequency ranges to wiphy, so user space can query it. The index in frequency range is used to specify which sub band the power limitation applies to. The SAR type is for compatibility, so later other SAR mechanism can be implemented without breaking the user space SAR applications.
Normal process is user space quries the SAR capability, and gets the index of supported frequency ranges and associates the power limitation with this index and sends to kernel.
Here is an example of message send to kernel:
8c 00 00 00 08 00 01 00 00 00 00 00 38 00 2b 81
08 00 01 00 00 00 00 00 2c 00 02 80 14 00 00 80
08 00 02 00 00 00 00 00 08 00 01 00 38 00 00 00
14 00 01 80 08 00 02 00 01 00 00 00 08 00 01 00
48 00 00 00
NL80211_CMD_SET_SAR_SPECS: 0x8c NL80211_ATTR_WIPHY: 0x01(phy idx is 0) NL80211_ATTR_SAR_SPEC: 0x812b (NLA_NESTED) NL80211_SAR_ATTR_TYPE: 0x00 (NL80211_SAR_TYPE_POWER) NL80211_SAR_ATTR_SPECS: 0x8002 (NLA_NESTED) freq range 0 power: 0x38 in 0.25dbm unit (14dbm) freq range 1 power: 0x48 in 0.25dbm unit (18dbm)
---
v3:
- check index duplicates. Return error if index duplicates.
v2:
- rebased on ToT
- fix spelling errors and some comment styles
- use switch-case to process sar specs
- put power_type sar spec to a sub function
- change power to s32 and index to u32
- add error check in nl80211_put_sar_specs
- add a new case in nl80211_send_wiphy to send sar specs
include/net/cfg80211.h | 51 ++++++++++++ include/uapi/linux/nl80211.h | 102 ++++++++++++++++++++++++ net/wireless/nl80211.c | 185 +++++++++++++++++++++++++++++++++++++++++++ net/wireless/rdev-ops.h | 12 +++ net/wireless/trace.h | 19 +++++ 5 files changed, 369 insertions(+)
include/net/cfg80211.h +51 -0
@@ -1736,6 +1736,54 @@ struct station_info {u8 connected_to_as; }; +/** +* struct cfg80211_sar_sub_specs - sub specs limit +* @power: power limitation in 0.25dbm +* @freq_range_index: index the power limitation applies to +*/ +struct cfg80211_sar_sub_specs { +s32 power; +u32 freq_range_index; +}; + +/** +* struct cfg80211_sar_specs - sar limit specs +* @type: it's set with power in 0.25dbm or other types +* @num_sub_specs: number of sar sub specs +* @sub_specs: memory to hold the sar sub specs +*/ +struct cfg80211_sar_specs { +enum nl80211_sar_type type; +u32 num_sub_specs; +struct cfg80211_sar_sub_specs sub_specs[]; +}; + + +/** +* @struct cfg80211_sar_chan_ranges - sar frequency ranges +* @start_freq: start range edge frequency +* @end_freq: end range edge frequency +*/ +struct cfg80211_sar_freq_ranges { +u32 start_freq; +u32 end_freq; +}; + +/** +* struct cfg80211_sar_capa - sar limit capability +* @type: it's set via power in 0.25dbm or other types +* @num_freq_ranges: number of frequency ranges +* @freq_ranges: memory to hold the freq ranges. +* +* Note: WLAN driver may append new ranges or split an existing +* range to small ones and then append them. +*/ +struct cfg80211_sar_capa { +enum nl80211_sar_type type; +u32 num_freq_ranges; +const struct cfg80211_sar_freq_ranges *freq_ranges; +}; +#if IS_ENABLED (CONFIG_CFG80211 )/** * cfg80211_get_station - retrieve information about a given station
@@ -4258,6 +4306,7 @@ struct cfg80211_ops { struct cfg80211_tid_config *tid_conf);int (*reset_tid_config)(struct wiphy *wiphy,struct net_device *dev,const u8 *peer,u8 tids); +int (*set_sar_specs)(struct wiphy *wiphy,struct cfg80211_sar_specs *sar); };/*
@@ -5026,6 +5075,8 @@ struct wiphy {u8 max_data_retry_count; +const struct cfg80211_sar_capa *sar_capa; +char priv[]__aligned(NETDEV_ALIGN) ; };
include/uapi/linux/nl80211.h +102 -0
130 lines not on this page · raw message
net/wireless/nl80211.c +185 -0
227 lines not on this page · raw message
net/wireless/rdev-ops.h +12 -0
@@ -1356,4 +1356,16 @@ static inline int rdev_reset_tid_config(struct cfg80211_registered_device *rdev, return ret; } +static inline int rdev_set_sar_specs (struct cfg80211_registered_device *rdev, +struct cfg80211_sar_specs *sar) +{ +int ret; + +trace_rdev_set_sar_specs (&rdev->wiphy, sar); + ret = rdev->ops->set_sar_specs (&rdev->wiphy, sar); +trace_rdev_return_int (&rdev->wiphy, ret); + +return ret; +} +#endif /* __CFG80211_RDEV_OPS */
net/wireless/trace.h +19 -0
@@ -3547,6 +3547,25 @@ TRACE_EVENT(rdev_reset_tid_config,TP_printk (WIPHY_PR_FMT ", " NETDEV_PR_FMT ", peer: " MAC_PR_FMT ", tids: 0x%x" ,WIPHY_PR_ARG ,NETDEV_PR_ARG ,MAC_PR_ARG (peer), __entry->tids) ); + +TRACE_EVENT (rdev_set_sar_specs, + TP_PROTO(struct wiphy *wiphy, struct cfg80211_sar_specs *sar), +TP_ARGS (wiphy, sar), +TP_STRUCT__entry ( + WIPHY_ENTRY + __field(u16, type) +__field (u16, num) + ), +TP_fast_assign ( + WIPHY_ASSIGN; + __entry->type = sar->type; + __entry->num = sar->num_sub_specs; + + ), +TP_printk (WIPHY_PR_FMT ", Set type:%d, num_specs:%d" , +WIPHY_PR_ARG , __entry->type, __entry->num) +); +#endif /* !__RDEV_OPS_TRACE || TRACE_HEADER_MULTI_READ */ #undef TRACE_INCLUDE_PATH
Signature · 7 lines
2.7.4 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
v3 cover add common API to configure SAR
This patchset is to add common API to configure SAR. The mechanism is wlan driver registers sar capability to wiphy and userspace queries it. Userspace then sets power limitation to wlan driver.
v3:
- check index duplicates. If index duplicates, returns error
v2:
- rebased on ToT
- fix comments by Johannes and Abhishek
- change sar_power to s32 and range_index to u32
Carl Huang (3):
nl80211: add common API to configure SAR power limitations.
mac80211: add ieee80211_set_sar_specs
ath10k: allow dynamic SAR power limits via common API
drivers/net/wireless/ath/ath10k/core.c | 16 +++ drivers/net/wireless/ath/ath10k/core.h | 3 + drivers/net/wireless/ath/ath10k/hw.h | 2 + drivers/net/wireless/ath/ath10k/mac.c | 225 ++++++++++++++++++++++++--------- include/net/cfg80211.h | 51 ++++++++ include/net/mac80211.h | 2 + include/uapi/linux/nl80211.h | 102 +++++++++++++++ net/mac80211/cfg.c | 12 ++ net/wireless/nl80211.c | 185 +++++++++++++++++++++++++++ net/wireless/rdev-ops.h | 12 ++ net/wireless/trace.h | 19 +++ 11 files changed, 570 insertions(+), 59 deletions(-)
Signature · 7 lines
2.7.4 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v3 2/3 mac80211: add ieee80211_set_sar_specs
This change registers ieee80211_set_sar_specs tomac80211_config_ops, so cfg80211 can call it.
---
v3:
- no change
v2:
- rebased on ToT
include/net/mac80211.h | 2 ++ net/mac80211/cfg.c | 12 ++++++++++++ 2 files changed, 14 insertions(+)
include/net/mac80211.h +2 -0
@@ -4197,6 +4197,8 @@ struct ieee80211_ops { struct ieee80211_vif *vif);void (*sta_set_4addr)(struct ieee80211_hw *hw,struct ieee80211_vif *vif,struct ieee80211_sta *sta,bool enabled); +int (*set_sar_specs)(struct ieee80211_hw *hw, +const struct cfg80211_sar_specs *sar); };/**
net/mac80211/cfg.c +12 -0
@@ -4083,6 +4083,17 @@ static int ieee80211_reset_tid_config(struct wiphy *wiphy,return ret; } +static int ieee80211_set_sar_specs (struct wiphy *wiphy, +struct cfg80211_sar_specs *sar) +{ +struct ieee80211_local *local =wiphy_priv (wiphy); + +if (!local->ops->set_sar_specs) +return -EOPNOTSUPP ; + +return local->ops->set_sar_specs (&local->hw, sar); +} +const struct cfg80211_ops mac80211_config_ops = { .add_virtual_intf = ieee80211_add_iface, .del_virtual_intf = ieee80211_del_iface,
@@ -4186,4 +4197,5 @@ const struct cfg80211_ops mac80211_config_ops = { .probe_mesh_link = ieee80211_probe_mesh_link, .set_tid_config = ieee80211_set_tid_config, .reset_tid_config = ieee80211_reset_tid_config, + .set_sar_specs = ieee80211_set_sar_specs, };
Signature · 7 lines
2.7.4 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v3 3/3 ath10k: allow dynamic SAR power limits via common API
In reply to Carl Huangath10k 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.
This SAR power limitation is compared to regulatory txpower and selects the minimal one to set when station is connected. Otherwise, it delays until the station is connected. If the station is disconnected, it returns to regulatory txpower.
This feature is controlled by hw parameter: dynamic_sar_support.
Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00110-QCARMSWP-1
---
v3:
- no change
v2:
- rebased on ToT
- get correct index in ath10k_mac_set_sar_specs
- fix one output format commented by Abhishek
drivers/net/wireless/ath/ath10k/core.c | 16 +++ drivers/net/wireless/ath/ath10k/core.h | 3 + drivers/net/wireless/ath/ath10k/hw.h | 2 + drivers/net/wireless/ath/ath10k/mac.c | 225 ++++++++++++++++++++++++--------- 4 files changed, 187 insertions(+), 59 deletions(-)
drivers/net/wireless/ath/ath10k/core.c +16 -0
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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, }, };
drivers/net/wireless/ath/ath10k/core.h +3 -0
@@ -1287,6 +1287,9 @@ struct ath10k {bool coex_support;int coex_gpio_pin; +s32 tx_power_2g_limit; +s32 tx_power_5g_limit; +/* must be last */ u8 drv_priv[]__aligned(sizeof(void *)) ; };
drivers/net/wireless/ath/ath10k/hw.h +2 -0
@@ -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 ;
drivers/net/wireless/ath/ath10k/mac.c +166 -59
267 lines not on this page · raw message
Signature · 7 lines
2.7.4 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k