diff options
| author | Lorenzo Bianconi <lorenzo@kernel.org> | 2021-11-21 15:12:25 +0300 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2021-11-22 18:05:20 +0300 |
| commit | b1d0ad2e74fe8cad563556bb8781d5d92b24b690 (patch) | |
| tree | edcb230ff4a367cca8cb59d98cf12dab1d2ceff4 /mt76x0 | |
| parent | bc6798f729f92c9f6400759071ad5fee5e3bfc7f (diff) | |
mt76: mt76x02: introduce SAR support
Add SAR spec support to mt76x02 driver to allow configuring SAR power
limitations on the frequency ranges from the userland.
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'mt76x0')
| -rw-r--r-- | mt76x0/init.c | 5 | ||||
| -rw-r--r-- | mt76x0/main.c | 34 | ||||
| -rw-r--r-- | mt76x0/mt76x0.h | 2 | ||||
| -rw-r--r-- | mt76x0/pci.c | 1 | ||||
| -rw-r--r-- | mt76x0/usb.c | 1 |
5 files changed, 40 insertions, 3 deletions
diff --git a/mt76x0/init.c b/mt76x0/init.c index 0bac39bf..66d47c70 100644 --- a/mt76x0/init.c +++ b/mt76x0/init.c @@ -237,7 +237,10 @@ int mt76x0_register_device(struct mt76x02_dev *dev) { int ret; - mt76x02_init_device(dev); + ret = mt76x02_init_device(dev); + if (ret) + return ret; + mt76x02_config_mac_addr_list(dev); ret = mt76_register_device(&dev->mt76, true, mt76x02_rates, diff --git a/mt76x0/main.c b/mt76x0/main.c index 700ae9c1..07380cce 100644 --- a/mt76x0/main.c +++ b/mt76x0/main.c @@ -31,6 +31,32 @@ mt76x0_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef) mt76_txq_schedule_all(&dev->mphy); } +int mt76x0_set_sar_specs(struct ieee80211_hw *hw, + const struct cfg80211_sar_specs *sar) +{ + int err = -EINVAL, power = hw->conf.power_level * 2; + struct mt76x02_dev *dev = hw->priv; + struct mt76_phy *mphy = &dev->mphy; + + mutex_lock(&dev->mt76.mutex); + if (!cfg80211_chandef_valid(&mphy->chandef)) + goto out; + + err = mt76_init_sar_power(hw, sar); + if (err) + goto out; + + dev->txpower_conf = mt76_get_sar_power(mphy, mphy->chandef.chan, + power); + if (test_bit(MT76_STATE_RUNNING, &mphy->state)) + mt76x0_phy_set_txpower(dev); +out: + mutex_unlock(&dev->mt76.mutex); + + return err; +} +EXPORT_SYMBOL_GPL(mt76x0_set_sar_specs); + int mt76x0_config(struct ieee80211_hw *hw, u32 changed) { struct mt76x02_dev *dev = hw->priv; @@ -44,9 +70,13 @@ int mt76x0_config(struct ieee80211_hw *hw, u32 changed) } if (changed & IEEE80211_CONF_CHANGE_POWER) { - dev->txpower_conf = hw->conf.power_level * 2; + struct mt76_phy *mphy = &dev->mphy; - if (test_bit(MT76_STATE_RUNNING, &dev->mphy.state)) + dev->txpower_conf = hw->conf.power_level * 2; + dev->txpower_conf = mt76_get_sar_power(mphy, + mphy->chandef.chan, + dev->txpower_conf); + if (test_bit(MT76_STATE_RUNNING, &mphy->state)) mt76x0_phy_set_txpower(dev); } diff --git a/mt76x0/mt76x0.h b/mt76x0/mt76x0.h index 6953f253..99dcb8fe 100644 --- a/mt76x0/mt76x0.h +++ b/mt76x0/mt76x0.h @@ -49,6 +49,8 @@ void mt76x0_chip_onoff(struct mt76x02_dev *dev, bool enable, bool reset); void mt76x0_mac_stop(struct mt76x02_dev *dev); int mt76x0_config(struct ieee80211_hw *hw, u32 changed); +int mt76x0_set_sar_specs(struct ieee80211_hw *hw, + const struct cfg80211_sar_specs *sar); /* PHY */ void mt76x0_phy_init(struct mt76x02_dev *dev); diff --git a/mt76x0/pci.c b/mt76x0/pci.c index f19228fc..9277ff38 100644 --- a/mt76x0/pci.c +++ b/mt76x0/pci.c @@ -85,6 +85,7 @@ static const struct ieee80211_ops mt76x0e_ops = { .set_rts_threshold = mt76x02_set_rts_threshold, .get_antenna = mt76_get_antenna, .reconfig_complete = mt76x02_reconfig_complete, + .set_sar_specs = mt76x0_set_sar_specs, }; static int mt76x0e_init_hardware(struct mt76x02_dev *dev, bool resume) diff --git a/mt76x0/usb.c b/mt76x0/usb.c index f2b2fa73..436daf6d 100644 --- a/mt76x0/usb.c +++ b/mt76x0/usb.c @@ -141,6 +141,7 @@ static const struct ieee80211_ops mt76x0u_ops = { .set_tim = mt76_set_tim, .release_buffered_frames = mt76_release_buffered_frames, .get_antenna = mt76_get_antenna, + .set_sar_specs = mt76x0_set_sar_specs, }; static int mt76x0u_init_hardware(struct mt76x02_dev *dev, bool reset) |