wifi: mt76: mt76x02: fix MT76x0 external LNA gain handling

[ Upstream commit 684e45e120b82deccaf8b85633905304a3bbf56d ]

On MT76x0, LNA gain should be applied for both external and internal LNA.
On MT76x2, LNA gain should be treated as 0 for external LNA.
Move the LNA type based logic to mt76x2 in order to fix mt76x0.

Fixes: 2daa67588f34 ("mt76x0: unify lna_gain parsing")
Reported-by: Shiji Yang <yangshiji66@outlook.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230919194747.31647-1-nbd@nbd.name
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c
index c54c50fd639a9b4debc4aaadbb693a938f3b5c20..c0227b20b6a31f45deb9d750b9d99a6234665694 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c
@@ -131,15 +131,8 @@ u8 mt76x02_get_lna_gain(struct mt76x02_dev *dev,
                        s8 *lna_2g, s8 *lna_5g,
                        struct ieee80211_channel *chan)
 {
-       u16 val;
        u8 lna;
 
-       val = mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_1);
-       if (val & MT_EE_NIC_CONF_1_LNA_EXT_2G)
-               *lna_2g = 0;
-       if (val & MT_EE_NIC_CONF_1_LNA_EXT_5G)
-               memset(lna_5g, 0, sizeof(s8) * 3);
-
        if (chan->band == NL80211_BAND_2GHZ)
                lna = *lna_2g;
        else if (chan->hw_value <= 64)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c
index 9f91556c7f38df80073ce343f9b6d5e0901456ca..3ee945eafa4d46e1eaf6b44b27f031aa98e1b99c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c
@@ -251,7 +251,8 @@ void mt76x2_read_rx_gain(struct mt76x02_dev *dev)
        struct ieee80211_channel *chan = dev->mt76.chandef.chan;
        int channel = chan->hw_value;
        s8 lna_5g[3], lna_2g;
-       u8 lna;
+       bool use_lna;
+       u8 lna = 0;
        u16 val;
 
        if (chan->band == NL80211_BAND_2GHZ)
@@ -270,7 +271,15 @@ void mt76x2_read_rx_gain(struct mt76x02_dev *dev)
        dev->cal.rx.mcu_gain |= (lna_5g[1] & 0xff) << 16;
        dev->cal.rx.mcu_gain |= (lna_5g[2] & 0xff) << 24;
 
-       lna = mt76x02_get_lna_gain(dev, &lna_2g, lna_5g, chan);
+       val = mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_1);
+       if (chan->band == NL80211_BAND_2GHZ)
+               use_lna = !(val & MT_EE_NIC_CONF_1_LNA_EXT_2G);
+       else
+               use_lna = !(val & MT_EE_NIC_CONF_1_LNA_EXT_5G);
+
+       if (use_lna)
+               lna = mt76x02_get_lna_gain(dev, &lna_2g, lna_5g, chan);
+
        dev->cal.rx.lna_gain = mt76x02_sign_extend(lna, 8);
 }
 EXPORT_SYMBOL_GPL(mt76x2_read_rx_gain);