mt76x2: fix tx_alc_enabled check

Fix mt76x2_temp_tx_alc_enabled routine since in order to enable tx_alc
temperature compensation it necessary to take into account BIT(15) of
MT_EE_TX_POWER_EXT_PA_5G eeprom info

Fixes: 7bc04215a66b ("mt76: add driver code for MT76x2e")
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c
index 5bb50027c1e8368b222501026eba965c13371b5f..95d5f7d888f0fd486cea9c06c6ea2208a4b11f58 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c
@@ -609,17 +609,13 @@ int mt76x2_get_temp_comp(struct mt76x2_dev *dev, struct mt76x2_temp_comp *t)
 
        memset(t, 0, sizeof(*t));
 
-       val = mt76x2_eeprom_get(dev, MT_EE_NIC_CONF_1);
-       if (!(val & MT_EE_NIC_CONF_1_TEMP_TX_ALC))
+       if (!mt76x2_temp_tx_alc_enabled(dev))
                return -EINVAL;
 
        if (!mt76x2_ext_pa_enabled(dev, band))
                return -EINVAL;
 
        val = mt76x2_eeprom_get(dev, MT_EE_TX_POWER_EXT_PA_5G) >> 8;
-       if (!(val & BIT(7)))
-               return -EINVAL;
-
        t->temp_25_ref = val & 0x7f;
        if (band == NL80211_BAND_5GHZ) {
                slope = mt76x2_eeprom_get(dev, MT_EE_RF_TEMP_COMP_SLOPE_5G);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h b/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h
index d79122728dcad3e316d29f10497e55f7621be11a..aa0b0c040375a052593e5cc69016f6b7b91def20 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h
@@ -159,6 +159,12 @@ void mt76x2_read_rx_gain(struct mt76x2_dev *dev);
 static inline bool
 mt76x2_temp_tx_alc_enabled(struct mt76x2_dev *dev)
 {
+       u16 val;
+
+       val = mt76x2_eeprom_get(dev, MT_EE_TX_POWER_EXT_PA_5G);
+       if (!(val & BIT(15)))
+               return false;
+
        return mt76x2_eeprom_get(dev, MT_EE_NIC_CONF_1) &
               MT_EE_NIC_CONF_1_TEMP_TX_ALC;
 }