mt76: connac: add support maximum regulatory Tx power
Subsystems (2)
[email protected]
reviewerPATCH v2 1/1 mt76: connac: add support maximum regulatory Tx power
From: YN Chen <[email protected]>
Consider .max_reg_power in struct ieee80211_channel to limit the maximum power the wireless device allowed to transmit on the corresponding channel according to the regulatory domain.
---
v2: consider the power limit that can be allowed on mt7663
--- .../wireless/mediatek/mt76/mt76_connac_mcu.c | 43 ++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +41 -2
@@ -1773,6 +1773,43 @@ static s8 mt76_connac_get_sar_power(struct mt76_phy *phy,return target_power; } +static s8 mt76_connac_get_ch_power (struct mt76_phy *phy, +struct ieee80211_channel *chan, +s8 target_power) +{ +struct mt76_dev *dev = phy->dev; +struct ieee80211_supported_band *sband; +int i; + +switch (chan->band) { +case NL80211_BAND_2GHZ : + sband = &phy->sband_2g.sband; +break ; +case NL80211_BAND_5GHZ : + sband = &phy->sband_5g.sband; +break ; +default : +return target_power; + } + +for (i =0 ; i < sband->n_channels; i++) { +struct ieee80211_channel *ch = &sband->channels[i]; + +if (ch->hw_value == chan->hw_value) { +if (!(ch->flags &IEEE80211_CHAN_DISABLED )) { +int power =2 * ch->max_reg_power; + +if (is_mt7663 (dev) && (power >63 || power <-64 )) + power =63 ; + target_power =min_t (s8, power, target_power); + } +break ; + } + } + +return target_power; +} +static int mt76_connac_mcu_rate_txpower_band (struct mt76_phy *phy,enum nl80211_band band)
@@ -1840,10 +1877,12 @@ mt76_connac_mcu_rate_txpower_band(struct mt76_phy *phy, .hw_value = ch_list[idx], .band = band, }; -s8 sar_power; +s8 reg_power, sar_power; + reg_power =mt76_connac_get_ch_power (phy, &chan, + tx_power); sar_power =mt76_connac_get_sar_power (phy, &chan, - tx_power); + reg_power);mt76_get_rate_power_limits (phy, &chan, &limits, sar_power);
Signature · 1 line
2.25.1
Lorenzo Bianconi
maintainerQuoted 41 lines
From: YN Chen <[email protected]>
Consider .max_reg_power in struct
ieee80211_channelto limit the maximum power the wireless device allowed to transmit on the corresponding channel according to the regulatory domain.Co-developed-by Sean Wang <[email protected]>Signed-off-by Sean Wang <[email protected]>Signed-off-by YN Chen <[email protected]>---
v2: consider the power limit that can be allowed on mt7663--- .../wireless/mediatek/mt76/mt76_connac_mcu.c | 43 ++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-)drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +18
-0@@ -1773,6 +1773,43 @@ static s8 mt76_connac_get_sar_power(struct mt76_phy *phy,return target_power; } +static s8 mt76_connac_get_ch_power (struct mt76_phy *phy, +struct ieee80211_channel *chan, +s8 target_power) +{ +struct mt76_dev *dev = phy->dev; +struct ieee80211_supported_band *sband; +int i; + +switch (chan->band) { +case NL80211_BAND_2GHZ : + sband = &phy->sband_2g.sband; +break ; +case NL80211_BAND_5GHZ : + sband = &phy->sband_5g.sband; +break ; +default : +return target_power; + }
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c static s8 mt76_connac_get_sar_power(struct mt76_phy *phy, · line 1803
Quoted 10 lines
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +10
-0+ +for (i =0 ; i < sband->n_channels; i++) { +struct ieee80211_channel *ch = &sband->channels[i]; + +if (ch->hw_value == chan->hw_value) { +if (!(ch->flags &IEEE80211_CHAN_DISABLED )) { +int power =2 * ch->max_reg_power; + +if (is_mt7663 (dev) && (power >63 || power <-64 )) + power =63 ;
I guess now you are missing the value for mt7921. What I mean is something similar to mt76_connac_mcu_build_sku()
int max_power = is_mt7921(dev) ? 127 : 63;
Regards,
Lorenzo
Quoted 30 lines
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +13
-2+ target_power =min_t (s8, power, target_power); + } +break ; + } + } + +return target_power; +} +static int mt76_connac_mcu_rate_txpower_band (struct mt76_phy *phy,enum nl80211_band band)@@ -1840,10 +1877,12 @@ mt76_connac_mcu_rate_txpower_band(struct mt76_phy *phy, .hw_value = ch_list[idx], .band = band, }; -s8 sar_power; +s8 reg_power, sar_power; + reg_power =mt76_connac_get_ch_power (phy, &chan, + tx_power); sar_power =mt76_connac_get_sar_power (phy, &chan, - tx_power); + reg_power);mt76_get_rate_power_limits (phy, &chan, &limits, sar_power);Signature · 1 line
2.25.1