mt76: mt7615: fix delta tx power for mt7663

Fix mt7663 eeprom definitions for delta tx power parsing

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c
index 97f173343ae5e780d3560c76d04d22413078a92a..6a5ae047c63b5deaca215702d723078c4a76d26d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c
@@ -225,6 +225,23 @@ int mt7615_eeprom_get_target_power_index(struct mt7615_dev *dev,
        return index;
 }
 
+int mt7615_eeprom_get_power_delta_index(struct mt7615_dev *dev,
+                                       enum nl80211_band band)
+{
+       /* assume the first rate has the highest power offset */
+       if (is_mt7663(&dev->mt76)) {
+               if (band == NL80211_BAND_2GHZ)
+                       return MT_EE_TX0_5G_G0_TARGET_POWER;
+               else
+                       return MT7663_EE_5G_RATE_POWER;
+       }
+
+       if (band == NL80211_BAND_2GHZ)
+               return MT_EE_2G_RATE_POWER;
+       else
+               return MT_EE_5G_RATE_POWER;
+}
+
 static void mt7615_apply_cal_free_data(struct mt7615_dev *dev)
 {
        static const u16 ical[] = {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h
index a497f04b5e3115e274d0f55103ae607119ee4c8d..40fed7adc58a929b510467482d8fccce41064b98 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h
@@ -31,6 +31,7 @@ enum mt7615_eeprom_field {
        MT_EE_CALDATA_FLASH =                   0x052,
        MT_EE_TX0_2G_TARGET_POWER =             0x058,
        MT_EE_TX0_5G_G0_TARGET_POWER =          0x070,
+       MT7663_EE_5G_RATE_POWER =               0x089,
        MT_EE_TX1_5G_G0_TARGET_POWER =          0x098,
        MT_EE_2G_RATE_POWER =                   0x0be,
        MT_EE_5G_RATE_POWER =                   0x0d5,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
index c6c1701e9e4d7d28bd8d90bb401bef32a7652c9d..1d49d65d1acd18a553207d11901484240dce170c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
@@ -222,17 +222,13 @@ void mt7615_init_txpower(struct mt7615_dev *dev,
                         struct ieee80211_supported_band *sband)
 {
        int i, n_chains = hweight8(dev->mphy.antenna_mask), target_chains;
+       int delta_idx, delta = mt76_tx_power_nss_delta(n_chains);
        u8 *eep = (u8 *)dev->mt76.eeprom.data;
        enum nl80211_band band = sband->band;
-       int delta = mt76_tx_power_nss_delta(n_chains);
        u8 rate_val;
 
-       /* assume the first rate has the highest power offset */
-       if (band == NL80211_BAND_2GHZ)
-               rate_val = eep[MT_EE_2G_RATE_POWER];
-       else
-               rate_val = eep[MT_EE_5G_RATE_POWER];
-
+       delta_idx = mt7615_eeprom_get_power_delta_index(dev, band);
+       rate_val = eep[delta_idx];
        if ((rate_val & ~MT_EE_RATE_POWER_MASK) ==
            (MT_EE_RATE_POWER_EN | MT_EE_RATE_POWER_SIGN))
                delta += rate_val & MT_EE_RATE_POWER_MASK;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index d28e6380b33838877b4e7ecfaef54e22a1cbb8ae..dc60abb0a1301b2ec004d9f2c5b302b764e4356d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -380,6 +380,8 @@ int mt7615_eeprom_init(struct mt7615_dev *dev, u32 addr);
 int mt7615_eeprom_get_target_power_index(struct mt7615_dev *dev,
                                         struct ieee80211_channel *chan,
                                         u8 chain_idx);
+int mt7615_eeprom_get_power_delta_index(struct mt7615_dev *dev,
+                                       enum nl80211_band band);
 int mt7615_wait_pdma_busy(struct mt7615_dev *dev);
 int mt7615_dma_init(struct mt7615_dev *dev);
 void mt7615_dma_cleanup(struct mt7615_dev *dev);