mt76: fix tx power issues

- tx power is stored in the channels after ieee80211_register_hw, so
  chan->orig_mpwr needs to be updated as well
- for non-TSSI devices, mt76x2e needs to use a different target power value
  from the EEPROM
- fix a rounding error in a few places (need to round up, not down)

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index f0d418b751adf0ae4b85dff84736668943512eb7..4b63d061c2a071f1b2993d7189089b70e925c765 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -745,7 +745,7 @@ int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
        struct mt76_dev *dev = hw->priv;
        int n_chains = hweight8(dev->antenna_mask);
 
-       *dbm = dev->txpower_cur / 2;
+       *dbm = DIV_ROUND_UP(dev->txpower_cur, 2);
 
        /* convert from per-chain power to combined
         * output on 2x2 devices

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/init.c b/drivers/net/wireless/mediatek/mt76/mt7603/init.c
index 418c2b9979e53fb372922761e6bc627eb6beb73d..9f5032985cdda9199e7b03d49a76636b297405e7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/init.c
@@ -488,6 +488,7 @@ mt7603_init_txpower(struct mt7603_dev *dev,
        for (i = 0; i < sband->n_channels; i++) {
                chan = &sband->channels[i];
                chan->max_power = target_power;
+               chan->orig_mpwr = target_power;
        }
 }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c
index e5f4ce3b595b65ab05f7f883db8c0977e1fcfc6d..57e46d57b44948f18583a894984e5e5bee995650 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c
@@ -280,6 +280,7 @@ mt76x0_init_txpower(struct mt76x02_dev *dev,
                mt76x0_get_power_info(dev, chan, &tp);
 
                chan->max_power = (mt76x02_get_max_rate_power(&t) + tp) / 2;
+               chan->orig_mpwr = chan->max_power;
        }
 }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/init.c
index a30ef2c5a9db0433cbb696f6ab6f3e8b1811cb5d..c6078e90ca4340961bcee4259de33c787bd103a6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/init.c
@@ -165,27 +165,21 @@ void mt76x2_init_txpower(struct mt76x02_dev *dev,
        struct ieee80211_channel *chan;
        struct mt76x2_tx_power_info txp;
        struct mt76_rate_power t = {};
-       int target_power;
        int i;
 
        for (i = 0; i < sband->n_channels; i++) {
                chan = &sband->channels[i];
 
                mt76x2_get_power_info(dev, &txp, chan);
-
-               target_power = max_t(int, (txp.chain[0].target_power +
-                                          txp.chain[0].delta),
-                                         (txp.chain[1].target_power +
-                                          txp.chain[1].delta));
-
                mt76x2_get_rate_power(dev, &t, chan);
 
                chan->max_power = mt76x02_get_max_rate_power(&t) +
-                                 target_power;
-               chan->max_power /= 2;
+                                 txp.target_power;
+               chan->max_power = DIV_ROUND_UP(chan->max_power, 2);
 
                /* convert to combined output power on 2x2 devices */
                chan->max_power += 3;
+               chan->orig_mpwr = chan->max_power;
        }
 }
 EXPORT_SYMBOL_GPL(mt76x2_init_txpower);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c
index 769a9b9720442c5d303e9a65519a8fe1de166089..cdedf95ca4f5313de3a8dfc0aba8cb30b13b3108 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c
@@ -161,12 +161,12 @@ void mt76x2_phy_set_txpower(struct mt76x02_dev *dev)
                delta = txp.delta_bw80;
 
        mt76x2_get_rate_power(dev, &t, chan);
-       mt76x02_add_rate_power_offset(&t, txp.chain[0].target_power);
+       mt76x02_add_rate_power_offset(&t, txp.target_power + delta);
        mt76x02_limit_rate_power(&t, dev->mt76.txpower_conf);
        dev->mt76.txpower_cur = mt76x02_get_max_rate_power(&t);
 
        base_power = mt76x2_get_min_rate_power(&t);
-       delta += base_power - txp.chain[0].target_power;
+       delta = base_power - txp.target_power;
        txp_0 = txp.chain[0].target_power + txp.chain[0].delta + delta;
        txp_1 = txp.chain[1].target_power + txp.chain[1].delta + delta;
 
@@ -182,7 +182,7 @@ void mt76x2_phy_set_txpower(struct mt76x02_dev *dev)
        }
 
        mt76x02_add_rate_power_offset(&t, -base_power);
-       dev->target_power = txp.chain[0].target_power;
+       dev->target_power = txp.target_power;
        dev->target_power_delta[0] = txp_0 - txp.chain[0].target_power;
        dev->target_power_delta[1] = txp_1 - txp.chain[0].target_power;
        dev->mt76.rate_power = t;