mt76: mt7603: check for single-stream EEPROM configuration

Some devices using MT7628 or MT7603 have only one antenna chain connected.
Detect these using the EEPROM rx/tx path settings

Reported-by: Qin Wei <me@vonger.cn>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c
index 3ee06e2577b80659decae0d2fdd02f9b8c8c12fe..01f1e0da5ee1e5dd3a7f5ceb0c71de17b7943f4f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c
@@ -147,8 +147,14 @@ static int mt7603_check_eeprom(struct mt76_dev *dev)
        }
 }
 
+static inline bool is_mt7688(struct mt7603_dev *dev)
+{
+       return mt76_rr(dev, MT_EFUSE_BASE + 0x64) & BIT(4);
+}
+
 int mt7603_eeprom_init(struct mt7603_dev *dev)
 {
+       u8 *eeprom;
        int ret;
 
        ret = mt7603_eeprom_load(dev);
@@ -163,9 +169,16 @@ int mt7603_eeprom_init(struct mt7603_dev *dev)
                               MT7603_EEPROM_SIZE);
        }
 
+       eeprom = (u8 *)dev->mt76.eeprom.data;
        dev->mt76.cap.has_2ghz = true;
-       memcpy(dev->mt76.macaddr, dev->mt76.eeprom.data + MT_EE_MAC_ADDR,
-              ETH_ALEN);
+       memcpy(dev->mt76.macaddr, eeprom + MT_EE_MAC_ADDR, ETH_ALEN);
+
+       /* Check for 1SS devices */
+       dev->mphy.antenna_mask = 3;
+       if (FIELD_GET(MT_EE_NIC_CONF_0_RX_PATH, eeprom[MT_EE_NIC_CONF_0]) == 1 ||
+           FIELD_GET(MT_EE_NIC_CONF_0_TX_PATH, eeprom[MT_EE_NIC_CONF_0]) == 1 ||
+           is_mt7688(dev))
+               dev->mphy.antenna_mask = 1;
 
        mt76_eeprom_override(&dev->mt76);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h
index b893facfba480e0e9bfded6b78b1247eaaa2a9d0..4687d6dc00dc11c7e3c2c5c0c20de8f8b34fa3a8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h
@@ -85,4 +85,7 @@ enum mt7603_eeprom_source {
        MT_EE_SRC_FLASH,
 };
 
+#define MT_EE_NIC_CONF_0_RX_PATH               GENMASK(3, 0)
+#define MT_EE_NIC_CONF_0_TX_PATH               GENMASK(7, 4)
+
 #endif

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/init.c b/drivers/net/wireless/mediatek/mt76/mt7603/init.c
index 94196599797e4de0ed3f55b1076694d9fefaeea1..c4848fafd2705d2857023400f89ba62008e7617e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/init.c
@@ -536,11 +536,6 @@ int mt7603_register_device(struct mt7603_dev *dev)
        tasklet_init(&dev->mt76.pre_tbtt_tasklet, mt7603_pre_tbtt_tasklet,
                     (unsigned long)dev);
 
-       /* Check for 7688, which only has 1SS */
-       dev->mphy.antenna_mask = 3;
-       if (mt76_rr(dev, MT_EFUSE_BASE + 0x64) & BIT(4))
-               dev->mphy.antenna_mask = 1;
-
        dev->slottime = 9;
        dev->sensitivity_limit = 28;
        dev->dynamic_sensitivity = true;