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>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c
index 0bac39bf3b66d79672f82205d1475fe27bfe2a0d..66d47c70111a1966c2ff06d6507f8840d7f5e07b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c
+++ b/drivers/net/wireless/mediatek/mt76/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/drivers/net/wireless/mediatek/mt76/mt76x0/main.c b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
index 700ae9c12f1db3c3a4c1a07a357232bd3a72d113..07380cce8755ea8a839889e0d9fee49c2aafc5ac 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
+++ b/drivers/net/wireless/mediatek/mt76/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/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
index 6953f253a28a7cd03dcf468e2bc1b581d5190b19..99dcb8feb9f771132a38b24226f57ec6cad5414c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
+++ b/drivers/net/wireless/mediatek/mt76/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/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
index f19228fc5a70879a6e03e945f4aa1de761d3077c..9277ff38b7a228fd778e8c9909eed0182eb14306 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/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/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
index f2b2fa7338457b1f5c7406e601b087294c8c5389..436daf6d6d8697da65ef989304bff0da1b4b661d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/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)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h
index 4d58c2c1c0ac122e4cdd89eb03262b84dee4a33a..44d1a92d9a9068713f1c4aea8980ab70ddb9f1cf 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02.h
@@ -133,7 +133,7 @@ struct mt76x02_dev {
 
 extern struct ieee80211_rate mt76x02_rates[12];
 
-void mt76x02_init_device(struct mt76x02_dev *dev);
+int mt76x02_init_device(struct mt76x02_dev *dev);
 void mt76x02_configure_filter(struct ieee80211_hw *hw,
                              unsigned int changed_flags,
                              unsigned int *total_flags, u64 multicast);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
index 1f17d86ff755e4508eb602d75f34c6e2b114f7fd..06f8fb883ead2c50bdebb2170309da50d8af9680 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
@@ -138,7 +138,7 @@ mt76x02_led_set_brightness(struct led_classdev *led_cdev,
                mt76x02_led_set_config(mdev, 0xff, 0);
 }
 
-void mt76x02_init_device(struct mt76x02_dev *dev)
+int mt76x02_init_device(struct mt76x02_dev *dev)
 {
        struct ieee80211_hw *hw = mt76_hw(dev);
        struct wiphy *wiphy = hw->wiphy;
@@ -174,6 +174,13 @@ void mt76x02_init_device(struct mt76x02_dev *dev)
        }
 
        wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_VHT_IBSS);
+       wiphy->sar_capa = &mt76_sar_capa;
+       dev->mt76.phy.frp = devm_kcalloc(dev->mt76.dev,
+                                        wiphy->sar_capa->num_freq_ranges,
+                                        sizeof(struct mt76_freq_range_power),
+                                        GFP_KERNEL);
+       if (!dev->mt76.phy.frp)
+               return -ENOMEM;
 
        hw->sta_data_size = sizeof(struct mt76x02_sta);
        hw->vif_data_size = sizeof(struct mt76x02_vif);
@@ -197,6 +204,8 @@ void mt76x02_init_device(struct mt76x02_dev *dev)
                dev->mphy.chainmask = 0x101;
                dev->mphy.antenna_mask = 1;
        }
+
+       return 0;
 }
 EXPORT_SYMBOL_GPL(mt76x02_init_device);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/init.c
index a92a479aebaaf789d067cf9627a6910df7440558..7b01a06d7f8d0fba3a752f2b6418d99e8699b439 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/init.c
@@ -8,6 +8,35 @@
 #include "eeprom.h"
 #include "../mt76x02_phy.h"
 
