Skip to content

Commit 8df63a4

Browse files
StanleyYP Wangnbd168
authored andcommitted
wifi: mt76: mt7996: adjust interface num and wtbl size for mt7992
MT7992 chipsets support up to 32 interfaces (with maximum 19 per-band) and 512 station entries. This is a preliminary patch for mt7992 chipsets support. Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com> Signed-off-by: Shayne Chen <shayne.chen@mediatek.com> Signed-off-by: Felix Fietkau <nbd@nbd.name>
1 parent 2cbbefd commit 8df63a4

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ static int mt7996_eeprom_parse_efuse_hw_cap(struct mt7996_dev *dev)
111111
dev->wtbl_size_group = u32_get_bits(cap, WTBL_SIZE_GROUP);
112112
}
113113

114-
if (dev->wtbl_size_group < 2 || dev->wtbl_size_group > 4)
114+
if (dev->wtbl_size_group < 2 || dev->wtbl_size_group > 4 ||
115+
is_mt7992(&dev->mt76))
115116
dev->wtbl_size_group = 2; /* set default */
116117

117118
return 0;

drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
#define MT7996_MAX_INTERFACES 19 /* per-band */
1515
#define MT7996_MAX_WMM_SETS 4
16+
#define MT7996_WTBL_BMC_SIZE (is_mt7992(&dev->mt76) ? 32 : 64)
1617
#define MT7996_WTBL_RESERVED (mt7996_wtbl_size(dev) - 1)
1718
#define MT7996_WTBL_STA (MT7996_WTBL_RESERVED - \
1819
mt7996_max_interface_num(dev))
@@ -512,13 +513,14 @@ int mt7996_mcu_wed_rro_reset_sessions(struct mt7996_dev *dev, u16 id);
512513

513514
static inline u8 mt7996_max_interface_num(struct mt7996_dev *dev)
514515
{
515-
return MT7996_MAX_INTERFACES * (1 + mt7996_band_valid(dev, MT_BAND1) +
516-
mt7996_band_valid(dev, MT_BAND2));
516+
return min(MT7996_MAX_INTERFACES * (1 + mt7996_band_valid(dev, MT_BAND1) +
517+
mt7996_band_valid(dev, MT_BAND2)),
518+
MT7996_WTBL_BMC_SIZE);
517519
}
518520

519521
static inline u16 mt7996_wtbl_size(struct mt7996_dev *dev)
520522
{
521-
return (dev->wtbl_size_group << 8) + 64;
523+
return (dev->wtbl_size_group << 8) + MT7996_WTBL_BMC_SIZE;
522524
}
523525

524526
void mt7996_dual_hif_set_irq_mask(struct mt7996_dev *dev, bool write_reg,

0 commit comments

Comments
 (0)