mt76: mt7663: read tx streams from eeprom (eb7bd8d7) · Commits · 戴 / test

drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -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)
		{
		u8 *eeprom = dev->mt76.eeprom.data;
		u8 tx_mask;
		u8 tx_mask, max_nss;

		mt7615_eeprom_parse_hw_band_cap(dev);

		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 {
		u8 max_nss;
		u32 val;

		/* read tx-rx mask from eeprom */
		@@ -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,
		eeprom[MT_EE_NIC_CONF_0]);
		}
		if (!tx_mask \|\| tx_mask > max_nss)
		tx_mask = max_nss;
		}

		dev->chainmask = BIT(tx_mask) - 1;
		dev->mphy.antenna_mask = dev->chainmask;

+3 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ enum mt7615_eeprom_field {
		MT7663_EE_TX0_2G_TARGET_POWER = 0x123,
		MT_EE_TX2_5G_G0_TARGET_POWER = 0x142,
		MT_EE_TX3_5G_G0_TARGET_POWER = 0x16a,
		MT7663_EE_HW_CONF1 = 0x1b0,

		MT7615_EE_MAX = 0x3bf,
		MT7622_EE_MAX = 0x3db,
		@@ -55,6 +56,8 @@ enum mt7615_eeprom_field {
		#define MT_EE_NIC_CONF_TX_MASK GENMASK(7, 4)
		#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_5G BIT(6)