wifi: mt76: use chainmask for power delta calculation

The power gain value is related to total TX path, so change the
calculation to use per-phy chainmask.

Signed-off-by: Allen Ye <allen.ye@mediatek.com>
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c
index 59586fa134e327dfc99d42f7bf43086c19eeb801..0bc66cc19acd1ea252d7efedff2d8d84bf01b50a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/eeprom.c
@@ -381,7 +381,7 @@ s8 mt76_get_rate_power_limits(struct mt76_phy *phy,
        if (!np)
                return target_power;
 
-       txs_delta = mt76_get_txs_delta(np, hweight8(phy->antenna_mask));
+       txs_delta = mt76_get_txs_delta(np, hweight16(phy->chainmask));
 
        val = mt76_get_of_array(np, "rates-cck", &len, ARRAY_SIZE(dest->cck));
        mt76_apply_array_limit(dest->cck, ARRAY_SIZE(dest->cck), val,

diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index d4004a62af1d4e45c48f078691bb939a3009089e..8a3a90d1bfac58f7436d41f86eff8ba99f88475d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -1548,7 +1548,7 @@ int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                     int *dbm)
 {
        struct mt76_phy *phy = hw->priv;
-       int n_chains = hweight8(phy->antenna_mask);
+       int n_chains = hweight16(phy->chainmask);
        int delta = mt76_tx_power_nss_delta(n_chains);
 
        *dbm = DIV_ROUND_UP(phy->txpower_cur + delta, 2);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
index 1592b5d6751a0f9542f5842302c4e219bdbb14e3..b41ac4aaced7fba7a606ada64ff08af0de082676 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
@@ -519,7 +519,7 @@ static inline s8
 mt7915_get_power_bound(struct mt7915_phy *phy, s8 txpower)
 {
        struct mt76_phy *mphy = phy->mt76;
-       int n_chains = hweight8(mphy->antenna_mask);
+       int n_chains = hweight16(mphy->chainmask);
 
        txpower = mt76_get_sar_power(mphy, mphy->chandef.chan, txpower * 2);
        txpower -= mt76_tx_power_nss_delta(n_chains);