+int mt76x2_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);
+       /* convert to per-chain power for 2x2 devices */
+       dev->txpower_conf -= 6;
+
+       if (test_bit(MT76_STATE_RUNNING, &mphy->state))
+               mt76x2_phy_set_txpower(dev);
+out:
+       mutex_unlock(&dev->mt76.mutex);
+
+       return err;
+}
+EXPORT_SYMBOL_GPL(mt76x2_set_sar_specs);
+
 static void
 mt76x2_set_wlan_state(struct mt76x02_dev *dev, bool enable)
 {

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
index d01f47c83eb1e74ed34db008cab3e03a9e14126b..be1217329a77236ce090eec1b76cadeceadf5204 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
@@ -41,6 +41,8 @@ extern const struct ieee80211_ops mt76x2_ops;
 int mt76x2_register_device(struct mt76x02_dev *dev);
 int mt76x2_resume_device(struct mt76x02_dev *dev);
 
+int mt76x2_set_sar_specs(struct ieee80211_hw *hw,
+                        const struct cfg80211_sar_specs *sar);
 void mt76x2_phy_power_on(struct mt76x02_dev *dev);
 void mt76x2_stop_hardware(struct mt76x02_dev *dev);
 int mt76x2_eeprom_init(struct mt76x02_dev *dev);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
index c6fa8cf92529923c05c7c0cec4ee1702620272a4..e38e8e5685c2da908040effa274630c7cb842a5f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
@@ -292,8 +292,9 @@ int mt76x2_register_device(struct mt76x02_dev *dev)
        int ret;
 
        INIT_DELAYED_WORK(&dev->cal_work, mt76x2_phy_calibrate);
-
-       mt76x02_init_device(dev);
+       ret = mt76x02_init_device(dev);
+       if (ret)
+               return ret;
 
        ret = mt76x2_init_hardware(dev);
        if (ret)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
index 933125b07ea34bebea2e3f76dcc47be38280c04e..b38bb7a2362b28db991dd0893298871193193918 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
@@ -78,8 +78,12 @@ mt76x2_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;
 
+               dev->txpower_conf = hw->conf.power_level * 2;
+               dev->txpower_conf = mt76_get_sar_power(mphy,
+                                                      mphy->chandef.chan,
+                                                      dev->txpower_conf);
                /* convert to per-chain power for 2x2 devices */
                dev->txpower_conf -= 6;
 
@@ -155,5 +159,6 @@ const struct ieee80211_ops mt76x2_ops = {
        .get_antenna = mt76_get_antenna,
        .set_rts_threshold = mt76x02_set_rts_threshold,
        .reconfig_complete = mt76x02_reconfig_complete,
+       .set_sar_specs = mt76x2_set_sar_specs,
 };
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
index 85dcdc22fbebf385818815be17fa6a0ef522aee5..33a14365ec9b981d25ca677bbf57ba76f7447e73 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
@@ -194,7 +194,9 @@ int mt76x2u_register_device(struct mt76x02_dev *dev)
        int err;
 
        INIT_DELAYED_WORK(&dev->cal_work, mt76x2u_phy_calibrate);
-       mt76x02_init_device(dev);
+       err = mt76x02_init_device(dev);
+       if (err)
+               return err;
 
        err = mt76x2u_init_eeprom(dev);
        if (err < 0)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c
index b66836928d9dc1637be2c20f9dab5b3de8f3cd31..ac07ed1f63a3c896638a812775407edb2d50264d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c
@@ -78,12 +78,16 @@ mt76x2u_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;
 
+               dev->txpower_conf = hw->conf.power_level * 2;
+               dev->txpower_conf = mt76_get_sar_power(mphy,
+                                                      mphy->chandef.chan,
+                                                      dev->txpower_conf);
                /* convert to per-chain power for 2x2 devices */
                dev->txpower_conf -= 6;
 
-               if (test_bit(MT76_STATE_RUNNING, &dev->mphy.state))
+               if (test_bit(MT76_STATE_RUNNING, &mphy->state))
                        mt76x2_phy_set_txpower(dev);
        }
 
@@ -121,4 +125,5 @@ const struct ieee80211_ops mt76x2u_ops = {
        .set_tim = mt76_set_tim,
        .release_buffered_frames = mt76_release_buffered_frames,
        .get_antenna = mt76_get_antenna,
+       .set_sar_specs = mt76x2_set_sar_specs,
 };