Re: [PATCH v2] mt76: mt7921: add .set_sar_specs support
From: Ryder Lee <ryder.lee@mediatek.com>
Date: 2021-06-22 02:37:07
Also in:
linux-wireless
On Tue, 2021-06-22 at 07:07 +0800, sean.wang@mediatek.com wrote:
quoted hunk ↗ jump to hunk
From: YN Chen <redacted> add .set_sar_specs to allow configuring SAR power limitations on the frequency ranges from the userland. Co-developed-by: Sean Wang <sean.wang@mediatek.com> Signed-off-by: Sean Wang <sean.wang@mediatek.com> Signed-off-by: YN Chen <redacted> --- v2: 1. loop enhancement with considering no overlapping freqs 2. error handling for devm_kcalloc 3. sanity check without acquire lock --- drivers/net/wireless/mediatek/mt76/mt76.h | 3 ++ .../net/wireless/mediatek/mt76/mt76_connac.h | 5 +++ .../wireless/mediatek/mt76/mt76_connac_mcu.c | 26 +++++++++++- .../net/wireless/mediatek/mt76/mt7921/init.c | 33 ++++++++++++++- .../net/wireless/mediatek/mt76/mt7921/main.c | 41 +++++++++++++++++++ 5 files changed, 105 insertions(+), 3 deletions(-)diff --git a/drivers/net/wireless/mediatek/mt76/mt76.hb/drivers/net/wireless/mediatek/mt76/mt76.h index 25c5ceef5257..63ce5242c4d5 100644--- a/drivers/net/wireless/mediatek/mt76/mt76.h +++ b/drivers/net/wireless/mediatek/mt76/mt76.h@@ -636,6 +636,9 @@ struct mt76_phy { struct sk_buff **tail; u16 seqno; } rx_amsdu[__MT_RXQ_MAX]; + + void *frp_data; + u8 num_frps; }; struct mt76_dev {diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.hb/drivers/net/wireless/mediatek/mt76/mt76_connac.h index f49d97d0a1c5..95c7d1cac7c4 100644--- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h@@ -83,6 +83,11 @@ struct mt76_connac_coredump { unsigned long last_activity; }; +struct mt76_connac_freq_range_power { + const struct cfg80211_sar_freq_ranges *range; + s8 power; +}; + extern const struct wiphy_wowlan_support mt76_connac_wowlan_support; static inline bool is_mt7921(struct mt76_dev *dev)diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.cb/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c index 5c3a81e5f559..497de1d91c7c 100644--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c@@ -1749,6 +1749,26 @@ mt76_connac_mcu_build_sku(struct mt76_dev*dev, s8 *sku, } } +static s8 mt76_connac_get_sar_power(struct mt76_phy *phy, + struct ieee80211_channel *chan, + s8 target_power) +{ + struct mt76_connac_freq_range_power *frp = phy->frp_data; + int freq, i; + + freq = ieee80211_channel_to_frequency(chan->hw_value, chan-quoted
band);+ for (i = 0 ; i < phy->num_frps; i++) { + if (frp[i].range && + freq >= frp[i].range->start_freq && + freq < frp[i].range->end_freq) { + target_power = min_t(s8, frp[i].power, target_power); + break; + } + } + + return target_power; +} + static int mt76_connac_mcu_rate_txpower_band(struct mt76_phy *phy, enum nl80211_band band)@@ -1816,9 +1836,13 @@ mt76_connac_mcu_rate_txpower_band(structmt76_phy *phy, .hw_value = ch_list[idx], .band = band, }; + s8 sar_power; + + sar_power = mt76_connac_get_sar_power(phy, &chan, + tx_power) ; mt76_get_rate_power_limits(phy, &chan, &limits, - tx_power); + sar_power); tx_power_tlv.last_msg = ch_list[idx] == last_ch; sku_tlbv.channel = ch_list[idx];diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.cb/drivers/net/wireless/mediatek/mt76/mt7921/init.c index a9ce10b98827..c11a5b925209 100644--- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c@@ -24,6 +24,20 @@ static const struct ieee80211_iface_combinationif_comb[] = { } }; +const struct cfg80211_sar_freq_ranges mt7921_sar_freq_ranges[] = { + { .start_freq = 2402, .end_freq = 2494, }, + { .start_freq = 5150, .end_freq = 5350, }, + { .start_freq = 5350, .end_freq = 5470, }, + { .start_freq = 5470, .end_freq = 5725, }, + { .start_freq = 5725, .end_freq = 5950, }, +}; + +static const struct cfg80211_sar_capa mt7921_sar_capa = { + .type = NL80211_SAR_TYPE_POWER, + .num_freq_ranges = ARRAY_SIZE(mt7921_sar_freq_ranges), + .freq_ranges = &mt7921_sar_freq_ranges[0], +}; +
Nowthat we have frps in mt76.h we can make these SAR chunk sharable as well to provide a common ground to other mt76 station devices might require set_sar_spec. Ryder _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek