Commit eb7bd8d7 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau

mt76: mt7663: read tx streams from eeprom

Read tx stream configuration from eeprom/efuse
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 86c60179
...@@ -130,14 +130,15 @@ mt7615_eeprom_parse_hw_band_cap(struct mt7615_dev *dev) ...@@ -130,14 +130,15 @@ mt7615_eeprom_parse_hw_band_cap(struct mt7615_dev *dev)
static void mt7615_eeprom_parse_hw_cap(struct mt7615_dev *dev) static void mt7615_eeprom_parse_hw_cap(struct mt7615_dev *dev)
{ {
u8 *eeprom = dev->mt76.eeprom.data; u8 *eeprom = dev->mt76.eeprom.data;
u8 tx_mask; u8 tx_mask, max_nss;
mt7615_eeprom_parse_hw_band_cap(dev); mt7615_eeprom_parse_hw_band_cap(dev);
if (is_mt7663(&dev->mt76)) { if (is_mt7663(&dev->mt76)) {
tx_mask = 2; max_nss = 2;
tx_mask = FIELD_GET(MT_EE_HW_CONF1_TX_MASK,
eeprom[MT7663_EE_HW_CONF1]);
} else { } else {
u8 max_nss;
u32 val; u32 val;
/* read tx-rx mask from eeprom */ /* read tx-rx mask from eeprom */
...@@ -146,9 +147,9 @@ static void mt7615_eeprom_parse_hw_cap(struct mt7615_dev *dev) ...@@ -146,9 +147,9 @@ static void mt7615_eeprom_parse_hw_cap(struct mt7615_dev *dev)
tx_mask = FIELD_GET(MT_EE_NIC_CONF_TX_MASK, tx_mask = FIELD_GET(MT_EE_NIC_CONF_TX_MASK,
eeprom[MT_EE_NIC_CONF_0]); eeprom[MT_EE_NIC_CONF_0]);
if (!tx_mask || tx_mask > max_nss)
tx_mask = max_nss;
} }
if (!tx_mask || tx_mask > max_nss)
tx_mask = max_nss;
dev->chainmask = BIT(tx_mask) - 1; dev->chainmask = BIT(tx_mask) - 1;
dev->mphy.antenna_mask = dev->chainmask; dev->mphy.antenna_mask = dev->chainmask;
......
...@@ -39,6 +39,7 @@ enum mt7615_eeprom_field { ...@@ -39,6 +39,7 @@ enum mt7615_eeprom_field {
MT7663_EE_TX0_2G_TARGET_POWER = 0x123, MT7663_EE_TX0_2G_TARGET_POWER = 0x123,
MT_EE_TX2_5G_G0_TARGET_POWER = 0x142, MT_EE_TX2_5G_G0_TARGET_POWER = 0x142,
MT_EE_TX3_5G_G0_TARGET_POWER = 0x16a, MT_EE_TX3_5G_G0_TARGET_POWER = 0x16a,
MT7663_EE_HW_CONF1 = 0x1b0,
MT7615_EE_MAX = 0x3bf, MT7615_EE_MAX = 0x3bf,
MT7622_EE_MAX = 0x3db, MT7622_EE_MAX = 0x3db,
...@@ -55,6 +56,8 @@ enum mt7615_eeprom_field { ...@@ -55,6 +56,8 @@ enum mt7615_eeprom_field {
#define MT_EE_NIC_CONF_TX_MASK GENMASK(7, 4) #define MT_EE_NIC_CONF_TX_MASK GENMASK(7, 4)
#define MT_EE_NIC_CONF_RX_MASK GENMASK(3, 0) #define MT_EE_NIC_CONF_RX_MASK GENMASK(3, 0)
#define MT_EE_HW_CONF1_TX_MASK GENMASK(2, 0)
#define MT_EE_NIC_CONF_TSSI_2G BIT(5) #define MT_EE_NIC_CONF_TSSI_2G BIT(5)
#define MT_EE_NIC_CONF_TSSI_5G BIT(6) #define MT_EE_NIC_CONF_TSSI_5G BIT(6)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment