mt76: mt76x0: fix RF frontend initialization for external PA

When loading EEPROM data from flash, the RF frontend settings need to be
initialized from flash data. Without this, the chip loads the wrong values
from its internal eFuse ROM.

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

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
index 1fd22eb841c388e71625e1229ee4292be7e21d8a..610819b49bfc50be73f9bc2422fb4b854c914eb7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
@@ -430,15 +430,15 @@ mt76x0_phy_set_chan_bbp_params(struct mt76x02_dev *dev, u16 rf_bw_band)
 static void mt76x0_phy_ant_select(struct mt76x02_dev *dev)
 {
        u16 ee_ant = mt76x02_eeprom_get(dev, MT_EE_ANTENNA);
+       u16 ee_cfg1 = mt76x02_eeprom_get(dev, MT_EE_CFG1_INIT);
        u16 nic_conf2 = mt76x02_eeprom_get(dev, MT_EE_NIC_CONF_2);
-       u32 wlan, coex3, cmb;
+       u32 wlan, coex3;
        bool ant_div;
 
        wlan = mt76_rr(dev, MT_WLAN_FUN_CTRL);
-       cmb = mt76_rr(dev, MT_CMB_CTRL);
        coex3 = mt76_rr(dev, MT_COEXCFG3);
 
-       cmb   &= ~(BIT(14) | BIT(12));
+       ee_ant &= ~(BIT(14) | BIT(12));
        wlan  &= ~(BIT(6) | BIT(5));
        coex3 &= ~GENMASK(5, 2);
 
@@ -447,7 +447,7 @@ static void mt76x0_phy_ant_select(struct mt76x02_dev *dev)
                ant_div = !(nic_conf2 & MT_EE_NIC_CONF_2_ANT_OPT) &&
                          (nic_conf2 & MT_EE_NIC_CONF_2_ANT_DIV);
                if (ant_div)
-                       cmb |= BIT(12);
+                       ee_ant |= BIT(12);
                else
                        coex3 |= BIT(4);
                coex3 |= BIT(3);
@@ -464,10 +464,11 @@ static void mt76x0_phy_ant_select(struct mt76x02_dev *dev)
        }
 
        if (is_mt7630(dev))
-               cmb |= BIT(14) | BIT(11);
+               ee_ant |= BIT(14) | BIT(11);
 
        mt76_wr(dev, MT_WLAN_FUN_CTRL, wlan);
-       mt76_wr(dev, MT_CMB_CTRL, cmb);
+       mt76_rmw(dev, MT_CMB_CTRL, GENMASK(15, 0), ee_ant);
+       mt76_rmw(dev, MT_CSR_EE_CFG1, GENMASK(15, 0), ee_cfg1);
        mt76_clear(dev, MT_COEXCFG0, BIT(2));
        mt76_wr(dev, MT_COEXCFG3, coex3);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h b/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h
index e3442bc4e0a4f2259a1c238c6bd39d1c4b5418df..0ba536de3d6e0f8fe433283c3339180b9c2daa36 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h
@@ -26,6 +26,7 @@ enum mt76x02_eeprom_field {
        MT_EE_MAC_ADDR =                        0x004,
        MT_EE_PCI_ID =                          0x00A,
        MT_EE_ANTENNA =                         0x022,
+       MT_EE_CFG1_INIT =                       0x024,
        MT_EE_NIC_CONF_0 =                      0x034,
        MT_EE_NIC_CONF_1 =                      0x036,
        MT_EE_COUNTRY_REGION_5GHZ =             0x038,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h b/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h
index 2ce05b543dff18dcfcca1881208ae72aca71bb0a..ea7833964ec00d37ef8132a7affe595cbd9a6386 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h
@@ -66,6 +66,9 @@
 #define MT_WLAN_FUN_CTRL_GPIO_OUT      GENMASK(23, 16) /* MT76x0 */
 #define MT_WLAN_FUN_CTRL_GPIO_OUT_EN   GENMASK(31, 24) /* MT76x0 */
 
+/* MT76x0 */
+#define MT_CSR_EE_CFG1                 0x0104
+
 #define MT_XO_CTRL0                    0x0100
 #define MT_XO_CTRL1                    0x0104
 #define MT_XO_CTRL2                    0x0108